diff options
| author | Boris Lytochkin <lytboris@php.net> | 2013-12-20 00:25:16 +0400 |
|---|---|---|
| committer | Boris Lytochkin <lytboris@php.net> | 2013-12-20 00:25:16 +0400 |
| commit | bb51d0e4c0940629ff890d498fdcd699d0e5675a (patch) | |
| tree | 8a2de3347391ff57bb913b6b502f5992dc960fd9 | |
| parent | 20eb8e4d11d46c399f2920af0a552007d8d5d608 (diff) | |
| download | php-git-bb51d0e4c0940629ff890d498fdcd699d0e5675a.tar.gz | |
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/snmp/snmp.c | 6 |
2 files changed, 9 insertions, 0 deletions
@@ -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 1bf0b3a4da..6a4eca5f03 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; |