com php-src: Fixed SNMP_ERR_TOOBIG handling for bulk walk operations: NEWS ext/snmp/snmp.c
| From: | Boris Lytochkin | Date: | Thu, 19 Dec 2013 20:25:16 +0000 |
| Subject: | com php-src: Fixed SNMP_ERR_TOOBIG handling for bulk walk operations: NEWS ext/snmp/snmp.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74534@lists.php.net to get a copy of this message | ||
Commit: bb51d0e4c0940629ff890d498fdcd699d0e5675a
Author: Boris Lytochkin <lytboris@php.net> Fri, 20 Dec 2013 00:25:16 +0400
Parents: 20eb8e4d11d46c399f2920af0a552007d8d5d608
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bb51d0e4c0940629ff890d498fdcd699d0e5675a
Log:
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
Changed paths:
M NEWS
M ext/snmp/snmp.c
Diff:
diff --git a/NEWS b/NEWS
index 6dea019..9ad1253 100644
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,9 @@ PHP NEWS
- ZIP:
. Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real). (Remi)
+- SNMP:
+ . Fixed SNMP_ERR_TOOBIG handling for bulk walk operations (Boris Lytochkin)
+
12 Dec 2013, PHP 5.4.23
- Core:
diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
index 1bf0b3a..6a4eca5 100644
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -896,6 +896,12 @@ retry:
keepwalking = 1;
}
} else {
+ if (st & SNMP_CMD_WALK && response->errstat == SNMP_ERR_TOOBIG &&
objid_query->max_repetitions > 1) { /* Answer will not fit into single packet */
+ objid_query->max_repetitions /= 2;
+ snmp_free_pdu(response);
+ keepwalking = 1;
+ continue;
+ }
if (!(st & SNMP_CMD_WALK) || response->errstat != SNMP_ERR_NOSUCHNAME ||
Z_TYPE_P(return_value) == IS_BOOL) {
for ( count=1, vars = response->variables;
vars && count != response->errindex;