great API breaking update to version [0.07]

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

diff --git a/lib/CWMP/Session.pm b/lib/CWMP/Session.pm
index 41e99d1..fd50a53 100644 (file)
--- a/lib/CWMP/Session.pm
+++ b/lib/CWMP/Session.pm
@@ -7,7 +7,7 @@ use warnings;
 use base qw/Class::Accessor/;
 __PACKAGE__->mk_accessors( qw/
 debug
-store_path
+store
 
 sock
 state
@@ -21,7 +21,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 +34,11 @@ 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',
+       queue => [
+               'GetRPCMethods',
+               [ 'GetParameterValyes', 'InternetGatewayDevice.DeviceInfo.SerialNumber', 0 ],
+       ],
        debug => 1,
   });
 
@@ -51,12 +54,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,25 +101,27 @@ 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";
 
        if ( $self->debug > 2 ) {
                my $file = sprintf("dump/%04d-%s.request", $dump_nr++, $sock->peerhost);
                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') );
+
+               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";
 
@@ -122,11 +130,11 @@ sub process_request {
 
        } 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;
        }
 
 
@@ -139,14 +147,14 @@ sub process_request {
 
        $sock->send( "Set-Cookie: ID=" . $state->{ID} . "; path=/\r\n" ) if ( $state->{ID} );
        
-       my $xml = '';
+       $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";
+               warn ">>> no more queued commands, closing connection\n";
                return 0;
        } else {
                warn ">>> empty response\n";
@@ -176,12 +184,19 @@ 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 $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, @_ );
+               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);