use GetParameterValues to fetch 16 values at once

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

diff --git a/lib/CWMP/Session.pm b/lib/CWMP/Session.pm
index 442a434..bdde16c 100644 (file)
--- a/lib/CWMP/Session.pm
+++ b/lib/CWMP/Session.pm
@@ -144,16 +144,33 @@ sub process_request {
                        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/\.$/ } 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 ] );
+                                       }
+
+                               } else {
+
+                                       warn ">>> empty response $to_uid";
+                                       $state->{NoMoreRequests} = 1;
+                                       $xml = '';
+
+                               }
                        }
                }
        }