X-Git-Url: http://git.rot13.org/?p=perl-cwmp.git;a=blobdiff_plain;f=lib%2FCWMP%2FSession.pm;h=439035f8b7320d9ac4be4c52d9401186143acfcb;hp=e96f08d46592290fa54daedcb4e14dba74a14c22;hb=ab3c8b6b75a3c7fb9ddc5a0c474fb1aa7269bc83;hpb=0d052d117960123b64bd8e66fb44515489d8800e diff --git a/lib/CWMP/Session.pm b/lib/CWMP/Session.pm index e96f08d..439035f 100644 --- a/lib/CWMP/Session.pm +++ b/lib/CWMP/Session.pm @@ -15,15 +15,13 @@ state store / ); -use HTTP::Daemon; use Data::Dump qw/dump/; use Carp qw/carp confess cluck croak/; -use File::Slurp; -use File::Path qw/mkpath/; -use CWMP::Request; +use CWMP::Parser; use CWMP::Methods; use CWMP::Store; +use CWMP::Vendor; #use Devel::LeakTrace::Fast; @@ -48,14 +46,10 @@ sub new { my $class = shift; 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 $peerhost\n" if $self->debug; - my $store_obj = CWMP::Store->new({ debug => $self->debug, %{ $self->store }, @@ -83,71 +77,30 @@ of requests in single session. =cut -my $dump_by_ip; 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; - - if ( ! $r ) { - carp "can't get_request"; - return 0; - } - - my $ip = $sock->peerhost || confess "can't get peerhost from sock: $!"; - - my $xml = $r->content; + my ( $self, $ip, $xml ) = @_; my $size = length( $xml ); - warn "<<<< $ip [" . localtime() . "] ", $r->method, " ", $r->uri, " $size bytes\n"; - - my $dump_nr = $dump_by_ip->{$ip}++; - my $file = sprintf("./dump/%s/%04d.request", $ip, $dump_nr); - - if ( $self->create_dump ) { - mkpath "dump/$ip" unless -e "dump/$ip"; - write_file( $file, $r->as_string ); - warn "### request dumped to file: $file\n" if $self->debug; - } - 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 ); - - if ( defined( $state->{_trigger} ) && $self->create_dump ) { - my $type = sprintf("dump/%s/%04d-%s", $ip, $dump_nr, $state->{_trigger}); - $file =~ s!^.*?([^/]+)$!$1!; #!vim - symlink $file, $type || warn "can't symlink $file -> $type: $!"; - } + $state = CWMP::Parser->parse( $xml ); 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}; + 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 ); @@ -162,56 +115,49 @@ sub process_request { #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: PerlCWMP/42', - 'SOAPServer: PerlCWMP/42' - )."\r\n"); - - $sock->send( "Set-Cookie: ID=" . $state->{ID} . "; path=/\r\n" ) if ( $state->{ID} ); - 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 = ''; + my $status = 200; if ( my $dispatch = $state->{_dispatch} ) { $xml = $self->dispatch( $dispatch ); - } elsif ( $job = $queue->dequeue ) { + } elsif ( my $job = $queue->dequeue ) { $xml = $self->dispatch( $job->dispatch ); - } elsif ( $size == 0 ) { - warn ">>> over, closing connection $to_uid"; - $sock->close; - return; + $job->finish; } else { - warn ">>> empty response $to_uid"; - $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 ">>>> " . $ip . " [" . localtime() . "] sent ", length( $xml )," bytes $to_uid"; + $out .= "Set-Cookie: ID=" . $state->{ID} . "; path=/\r\n" if $state->{ID}; - $job->finish if $job; - warn "### request over for $uid\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 @@ -234,13 +180,6 @@ sub dispatch { 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->create_dump ) { - my $ip = $self->sock->peerhost || confess "can't get sock->peerhost: $!"; - my $dump_nr = $dump_by_ip->{$ip}++; - my $file = sprintf("dump/%s/%04d.response", $ip, $dump_nr ); - write_file( $file, $xml ); - warn "### response dump: $file\n" if $self->debug; - } return $xml; } else { confess "can't dispatch to $dispatch";