r260@brr: dpavlin | 2007-11-25 13:51:25 +0100

[perl-cwmp.git] / lib / CWMP / Session.pm

diff --git a/lib/CWMP/Session.pm b/lib/CWMP/Session.pm
index 25fef34..e8fa1dd 100644 (file)
--- a/lib/CWMP/Session.pm
+++ b/lib/CWMP/Session.pm
@@ -8,7 +8,7 @@ use base qw/Class::Accessor/;
 __PACKAGE__->mk_accessors( qw/
 debug
 create_dump
-store
+session
 
 sock
 state
@@ -17,13 +17,15 @@ 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::Methods;
 use CWMP::Store;
 
+#use Devel::LeakTrace::Fast;
+
 =head1 NAME
 
 CWMP::Session - implement logic of CWMP protocol
@@ -34,7 +36,7 @@ CWMP::Session - implement logic of CWMP protocol
 
   my $server = CWMP::Session->new({
        sock => $io_socket_object,
-       store => 'state.db',
+       store => { ... },
        debug => 1,
        create_dump => 1,
   });
@@ -46,10 +48,12 @@ sub new {
        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,
@@ -98,7 +102,12 @@ sub process_request {
        # 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 $xml = $r->content;
 
@@ -111,7 +120,7 @@ sub process_request {
 
        if ( $self->create_dump ) {
                write_file( $file, $r->as_string );
-               warn "### request dumped to file: $file\n";
+               warn "### request dumped to file: $file\n" if $self->debug;
        }
 
        my $state;
@@ -129,7 +138,7 @@ sub process_request {
                        symlink $file, $type || warn "can't symlink $file -> $type: $!";
                }
 
-               warn "## acquired state = ", dump( $state ), "\n";
+               warn "## acquired state = ", dump( $state ), "\n" if $self->debug;
 
                if ( ! defined( $state->{DeviceID} ) ) {
                        warn "## state with DeviceID, using old one...\n";
@@ -137,7 +146,7 @@ sub process_request {
                }
 
                $self->state( $state );
-               $self->store->update_state( ID => $state->{ID}, $state );
+               $self->store->update_state( $state );
 
        } else {
 
@@ -148,17 +157,25 @@ 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: 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 $uid = $self->store->ID_to_uid( $state->{ID}, $state );
+       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,
@@ -172,10 +189,11 @@ sub process_request {
        } elsif ( $job = $queue->dequeue ) {
                $xml = $self->dispatch( $job->dispatch );
        } elsif ( $size == 0 ) {
-               warn ">>> no more queued commands, closing connection to $uid\n";
-               return 0;
+               warn ">>> over, closing connection $to_uid";
+               $sock->close;
+               return;
        } else {
-               warn ">>> empty response to $uid\n";
+               warn ">>> empty response $to_uid";
                $state->{NoMoreRequests} = 1;
                $xml = $self->dispatch( 'xml', sub {} );
        }
@@ -183,7 +201,7 @@ sub process_request {
        $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 to $uid\n";
+       warn ">>>> " . $sock->peerhost . " [" . localtime() . "] sent ", length( $xml )," bytes $to_uid";
 
        $job->finish if $job;
        warn "### request over for $uid\n" if $self->debug;
@@ -202,8 +220,6 @@ If debugging level of 3 or more, it will create dumps of responses named C<< dum
 sub dispatch {
        my $self = shift;
 
-warn "##!!! dispatch(",dump( @_ ),")\n";
-
        my $dispatch = shift || die "no dispatch?";
        my $args = shift;
 
@@ -216,7 +232,7 @@ warn "##!!! dispatch(",dump( @_ ),")\n";
                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 {