X-Git-Url: http://git.rot13.org/?p=perl-cwmp.git;a=blobdiff_plain;f=lib%2FCWMP%2FSession.pm;h=9d2a7b14b5c15a8512d876603a53cfbbfe56cbe1;hp=442a434e197b828125806dcd9a958096b8f644a4;hb=c0b42dbe7c7a0675380bc460cca4d3e88bde67b4;hpb=cb99de4f46719f44da3f6c280adcd8e627d33424

diff --git a/lib/CWMP/Session.pm b/lib/CWMP/Session.pm
index 442a434..9d2a7b1 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 ( defined $stored->{$n} && $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 );
 			}
 		}
@@ -141,19 +172,47 @@ sub process_request {
 		if ( ! defined $stored->{ParameterInfo} ) {
 			$xml = $self->dispatch( 'GetParameterNames', [ 'InternetGatewayDevice.', 1 ] );
 		} else {
-			my @params = grep { m/\.$/ } keys %{ $stored->{ParameterInfo} };
+			my @params =
+				grep { m/\.$/ }
+				keys %{ $stored->{ParameterInfo} }
+			;
 			if ( @params ) {
 				warn "# GetParameterNames ", dump( @params );
-				$xml = $self->dispatch( 'GetParameterNames', [ shift @params, 1 ] );
+				my $first = shift @params;
+				delete $stored->{ParameterInfo}->{$first};
+				$xml = $self->dispatch( 'GetParameterNames', [ $first, 1 ] );
 				foreach ( @params ) {
 					$queue->enqueue( 'GetParameterNames', [ $_, 1 ] );
-					delete( $stored->{ParameterInfo}->{ $_ } );
+					delete $stored->{ParameterInfo}->{ $_ };
 				}
 				$self->store->set_state( $uid, $stored );
 			} else {
-				warn ">>> empty response $to_uid";
-				$state->{NoMoreRequests} = 1;
-				$xml = '';
+
+				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 = '';
+
+				}
 			}
 		}
 	}