X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=lib%2FCWMP%2FSession.pm;h=ab65e4de14aa0727b4a0e652d6bb9e2c573ead96;hb=154531e14a8fdafceb312dc3eec3eff1ed5676a9;hp=25dd084af6243d99b7d96d8e575feb7870e94e1d;hpb=7b15acb7d67a6679a3c498850a4fffa1459eb0b9;p=perl-cwmp.git

diff --git a/lib/CWMP/Session.pm b/lib/CWMP/Session.pm
index 25dd084..ab65e4d 100644
--- a/lib/CWMP/Session.pm
+++ b/lib/CWMP/Session.pm
@@ -18,7 +18,7 @@ store
 use Data::Dump qw/dump/;
 use Carp qw/carp confess cluck croak/;
 
-use CWMP::Request;
+use CWMP::Parser;
 use CWMP::Methods;
 use CWMP::Store;
 
@@ -64,6 +64,37 @@ sub new {
 	return $self;
 }
 
+my $vendor_data = {
+ 'InternetGatewayDevice.ManagementServer.PeriodicInformEnable' => 1,
+ 'InternetGatewayDevice.ManagementServer.PeriodicInformInterval' => 17,
+ 'InternetGatewayDevice.DeviceInfo.ProvisioningCode' => 'test provision',
+};
+
+our $set_tried;
+
+sub vendor_hook {
+	my ( $self, $uid, $stored, $queue ) = @_;
+	warn "# vendor_hook $uid ",dump($stored) if $self->debug > 2;
+
+	my @refresh;
+
+	foreach my $n ( keys %$vendor_data ) {
+		if ( $vendor_data->{$n} ne $stored->{$n} ) {
+			next if $set_tried->{$uid}->{$n}++;
+			push @refresh, $n;
+			$queue->enqueue( 'SetParameterValues', { $n => $vendor_data->{$n} } );
+		}
+	}
+
+	if ( @refresh ) {
+		$queue->enqueue( 'GetParameterValues', [ @refresh ] );
+		warn "vendor_hook $uid SetParameterValues ", dump( @refresh );
+		return $self->dispatch( 'GetParameterValues', [ @refresh ] );
+	}
+
+	return;
+}
+
 =head2 process_request
 
 One request from client/response from server cycle. Call multiple times to
@@ -88,16 +119,16 @@ sub process_request {
 
 		warn "## request payload: ",length($xml)," bytes\n$xml\n" if $self->debug;
 
-		$state = CWMP::Request->parse( $xml );
+		$state = CWMP::Parser->parse( $xml );
 
 		warn "## acquired state = ", dump( $state ), "\n" if $self->debug;
 
-		if ( ! defined( $state->{DeviceID} ) ) {
+		if ( ! defined( $state->{DeviceId} ) ) {
 			if ( $self->state ) {
-				warn "## state without DeviceID, using old one...\n";
-				$state->{DeviceID} = $self->state->{DeviceID};
+				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 "WARNING: state without DeviceId, and I don't have old one!\n";
 				warn "## state = ",dump( $state );
 			}
 		}
@@ -114,15 +145,6 @@ sub process_request {
 		#warn "last request state = ", dump( $state ), "\n" if $self->debug > 1;
 	}
 
-	my $out = join("\r\n",
-		'HTTP/1.1 200 OK',
-		'Content-Type: text/xml; charset="utf-8"',
-		'Server: Perl-CWMP/42',
-		'SOAPServer: Perl-CWMP/42'
-	) . "\r\n";
-
-	$out .= "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",
@@ -138,23 +160,77 @@ sub process_request {
 		id => $uid,
 		debug => $self->debug,
 	});
-	my $job;
 	$xml = '';
 
 	if ( my $dispatch = $state->{_dispatch} ) {
 		$xml = $self->dispatch( $dispatch );
-	} elsif ( $job = $queue->dequeue ) {
+	} elsif ( my $job = $queue->dequeue ) {
 		$xml = $self->dispatch( $job->dispatch );
+		$job->finish;
 	} else {
-		warn ">>> empty response $to_uid";
-		$state->{NoMoreRequests} = 1;
-		$xml = '';
+		my $stored = $self->store->get_state( $uid );
+		if ( ! defined $stored->{ParameterInfo} ) {
+			$xml = $self->dispatch( 'GetParameterNames', [ 'InternetGatewayDevice.', 1 ] );
+		} else {
+			my @params =
+				grep { m/\.$/ && ! m/\.\d+\.$/ }
+				keys %{ $stored->{ParameterInfo} }
+			;
+			if ( @params ) {
+				warn "# GetParameterNames ", dump( @params );
+				my $first = shift @params;
+				delete $stored->{ParameterInfo}->{$first};
+				$xml = $self->dispatch( 'GetParameterNames', [ $first, 1 ] );
+				foreach ( @params ) {
+					$queue->enqueue( 'GetParameterNames', [ $_, 1 ] );
+					delete $stored->{ParameterInfo}->{ $_ };
+				}
+				$self->store->set_state( $uid, $stored );
+			} else {
+
+				my @params = sort
+					grep { ! exists $stored->{Parameter}->{$_} }
+					grep { ! m/\.$/ && ! m/NumberOfEntries/ }
+					keys %{ $stored->{ParameterInfo} }
+				;
+				if ( @params ) {
+					warn "# GetParameterValues ", dump( @params );
+					my $first = shift @params;
+					$xml = $self->dispatch( 'GetParameterValues', [ $first ] );
+					while ( @params ) {
+						my @chunk = splice @params, 0, 16; # FIXME 16 seems to be max
+						$queue->enqueue( 'GetParameterValues', [ @chunk ] );
+					}
+
+				} elsif ( $xml = $self->vendor_hook( $uid, $stored, $queue ) ) {
+
+					warn "vendor_hook triggered\n";
+
+				} else {
+
+					warn ">>> empty response $to_uid";
+					$state->{NoMoreRequests} = 1;
+					$xml = '';
+
+				}
+			}
+		}
 	}
 
+	my $status = length($xml) ? 200 : 204;
+
+	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";
+
+	$out .= "Set-Cookie: ID=" . $state->{ID} . "; path=/\r\n" if $state->{ID};
+
 	$out .= "Content-Length: " . length( $xml ) . "\r\n\r\n";
 	$out .= $xml if length($xml);
 
-	$job->finish if $job;
 	warn "### request over for $uid\n" if $self->debug;
 
 	return $out;	# next request