X-Git-Url: http://git.rot13.org/?p=perl-cwmp.git;a=blobdiff_plain;f=lib%2FCWMP%2FSession.pm;h=439035f8b7320d9ac4be4c52d9401186143acfcb;hp=fd50a53821709b92e71460b9f5ee099de8f998bb;hb=ab3c8b6b75a3c7fb9ddc5a0c474fb1aa7269bc83;hpb=f164de0a280f1ebcf8fd031f58ea917fb79bcedf diff --git a/lib/CWMP/Session.pm b/lib/CWMP/Session.pm index fd50a53..439035f 100644 --- a/lib/CWMP/Session.pm +++ b/lib/CWMP/Session.pm @@ -7,22 +7,23 @@ use warnings; 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 File::Slurp; +use Carp qw/carp confess cluck croak/; -use CWMP::Request; +use CWMP::Parser; use CWMP::Methods; use CWMP::Store; +use CWMP::Vendor; + +#use Devel::LeakTrace::Fast; =head1 NAME @@ -34,12 +35,9 @@ CWMP::Session - implement logic of CWMP protocol my $server = CWMP::Session->new({ sock => $io_socket_object, - store => 'state.db', - queue => [ - 'GetRPCMethods', - [ 'GetParameterValyes', 'InternetGatewayDevice.DeviceInfo.SerialNumber', 0 ], - ], + store => { ... }, debug => 1, + create_dump => 1, }); =cut @@ -48,12 +46,10 @@ sub new { my $class = shift; my $self = $class->SUPER::new( @_ ); - confess "need sock" unless $self->sock; + confess "need store" unless $self->store; $self->debug( 0 ) unless $self->debug; - warn "created ", __PACKAGE__, "(", dump( @_ ), ") for ", $self->sock->peerhost, "\n" if $self->debug; - my $store_obj = CWMP::Store->new({ debug => $self->debug, %{ $self->store }, @@ -64,6 +60,8 @@ sub new { # FIXME looks ugly. Should we have separate accessor for this? $self->store( $store_obj ); + $self->create_dump( 1 ) if $self->debug > 2; + return $self; } @@ -79,54 +77,34 @@ of requests in single session. =cut -my $dump_nr = 0; sub process_request { - my $self = shift; - - my $sock = $self->sock || die "no sock?"; - -# die "not IO::Socket::INET but ", ref( $sock ) unless ( ref($sock) eq 'Net::Server::Proto::TCP' ); - - if ( ! $sock->connected ) { - warn "SOCKET NOT CONNECTED\n"; - return 0; - } - - bless $sock, 'HTTP::Daemon::ClientConn'; - - # why do I have to do this? - # 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 $xml = $r->content; + my ( $self, $ip, $xml ) = @_; 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); - write_file( $file, $r->as_string ); - warn "### request dumped to file: $file\n"; - } - my $state; if ( $size > 0 ) { - 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( $xml ); + $state = CWMP::Parser->parse( $xml ); - warn "## acquired state = ", dump( $state ), "\n"; + warn "## acquired state = ", dump( $state ), "\n" if $self->debug; + + if ( ! defined( $state->{DeviceId} ) ) { + if ( $self->state ) { + warn "## state without DeviceId, using old one...\n"; + $state->{DeviceId} = $self->state->{DeviceId}; + } else { + warn "WARNING: state without DeviceId, and I don't have old one!\n"; + warn "## state = ",dump( $state ); + } + } $self->state( $state ); - $self->store->update_state( ID => $state->{ID}, $state ); + $self->store->update_state( $state ); } else { @@ -137,39 +115,49 @@ sub process_request { #warn "last request state = ", dump( $state ), "\n" if $self->debug > 1; } + my $uid = $self->store->state_to_uid( $state ); - $sock->send(join("\r\n", - 'HTTP/1.1 200 OK', - 'Content-Type: text/xml; charset="utf-8"', - 'Server: AcmeCWMP/42', - 'SOAPServer: AcmeCWMP/42' - )."\r\n"); + my $queue = CWMP::Queue->new({ + id => $uid, + debug => $self->debug, + }); - $sock->send( "Set-Cookie: ID=" . $state->{ID} . "; path=/\r\n" ) if ( $state->{ID} ); - $xml = ''; + my $status = 200; if ( my $dispatch = $state->{_dispatch} ) { $xml = $self->dispatch( $dispatch ); - } elsif ( $dispatch = shift @{ $self->queue } ) { - $xml = $self->dispatch( $dispatch ); - } elsif ( $size == 0 ) { - warn ">>> no more queued commands, closing connection\n"; - return 0; + } elsif ( my $job = $queue->dequeue ) { + $xml = $self->dispatch( $job->dispatch ); + $job->finish; } else { - warn ">>> empty response\n"; - $state->{NoMoreRequests} = 1; - $xml = $self->dispatch( 'xml', sub {} ); + my @dispatch; + @dispatch = CWMP::Vendor->all_parameters( $self->store, $uid, $queue ); +warn "XXX", dump @dispatch; + @dispatch = CWMP::Vendor->vendor_config( $self->store, $uid, $queue ) unless @dispatch; +warn "XXX", dump @dispatch; + $xml = $self->dispatch( @dispatch ) if @dispatch; + if ( ! $xml ) { + warn ">>> no more work for $uid sending empty response\n"; + $state->{NoMoreRequests} = 1; + $xml = ''; + $status = 204; + } } - $sock->send( "Content-Length: " . length( $xml ) . "\r\n\r\n" ); - $sock->send( $xml ) or die "can't send response"; + my $out = join("\r\n", + "HTTP/1.1 $status OK", + 'Content-Type: text/xml; charset="utf-8"', + 'Server: Perl-CWMP/42', + 'SOAPServer: Perl-CWMP/42' + ) . "\r\n"; - warn ">>>> " . $sock->peerhost . " [" . localtime() . "] sent ", length( $xml )," bytes\n"; + $out .= "Set-Cookie: ID=" . $state->{ID} . "; path=/\r\n" if $state->{ID}; - warn "### request over\n" if $self->debug; + $out .= "Content-Length: " . length( $xml ) . "\r\n\r\n"; + $out .= $xml if length($xml); - return 1; # next request + return $out; # next request }; =head2 dispatch @@ -184,25 +172,14 @@ sub dispatch { my $self = shift; my $dispatch = shift || die "no dispatch?"; - my @args = @_; - - if ( ref($dispatch) eq 'ARRAY' ) { - my @a = @$dispatch; - $dispatch = shift @a; - push @args, @a; - } + my $args = shift; my $response = CWMP::Methods->new({ debug => $self->debug }); if ( $response->can( $dispatch ) ) { - warn ">>> dispatching to $dispatch\n"; - my $xml = $response->$dispatch( $self->state, @args ); + 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 ) { - my $file = sprintf("dump/%04d-%s.response", $dump_nr++, $self->sock->peerhost); - write_file( $file, $xml ); - warn "### response dump: $file\n"; - } return $xml; } else { confess "can't dispatch to $dispatch";