X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2FCWMP%2FSession.pm;h=e2f6b8cbc8454232530aa3227b9517f5aa83f54e;hb=d4b4202a2f21c686eb6bb6c9efaf49cf3ed7c954;hp=b971331e481998b200fcb4eb981da0316058d815;hpb=4c0e11c9fce3d7cdffc724ae4b3b9754edf72e82;p=perl-cwmp.git

diff --git a/lib/CWMP/Session.pm b/lib/CWMP/Session.pm
index b971331..e2f6b8c 100644
--- a/lib/CWMP/Session.pm
+++ b/lib/CWMP/Session.pm
@@ -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
@@ -100,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;
 
@@ -113,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;
@@ -131,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";
@@ -139,7 +146,7 @@ sub process_request {
 		}
 
 		$self->state( $state );
-		$self->store->update_state( ID => $state->{ID}, $state );
+		$self->store->update_state( $state );
 
 	} else {
 
@@ -150,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,
@@ -174,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 ">>> no more queued commands, no client pending, 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 {} );
 	}
@@ -185,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;
@@ -216,7 +232,7 @@ sub dispatch {
 		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 {