use strict;
use warnings;
-use IO::Socket;
+
+require IO::Socket;
+
use Net::Skinny::Protocol qw/:all/;
-our(@ISA);
-@ISA = qw(IO::Socket::INET);
+our @ISA = qw(IO::Socket::INET);
sub new {
shift->SUPER::new(PeerPort => 2000, @_);
}
-sub send_data
+sub send_raw
{
my $self = shift;
my $type = shift;
- my $data = shift;
- my $len = length($data)+4;
+ my $raw = shift;
+ my $len = length($raw)+4;
printf "Sending message (length=%d, type=%s (%X))", $len, Net::Skinny::Protocol::skinny_message_type2str($type), $type;
- $self->send(
- pack("VVV", $len, 0, $type).
- $data);
+ $self->send(pack("VVV", $len, 0, $type).$raw);
printf ".\n";
}
{
my $self = shift;
my $type = shift;
- return Net::Skinny::Message->new(
- $self,
- $type,
- @_
- )->send();
+ my $message = Net::Skinny::Message->new($type, @_);
+ return $self->send_raw($message->type(), $message->raw());
}
sub receive_message
printf "type=%s (%X))", Net::Skinny::Protocol::skinny_message_type2str($type), $type;
if($len > 4) {
$self->recv($buf, $len-4);
+ } else {
+ $buf = '';
}
printf ".\n";
+ return Net::Skinny::Message->new_raw($type, $buf);
}
sub sleep
{
my $self = shift;
my $t = shift;
-
+ my %args = @_;
+ $args{'quiet'} = 0 if not $args{'quiet'};
printf "Sleeping %d seconds", $t;
while(--$t){
sleep(1);
- printf "." if $t % 10;
- printf "_" unless $t % 10;
+ if(!$args{'quiet'}) {
+ printf "." if $t % 10;
+ printf "_" unless $t % 10;
+ }
}
printf ".\n";
}
--- /dev/null
+# Copyright (c) 2010 Mathieu Parent <math.parent@gmail.com>.
+# All rights reserved. This program is free software; you can redistribute it
+# and/or modify it under the same terms as Perl itself.
+
+package Net::Skinny::Client;
+
+use strict;
+use warnings;
+
+use Config;
+use threads;
+use threads::shared;
+use Thread::Queue;
+
+require Net::Skinny;
+use Net::Skinny::Protocol qw/:all/;
+use Net::Skinny::Message;
+
+our(@ISA);
+@ISA = qw(Net::Skinny);
+
+my $keep_alive_thread;
+my $keep_alives :shared;
+our $kept_self;
+my $messages_send_queue;
+my $messages_receive_queue;
+
+$Config{useithreads} or die('Recompile Perl with threads to run this program.');
+
+sub new {
+ $kept_self = shift->SUPER::new(@_);
+ $messages_send_queue = Thread::Queue->new();
+ $messages_receive_queue = Thread::Queue->new();
+ threads->create(\&send_messages_thread_func);
+ threads->create(\&receive_messages_thread_func);
+ return $kept_self;
+}
+
+sub send_message {
+ my $self = shift;
+ $messages_send_queue->enqueue(\@_);
+}
+
+sub receive_message {
+ my $self = shift;
+ my $message = $messages_receive_queue->dequeue();
+ if($message->type() == 0x100) {#keepaliveack
+ if(1) {
+ lock($keep_alives);
+ $keep_alives--;
+ }
+ $message = $messages_receive_queue->dequeue();
+ }
+ return $message;
+}
+
+sub launch_keep_alive_thread
+{
+ if(!$keep_alive_thread) {
+ $keep_alive_thread = threads->create(\&keep_alive_thread_func);
+ } else {
+ print "keep-alive thread is already running\n";
+ }
+ return $keep_alive_thread;
+}
+
+sub keep_alive_thread_func
+{
+ while($kept_self) {
+ if(1) {
+ lock($keep_alives);
+ $keep_alives++;
+ $kept_self->send_message(KEEP_ALIVE_MESSAGE);
+ } #mutex unlocked
+ $kept_self->sleep(30, quiet => 0);
+ }
+}
+
+sub send_messages_thread_func
+{
+ while(my $message = $messages_send_queue->dequeue()) {
+ my $type = shift @$message;
+ $kept_self->SUPER::send_message($type, @$message);
+ }
+}
+
+sub receive_messages_thread_func
+{
+ while(1) {
+ $messages_receive_queue->enqueue($kept_self->SUPER::receive_message());
+ }
+}
+
+1;
use strict;
use warnings;
-use Net::Skinny::Protocol qw/:all/;
-
-use Data::Dumper;
+use threads;
+use threads::shared;
-require Exporter;
-our @ISA = qw(Exporter);
-our @EXPORT = qw(send);
+use Net::Skinny::Protocol qw/:all/;
-sub new {
+sub new_empty {
my $class = shift;
my $self = {};
bless $self, $class;
- $self->{'socket'} = shift;
- $self->{'type'} = shift;
- %{$self->{'data'}} = @_;
- return $ self;
+ $self->{'type'} = undef;
+ $self->{'data'} = undef;
+ $self->{'raw'} = undef;
+ return $self;
+}
+
+sub new {
+ my $self = shift->new_empty();
+ $self->type(shift);
+ $self->data(@_) if @_;
+ return $self;
+}
+
+sub new_raw {
+ my $self = shift->new_empty();
+ $self->type(shift);
+ $self->raw(shift);
+ return $self;
+}
+
+sub type
+{
+ my $self = shift;
+ my $type = @_ ? shift : undef;
+ if(defined($type)) {
+ $self->{'type'} = $type;
+ }
+ return $self->{'type'};
+}
+
+sub data
+{
+ my $self = shift;
+ my @data = @_;
+ if(@data) {
+ %{$self->{'data'}} = @data;
+ $self->{'raw'} = undef;
+ } elsif(!defined($self->{'data'})) {
+ printf "Conversion from raw to data not implemented\n";
+ }
+ return $self->{'data'};
}
-sub send {
+sub raw
+{
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++;
+ my $raw = shift || undef;
+ if(defined($raw)) {
+ $self->{'raw'} = $raw;
+ $self->{'data'} = undef;
}
- if($parsed_count != scalar(keys %{$self->{'data'}})) {
- printf "Incomplete message (type=%s (%X)) %d out of %d\n", Net::Skinny::Protocol::skinny_message_type2str($self->{'type'}), $self->{'type'},
- $parsed_count, scalar(keys %{$self->{'data'}});
- print Dumper(@$struct);
- return;
+ if(!defined($self->{'raw'})) {
+ 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 (type=%s (%X)) %d out of %d\n", Net::Skinny::Protocol::skinny_message_type2str($self->{'type'}), $self->{'type'},
+ $parsed_count, scalar(keys %{$self->{'data'}});
+ return;
+ }
+ $self->{'raw'} = $raw;
}
- $self->{'socket'}->send_data($self->{'type'}, $raw);
+ return $self->{'raw'};
}
1;
no strict "refs";
use warnings;
use Carp;
-use Data::Dumper;
require Exporter;
our @ISA = qw(Exporter);
printf "Unparsed line '%s' in %s\n", $_, $struct_name;
}
}
- #print "$name: ".Dumper($struct{$name});
}
}
@sub{@_};
sub skinny_message_type2str {
my $message_type = shift;
+ return "UndefinedTypeMessage" if !defined($message_type);
keys %const;
while (my ($key, $value) = each %const) {
use Net::Skinny;
use Net::Skinny::Protocol qw/:all/;
use Net::Skinny::Message;
+use Net::Skinny::Client;
#Config
my $skinny_server = hostname;
#======
$| = 1;
-my $socket = Net::Skinny->new(
+my $socket = Net::Skinny::Client->new(
PeerAddr => $skinny_server,
PeerPort => 2000,
);
if(!$socket) {
- print "Unable to connect to server\n";
+ printf "Unable to connect to server %s\n", $skinny_server;
exit 1;
}
# =============================================================================
count => 2
);
-for(my $i = 0; $i < 1; $i++) {
- $socket->sleep(5);
- $socket->send_message(KEEP_ALIVE_MESSAGE);
- $socket->receive_message(); # keepaliveack
-}
+$socket->launch_keep_alive_thread();
+
$socket->sleep(5);
#NewCall
projects / thirdparty / freeswitch.git / commitdiff
