use base qw/Class::Accessor/;
__PACKAGE__->mk_accessors( qw/
debug
-store
+create_dump
+session
sock
state
-queue
store
/ );
use HTTP::Daemon;
use Data::Dump qw/dump/;
-use Carp qw/confess cluck croak/;
+use Carp qw/carp confess cluck croak/;
use File::Slurp;
use CWMP::Request;
-use CWMP::Response;
+use CWMP::Methods;
use CWMP::Store;
+#use Devel::LeakTrace::Fast;
+
=head1 NAME
CWMP::Session - implement logic of CWMP protocol
my $server = CWMP::Session->new({
sock => $io_socket_object,
- store => 'state.db',
- queue => [ qw/GetRPCMethods GetParameterNames/ ],
+ store => { ... },
debug => 1,
+ create_dump => 1,
});
=cut
my $self = $class->SUPER::new( @_ );
confess "need sock" unless $self->sock;
+ confess "need store" unless $self->store;
+ my $peerhost = $self->sock->peerhost || confess "can't get sock->peerhost";
$self->debug( 0 ) unless $self->debug;
- warn "created ", __PACKAGE__, "(", dump( @_ ), ") for ", $self->sock->peerhost, "\n" if $self->debug;
+ warn "created ", __PACKAGE__, "(", dump( @_ ), ") for $peerhost\n" if $self->debug;
my $store_obj = CWMP::Store->new({
debug => $self->debug,
# FIXME looks ugly. Should we have separate accessor for this?
$self->store( $store_obj );
+ $self->create_dump( 1 ) if $self->debug > 2;
+
return $self;
}
# solution from http://use.perl.org/~Matts/journal/12896
${*$sock}{'httpd_daemon'} = HTTP::Daemon->new;
- my $r = $sock->get_request || confess "can't get_request";
+ my $r = $sock->get_request;
+
+ if ( ! $r ) {
+ carp "can't get_request";
+ return 0;
+ }
- my $chunk = $r->content;
+ my $xml = $r->content;
- my $size = length( $chunk );
+ my $size = length( $xml );
warn "<<<< ", $sock->peerhost, " [" . localtime() . "] ", $r->method, " ", $r->uri, " $size bytes\n";
- if ( $self->debug > 2 ) {
- my $file = sprintf("dump/%04d-%s.request", $dump_nr++, $sock->peerhost);
+ $dump_nr++;
+ my $file = sprintf("dump/%04d-%s.request", $dump_nr, $sock->peerhost);
+
+ if ( $self->create_dump ) {
write_file( $file, $r->as_string );
- warn "### request dump: $file\n";
+ warn "### request dumped to file: $file\n" if $self->debug;
}
my $state;
if ( $size > 0 ) {
- die "no SOAPAction header in ",dump($chunk) unless defined ( $r->header('SOAPAction') );
+ die "no SOAPAction header in ",dump($xml) unless defined ( $r->header('SOAPAction') );
+
+ warn "## request payload: ",length($xml)," bytes\n$xml\n" if $self->debug;
- $state = CWMP::Request->parse( $chunk );
+ $state = CWMP::Request->parse( $xml );
- warn "## acquired state = ", dump( $state ), "\n";
+ if ( defined( $state->{_dispatch} ) && $self->create_dump ) {
+ my $type = sprintf("dump/%04d-%s-%s", $dump_nr, $sock->peerhost, $state->{_dispatch});
+ symlink $file, $type || warn "can't symlink $file -> $type: $!";
+ }
+
+ warn "## acquired state = ", dump( $state ), "\n" if $self->debug;
+
+ if ( ! defined( $state->{DeviceID} ) ) {
+ warn "## state with DeviceID, using old one...\n";
+ $state->{DeviceID} = $self->state->{DeviceID};
+ }
$self->state( $state );
- $self->store->update_state( ID => $state->{ID}, $state );
+ $self->store->update_state( $state );
} else {
#warn "last request state = ", dump( $state ), "\n" if $self->debug > 1;
}
-
$sock->send(join("\r\n",
'HTTP/1.1 200 OK',
'Content-Type: text/xml; charset="utf-8"',
- 'Server: AcmeCWMP/42',
- 'SOAPServer: AcmeCWMP/42'
+ 'Server: PerlCWMP/42',
+ 'SOAPServer: PerlCWMP/42'
)."\r\n");
$sock->send( "Set-Cookie: ID=" . $state->{ID} . "; path=/\r\n" ) if ( $state->{ID} );
-
- my $xml = '';
+
+ my $uid = $self->store->state_to_uid( $state );
+
+ my $to_uid = join(" ", grep { defined($_) } "to $uid",
+ # board
+ $state->{Parameter}->{'InternetGatewayDevice.DeviceInfo.HardwareVersion'},
+ # version
+ $state->{Parameter}->{'InternetGatewayDevice.DeviceInfo.SoftwareVersion'},
+ # summary
+# $state->{Parameter}->{'InternetGatewayDevice.DeviceSummary'},
+ ) . "\n";
+
+ my $queue = CWMP::Queue->new({
+ id => $uid,
+ debug => $self->debug,
+ });
+ my $job;
+ $xml = '';
if ( my $dispatch = $state->{_dispatch} ) {
$xml = $self->dispatch( $dispatch );
- } elsif ( $dispatch = shift @{ $self->queue } ) {
- $xml = $self->dispatch( $dispatch );
+ } elsif ( $job = $queue->dequeue ) {
+ $xml = $self->dispatch( $job->dispatch );
} elsif ( $size == 0 ) {
- warn ">>> no more queued commands, closing connection\n";
- return 0;
+ warn ">>> over, closing connection $to_uid";
+ $sock->close;
+ return;
} else {
- warn ">>> empty response\n";
+ warn ">>> empty response $to_uid";
$state->{NoMoreRequests} = 1;
$xml = $self->dispatch( 'xml', sub {} );
}
$sock->send( "Content-Length: " . length( $xml ) . "\r\n\r\n" );
$sock->send( $xml ) or die "can't send response";
- warn ">>>> " . $sock->peerhost . " [" . localtime() . "] sent ", length( $xml )," bytes\n";
+ warn ">>>> " . $sock->peerhost . " [" . localtime() . "] sent ", length( $xml )," bytes $to_uid";
- warn "### request over\n" if $self->debug;
+ $job->finish if $job;
+ warn "### request over for $uid\n" if $self->debug;
return 1; # next request
};
my $self = shift;
my $dispatch = shift || die "no dispatch?";
+ my $args = shift;
- my $response = CWMP::Response->new({ debug => $self->debug });
+ my $response = CWMP::Methods->new({ debug => $self->debug });
if ( $response->can( $dispatch ) ) {
- warn ">>> dispatching to $dispatch\n";
- my $xml = $response->$dispatch( $self->state, @_ );
+ warn ">>> dispatching to $dispatch with args ",dump( $args ),"\n";
+ my $xml = $response->$dispatch( $self->state, $args );
warn "## response payload: ",length($xml)," bytes\n$xml\n" if $self->debug;
- if ( $self->debug > 2 ) {
+ if ( $self->create_dump ) {
my $file = sprintf("dump/%04d-%s.response", $dump_nr++, $self->sock->peerhost);
write_file( $file, $xml );
- warn "### response dump: $file\n";
+ warn "### response dump: $file\n" if $self->debug;
}
return $xml;
} else {
projects / perl-cwmp.git / blobdiff