r210@brr: dpavlin | 2007-11-14 19:15:41 +0100

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

diff --git a/lib/CWMP/Session.pm b/lib/CWMP/Session.pm
index 263794b..ff6d95d 100644 (file)
--- a/lib/CWMP/Session.pm
+++ b/lib/CWMP/Session.pm
@@ -7,11 +7,10 @@ use warnings;
 use base qw/Class::Accessor/;
 __PACKAGE__->mk_accessors( qw/
 debug
-store_path
+store
 
 sock
 state
-queue
 store
 / );
 
@@ -21,7 +20,7 @@ use Carp qw/confess cluck croak/;
 use File::Slurp;
 
 use CWMP::Request;
-use CWMP::Response;
+use CWMP::Methods;
 use CWMP::Store;
 
 =head1 NAME
@@ -34,8 +33,7 @@ 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 => 'state.db',
        debug => 1,
   });
 
@@ -51,12 +49,15 @@ sub new {
 
        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;
 
-       croak "can't open ", $self->store_path, ": $!" unless $self->store;
+       # FIXME looks ugly. Should we have separate accessor for this?
+       $self->store( $store_obj );
 
        return $self;
 }
@@ -95,42 +96,47 @@ sub process_request {
 
        my $r = $sock->get_request || confess "can't get_request";
 
-       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";
 
+       $dump_nr++;
+       my $file = sprintf("dump/%04d-%s.request", $dump_nr, $sock->peerhost);
+
        if ( $self->debug > 2 ) {
-               my $file = sprintf("dump/%04d.request", $dump_nr);
                write_file( $file, $r->as_string );
-               warn "### request dump: $file\n";
+               warn "### request dumped to file: $file\n";
        }
 
        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') );
 
-               if ( $chunk ) {
-                       warn "## request chunk: ",length($chunk)," bytes\n$chunk\n" if $self->debug;
+               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->debug > 2 ) {
+                       my $type = sprintf("dump/%04d-%s-%s", $dump_nr, $sock->peerhost, $state->{_dispatch});
+                       symlink $file, $type || warn "can't symlink $file -> $type: $!";
+               }
 
-                       $self->state( $state );
-                       $self->store->update_state( ID => $state->{ID}, $state );
+               warn "## acquired state = ", dump( $state ), "\n";
 
-               } else {
-                       warn "## empty request\n";
-               }
+               $self->state( $state );
+               $self->store->update_state( ID => $state->{ID}, $state );
 
        } else {
+
+               warn "## empty request, using last request state\n";
+
                $state = $self->state;
-               warn "last request state = ", dump( $state ), "\n" if $self->debug > 1;
+               delete( $state->{_dispatch} );
+               #warn "last request state = ", dump( $state ), "\n" if $self->debug > 1;
        }
 
 
@@ -142,18 +148,25 @@ sub process_request {
        )."\r\n");
 
        $sock->send( "Set-Cookie: ID=" . $state->{ID} . "; path=/\r\n" ) if ( $state->{ID} );
-       
-       my $xml = '';
+
+       my $uid = $self->store->ID_to_uid( $state->{ID}, $state );
+
+       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 ">>> closing connection\n";
+               warn ">>> no more queued commands, closing connection to $uid\n";
                return 0;
        } else {
-               warn ">>> empty response\n";
+               warn ">>> empty response to $uid\n";
                $state->{NoMoreRequests} = 1;
                $xml = $self->dispatch( 'xml', sub {} );
        }
@@ -161,9 +174,10 @@ 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\n";
+       warn ">>>> " . $sock->peerhost . " [" . localtime() . "] sent ", length( $xml )," bytes to $uid\n";
 
-       warn "### request over\n" if $self->debug;
+       $job->finish if $job;
+       warn "### request over for $uid\n" if $self->debug;
 
        return 1;       # next request
 };
@@ -179,16 +193,19 @@ 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;
 
-       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++);
+                       my $file = sprintf("dump/%04d-%s.response", $dump_nr++, $self->sock->peerhost);
                        write_file( $file, $xml );
                        warn "### response dump: $file\n";
                }