openkylin
/
net-snmp
mirror of https://gitee.com/openkylin/net-snmp.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix perl bulk gets 

Reviewed-by: Craig Small <csmall@debian.org>
Last-Updated: 2019-02-07

Gbp-Pq: Name fix_perl_bulk_gets.diff
This commit is contained in:
Net-SNMP Packaging Team 2022-06-27 15:01:26 +08:00 committed by Lu zhiping
parent 729a6dbca8
commit 8822c0fff5
1 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
perl/SNMP/SNMP.pm
View File

@ -866,22 +866,11 @@ sub _gettable_do_it() {
$vbl = $_[$#_] if ($state->{'options'}{'callback'}); $vbl = $_[$#_] if ($state->{'options'}{'callback'});
while ($#$vbl > -1 && !$this->{ErrorNum}) { my $num_vbls = defined($vbl) ? scalar @$vbl : 0;
if (($#$vbl + 1) % ($#{$state->{'stopconds'}} + 1) != 0) { my $num_stopconds = scalar @{$state->{'stopconds'}};
if ($vbl->[$#$vbl][2] ne 'ENDOFMIBVIEW') {
# unless it's an end of mib view we didn't get the
# proper number of results back.
print STDERR "ack: gettable results not appropriate\n";
}
my @k = keys(%{$state->{'result_hash'}});
last if ($#k > -1); # bail with what we have
return;
}
$state->{'varbinds'} = []; while ($num_vbls > 0 && !$this->{ErrorNum}) {
my $newstopconds; my @found_eof = (0) x $num_stopconds;
my $lastsetstart = ($state->{'repeatcount'}-1) * ($#{$state->{'stopconds'}}+1);
for (my $i = 0; $i <= $#$vbl; $i++) { for (my $i = 0; $i <= $#$vbl; $i++) {
my $row_oid = SNMP::translateObj($vbl->[$i][0]); my $row_oid = SNMP::translateObj($vbl->[$i][0]);
@ -890,9 +879,11 @@ sub _gettable_do_it() {
my $row_value = $vbl->[$i][2]; my $row_value = $vbl->[$i][2];
my $row_type = $vbl->[$i][3]; my $row_type = $vbl->[$i][3];
if ($row_oid =~ my $stopcond_num = $i % $num_stopconds;
/^$state->{'stopconds'}[$i % ($#{$state->{'stopconds'}}+1)]/ && my $stopcond = $state->{'stopconds'}[$stopcond_num];
$row_value ne 'ENDOFMIBVIEW' ){ if ($row_oid !~ /^\Q$stopcond\E/ || $row_value eq 'ENDOFMIBVIEW') {
$found_eof[$stopcond_num] = 1;
} else {
if ($row_type eq "OBJECTID") { if ($row_type eq "OBJECTID") {
@ -903,26 +894,30 @@ sub _gettable_do_it() {
} }
# continue past this next time
$state->{'varbinds'}[$stopcond_num] = [ $row_text, $row_index ];
# Place the results in a hash # Place the results in a hash
$state->{'result_hash'}{$row_index}{$row_text} = $row_value; $state->{'result_hash'}{$row_index}{$row_text} = $row_value;
# continue past this next time
if ($i >= $lastsetstart) {
push @$newstopconds,
$state->{'stopconds'}->[$i%($#{$state->{'stopconds'}}+1)];
push @{$state->{'varbinds'}},[$vbl->[$i][0],$vbl->[$i][1]];
}
} }
} }
if ($#$newstopconds == -1) {
my @newstopconds = ();
my @newvarbinds = ();
for (my $i = 0; $i < $num_stopconds; ++$i) {
unless ($found_eof[$i]) {
push @newstopconds, $state->{'stopconds'}[$i];
push @newvarbinds, $state->{'varbinds'}[$i];
}
}
if ($#newstopconds == -1) {
last; last;
} }
if ($#{$state->{'varbinds'}} == -1) { $state->{'varbinds'} = \@newvarbinds;
print "gettable ack. shouldn't get here\n"; $state->{'stopconds'} = \@newstopconds;
}
$vbl = $state->{'varbinds'}; $vbl = $state->{'varbinds'};
$state->{'stopconds'} = $newstopconds;
# #
# if we've been configured with a callback, then call the # if we've been configured with a callback, then call the