X-Git-Url: http://git.rot13.org/?p=perl-cwmp.git;a=blobdiff_plain;f=lib%2FCWMP%2FSession.pm;h=bdde16c6a743d4fa662679ca4d920667a4547f45;hp=8efc4e47310e4ea8d79a645e45254343e9bde6fd;hb=441fa54478368fedae46f6b83a8d46852751769a;hpb=9fd397ba91cb2d52caf4fc79a913d103a7d2ba28 diff --git a/lib/CWMP/Session.pm b/lib/CWMP/Session.pm index 8efc4e4..bdde16c 100644 --- a/lib/CWMP/Session.pm +++ b/lib/CWMP/Session.pm @@ -7,23 +7,23 @@ use warnings; use base qw/Class::Accessor/; __PACKAGE__->mk_accessors( qw/ debug -store_path +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::Response; +use CWMP::Methods; use CWMP::Store; +#use Devel::LeakTrace::Fast; + =head1 NAME CWMP::Session - implement logic of CWMP protocol @@ -34,9 +34,9 @@ CWMP::Session - implement logic of CWMP protocol my $server = CWMP::Session->new({ sock => $io_socket_object, - store_path => 'state.db', - queue => [ qw/GetRPCMethods GetParameterNames/ ], + store => { ... }, debug => 1, + create_dump => 1, }); =cut @@ -45,18 +45,21 @@ 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; - - $self->store( CWMP::Store->new({ + my $store_obj = CWMP::Store->new({ debug => $self->debug, - path => $self->store_path, - }) ); + %{ $self->store }, + }); + + croak "can't open ", dump( $self->store ), ": $!" unless $store_obj; + + # FIXME looks ugly. Should we have separate accessor for this? + $self->store( $store_obj ); - croak "can't open ", $self->store_path, ": $!" unless $self->store; + $self->create_dump( 1 ) if $self->debug > 2; return $self; } @@ -73,95 +76,122 @@ 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 $chunk = $r->content; + my ( $self, $ip, $xml ) = @_; - my $size = length( $chunk ); - - warn "<<<< ", $sock->peerhost, " [" . localtime() . "] ", $r->method, " ", $r->uri, " $size bytes\n"; - - if ( $self->debug > 2 ) { - my $file = sprintf("dump/%04d.request", $dump_nr++); - write_file( $file, $r->as_string ); - warn "### request dump: $file\n"; - } + my $size = length( $xml ); my $state; if ( $size > 0 ) { - die "no SOAPAction header in ",dump($chunk) 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"; + 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 { - warn "## empty request\n"; + warn "## empty request, using last request state\n"; $state = $self->state; delete( $state->{_dispatch} ); - warn "last request state = ", dump( $state ), "\n" if $self->debug > 1; + #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 $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"; - $sock->send( "Set-Cookie: ID=" . $state->{ID} . "; path=/\r\n" ) if ( $state->{ID} ); - - my $xml = ''; + my $queue = CWMP::Queue->new({ + id => $uid, + debug => $self->debug, + }); + $xml = ''; if ( my $dispatch = $state->{_dispatch} ) { $xml = $self->dispatch( $dispatch ); - } elsif ( $dispatch = shift @{ $self->queue } ) { - $xml = $self->dispatch( $dispatch ); - } elsif ( $size == 0 ) { - warn ">>> 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 $stored = $self->store->get_state( $uid ); + if ( ! defined $stored->{ParameterInfo} ) { + $xml = $self->dispatch( 'GetParameterNames', [ 'InternetGatewayDevice.', 1 ] ); + } else { + my @params = grep { m/\.$/ } keys %{ $stored->{ParameterInfo} }; + if ( @params ) { + warn "# GetParameterNames ", dump( @params ); + my $first = shift @params; + delete $stored->{ParameterInfo}->{$first}; + $xml = $self->dispatch( 'GetParameterNames', [ $first, 1 ] ); + foreach ( @params ) { + $queue->enqueue( 'GetParameterNames', [ $_, 1 ] ); + delete $stored->{ParameterInfo}->{ $_ }; + } + $self->store->set_state( $uid, $stored ); + } else { + + my @params = sort grep { ! exists $stored->{Parameter}->{$_} } grep { ! m/\.$/ } keys %{ $stored->{ParameterInfo} }; + if ( @params ) { + warn "# GetParameterValues ", dump( @params ); + my $first = shift @params; + $xml = $self->dispatch( 'GetParameterValues', [ $first ] ); + while ( @params ) { + my @chunk = splice @params, 0, 16; # FIXME 16 seems to be max + $queue->enqueue( 'GetParameterValues', [ @chunk ] ); + } + + } else { + + warn ">>> empty response $to_uid"; + $state->{NoMoreRequests} = 1; + $xml = ''; + + } + } + } } - $sock->send( "Content-Length: " . length( $xml ) . "\r\n\r\n" ); - $sock->send( $xml ) or die "can't send response"; + my $status = length($xml) ? 200 : 204; + + 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"; + + $out .= "Set-Cookie: ID=" . $state->{ID} . "; path=/\r\n" if $state->{ID}; - warn ">>>> " . $sock->peerhost . " [" . localtime() . "] sent ", length( $xml )," bytes\n"; + $out .= "Content-Length: " . length( $xml ) . "\r\n\r\n"; + $out .= $xml if length($xml); - warn "### request over\n" if $self->debug; + warn "### request over for $uid\n" if $self->debug; - return 1; # next request + return $out; # next request }; =head2 dispatch @@ -176,18 +206,14 @@ sub dispatch { 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 ) { - my $file = sprintf("dump/%04d.response", $dump_nr++); - write_file( $file, $xml ); - warn "### response dump: $file\n"; - } return $xml; } else { confess "can't dispatch to $dispatch";