<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][17128] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=17128">17128</a></dd>
<dt>Author</dt> <dd>sathieu</dd>
<dt>Date</dt> <dd>2010-03-29 02:44:25 -0500 (Mon, 29 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>perl-skinny: enhance the Testsuite</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyNetSkinnyMessagepm">freeswitch/trunk/src/mod/endpoints/mod_skinny/Net/Skinny/Message.pm</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyNetSkinnyProtocolpm">freeswitch/trunk/src/mod/endpoints/mod_skinny/Net/Skinny/Protocol.pm</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyNetSkinnypm">freeswitch/trunk/src/mod/endpoints/mod_skinny/Net/Skinny.pm</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnytestskinnypl">freeswitch/trunk/src/mod/endpoints/mod_skinny/test-skinny.pl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyNetSkinnyMessagepm"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/Net/Skinny/Message.pm (17127 => 17128)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/Net/Skinny/Message.pm 2010-03-28 22:52:05 UTC (rev 17127)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/Net/Skinny/Message.pm 2010-03-29 07:44:25 UTC (rev 17128)
</span><span class="lines">@@ -7,4 +7,52 @@
</span><span class="cx"> use strict;
</span><span class="cx"> use warnings;
</span><span class="cx">
</span><ins>+use Net::Skinny::Protocol qw/:all/;
</ins><span class="cx">
</span><ins>+use Data::Dumper;
+
+require Exporter;
+our @ISA = qw(Exporter);
+our @EXPORT = qw(send);
+
+sub new {
+ my $class = shift;
+ my $self = {};
+ bless $self, $class;
+ $self->{'socket'} = shift;
+ $self->{'type'} = shift;
+ %{$self->{'data'}} = @_;
+ return $ self;
+}
+
+sub send {
+ my $self = shift;
+ my $struct = Net::Skinny::Protocol::skinny_message_struct($self->{'type'});
+ my $raw = '';
+ my $parsed_count = 0;
+ for my $info ( @$struct) {
+ last if !defined($self->{'data'}{@$info[1]});
+ if(@$info[0] eq 'char') {
+ $raw .= pack("a".@$info[2], $self->{'data'}{@$info[1]});
+ } elsif(@$info[0] eq 'uint32_t') {
+ $raw .= pack("V".@$info[2], $self->{'data'}{@$info[1]});
+ } elsif(@$info[0] eq 'uint16_t') {
+ $raw .= pack("n".@$info[2], $self->{'data'}{@$info[1]});
+ } elsif(@$info[0] eq 'struct in_addr') {
+ $raw .= pack("V".@$info[2], $self->{'data'}{@$info[1]});
+ } elsif(@$info[0] eq 'struct station_capabilities') {
+ $raw .= $self->{'data'}{@$info[1]};
+ } else {
+ printf "Unknown type: %s\n", @$info[0];
+ return;
+ }
+ $parsed_count++;
+ }
+ if($parsed_count != scalar(keys %{$self->{'data'}})) {
+ printf "Incomplete message: %d out of %d\n", $parsed_count, scalar(keys %{$self->{'data'}});
+ return;
+ }
+ $self->{'socket'}->send_data($self->{'type'}, $raw);
+}
+
+1;
</ins></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyNetSkinnyProtocolpm"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/Net/Skinny/Protocol.pm (17127 => 17128)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/Net/Skinny/Protocol.pm 2010-03-28 22:52:05 UTC (rev 17127)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/Net/Skinny/Protocol.pm 2010-03-29 07:44:25 UTC (rev 17128)
</span><span class="lines">@@ -8,13 +8,16 @@
</span><span class="cx"> no strict "refs";
</span><span class="cx"> use warnings;
</span><span class="cx"> use Carp;
</span><ins>+use Data::Dumper;
</ins><span class="cx">
</span><span class="cx"> require Exporter;
</span><span class="cx"> our @ISA = qw(Exporter);
</span><del>-our @EXPORT = qw(skinny_message_type2str);
</del><ins>+our @EXPORT = qw(skinny_message_type2str skinny_message_struct);
</ins><span class="cx">
</span><span class="cx"> my %const;
</span><span class="cx"> my %sub;
</span><ins>+my %struct;
+
</ins><span class="cx"> my $skinny_protocol_h = 'src/mod/endpoints/mod_skinny/skinny_protocol.h';
</span><span class="cx">
</span><span class="cx"> sub import {
</span><span class="lines">@@ -46,6 +49,27 @@
</span><span class="cx"> my ($name, $value) = ($1,hex($2));
</span><span class="cx"> $sub{$name} = sub () { $value };
</span><span class="cx"> $const{$name} = $value;
</span><ins>+ } elsif(/^\s*struct\s+([a-z_]+)\s*\{\s*$/) {
+ my $struct_name = $1;
+ $struct{$struct_name} = [];
+ while(<$fh>) {
+ if(/^\s*\}\s*;\s*$/) {
+ last;
+ } elsif(/^\s*(((struct)\s+)?([a-z_0-9]+))\s+([a-z_0-9]+)(\[([0-9A-Z_]+)\])?\s*;?\s*(\/\*.*\*\/)?\s*$/) {
+ my $var_name = $1;
+ my $var_type = $5;
+ my $var_size = $7;
+ $var_size = 1 if !defined($var_size);
+ push @{$struct{$struct_name}}, [$var_name, $var_type, $var_size];
+ } elsif(/^\s*union\s*skinny_data data;\s*$/) {
+ # union
+ } elsif(/^\s*(\/\*.*\*\/)?\s*$/) {
+ # Simple comment
+ } else {
+ printf "Unparsed line '%s' in %s\n", $_, $struct_name;
+ }
+ }
+ #print "$name: ".Dumper($struct{$name});
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> @sub{@_};
</span><span class="lines">@@ -62,3 +86,10 @@
</span><span class="cx"> }
</span><span class="cx"> return "UnknownMessage";
</span><span class="cx"> }
</span><ins>+
+sub skinny_message_struct {
+ my $message_type = shift;
+ my $struct_name = lc(Net::Skinny::Protocol::skinny_message_type2str($message_type));
+ return $struct{$struct_name};
+}
+
</ins></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyNetSkinnypm"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/Net/Skinny.pm (17127 => 17128)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/Net/Skinny.pm 2010-03-28 22:52:05 UTC (rev 17127)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/Net/Skinny.pm 2010-03-29 07:44:25 UTC (rev 17128)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> shift->SUPER::new(PeerPort => 2000, @_);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub send_message
</del><ins>+sub send_data
</ins><span class="cx"> {
</span><span class="cx"> my $self = shift;
</span><span class="cx"> my $type = shift;
</span><span class="lines">@@ -29,6 +29,17 @@
</span><span class="cx"> printf ".\n";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub send_message
+{
+ my $self = shift;
+ my $type = shift;
+ return Net::Skinny::Message->new(
+ $self,
+ $type,
+ @_
+ )->send();
+}
+
</ins><span class="cx"> sub receive_message
</span><span class="cx"> {
</span><span class="cx"> my $self = shift;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnytestskinnypl"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/test-skinny.pl (17127 => 17128)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/test-skinny.pl 2010-03-28 22:52:05 UTC (rev 17127)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/test-skinny.pl 2010-03-29 07:44:25 UTC (rev 17128)
</span><span class="lines">@@ -11,9 +11,9 @@
</span><span class="cx"> use strict;
</span><span class="cx"> use warnings;
</span><span class="cx">
</span><del>-use Data::Dumper;
</del><span class="cx"> use Net::Skinny;
</span><span class="cx"> use Net::Skinny::Protocol qw/:all/;
</span><ins>+use Net::Skinny::Message;
</ins><span class="cx">
</span><span class="cx"> #Config
</span><span class="cx"> my $skinny_server = '127.0.0.1';
</span><span class="lines">@@ -32,50 +32,58 @@
</span><span class="cx"> exit 1;
</span><span class="cx"> }
</span><span class="cx"> # =============================================================================
</span><del>-$socket->send_message(REGISTER_MESSAGE, # Register
- pack("a16VVVVV",
- $device_name,
- 0, # userId;
- 1, # instance;
- $device_ip,# ip;
- 7, # deviceType;
- 0, # maxStreams;
- ));
</del><ins>+$socket->send_message(
+ REGISTER_MESSAGE,
+ device_name => $device_name,
+ user_id => 0,
+ instance => 1,
+ ip => $device_ip,
+ device_type => 7,
+ max_streams => 0,
+ );
</ins><span class="cx"> $socket->receive_message(); # RegisterAck
</span><span class="cx">
</span><del>-$socket->send_message(0x0002, # Port
- pack("n", 2000
- ));
</del><ins>+$socket->send_message(
+ PORT_MESSAGE,
+ port => 2000,
+ );
</ins><span class="cx">
</span><del>-$socket->send_message(HEADSET_STATUS_MESSAGE,
- pack("V",
- 2, # Off
- ));
-
</del><ins>+$socket->send_message(
+ HEADSET_STATUS_MESSAGE,
+ mode => 2, #Off
+ );
</ins><span class="cx"> $socket->receive_message(); # CapabilitiesReq
</span><del>-$socket->send_message(CAPABILITIES_RES_MESSAGE,
- pack("V"."Vva10"."Vva10",
- 2, # count
- 2, 8, "", # codec, frames, res
- 4, 16, "", # codec, frames, res
- ));
</del><ins>+$socket->send_message(
+ CAPABILITIES_RES_MESSAGE,
+ count => 2,
+ caps => pack("Vva10"."Vva10",
+ 2, 8, "", # codec, frames, res
+ 4, 16, "", # codec, frames, res
+ )
+ );
</ins><span class="cx">
</span><del>-$socket->send_message(BUTTON_TEMPLATE_REQ_MESSAGE, "");
</del><ins>+$socket->send_message(BUTTON_TEMPLATE_REQ_MESSAGE);
</ins><span class="cx"> $socket->receive_message(); # ButtonTemplateMessage
</span><span class="cx">
</span><del>-$socket->send_message(SOFT_KEY_TEMPLATE_REQ_MESSAGE, "");
</del><ins>+$socket->send_message(SOFT_KEY_TEMPLATE_REQ_MESSAGE);
</ins><span class="cx"> $socket->receive_message(); # SoftKeyTemplateRes
</span><span class="cx">
</span><del>-$socket->send_message(SOFT_KEY_SET_REQ_MESSAGE, "");
</del><ins>+$socket->send_message(SOFT_KEY_SET_REQ_MESSAGE);
</ins><span class="cx"> $socket->receive_message(); # SoftKeySetRes
</span><span class="cx">
</span><del>-$socket->send_message(LINE_STAT_REQ_MESSAGE, pack("V", 1));
</del><ins>+$socket->send_message(
+ LINE_STAT_REQ_MESSAGE,
+ number => 1,
+ );
</ins><span class="cx"> $socket->receive_message(); # LineStat
</span><span class="cx">
</span><del>-$socket->send_message(REGISTER_AVAILABLE_LINES_MESSAGE, pack("V", 2));
</del><ins>+$socket->send_message(
+ REGISTER_AVAILABLE_LINES_MESSAGE,
+ count => 2
+ );
</ins><span class="cx">
</span><span class="cx"> while(1) {
</span><span class="cx"> $socket->sleep(20);
</span><del>- $socket->send_message(KEEP_ALIVE_MESSAGE, "");
</del><ins>+ $socket->send_message(KEEP_ALIVE_MESSAGE);
</ins><span class="cx"> $socket->receive_message(); # keepaliveack
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>