diff options
| author | Ilya Etingof <etingof@gmail.com> | 2018-07-08 09:49:44 +0200 |
|---|---|---|
| committer | Ilya Etingof <etingof@gmail.com> | 2018-07-08 09:49:44 +0200 |
| commit | 8dbc28d3602fd2ceaeebdc563d98ad8f467099e4 (patch) | |
| tree | 8efff4cde21e82fb4fda99b547f57c61aeed4f1a /examples | |
| parent | 212e1b54c3d356e6da8a470187fa185be8aa172e (diff) | |
| download | pysnmp-git-8dbc28d3602fd2ceaeebdc563d98ad8f467099e4.tar.gz | |
Fix BULKWALK examples
Avoid sending out extra GETBULK on EOM condition
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/v1arch/asyncore/manager/cmdgen/getbulk-pull-whole-mib.py | 3 | ||||
| -rw-r--r-- | examples/v1arch/asyncore/manager/cmdgen/getnext-pull-whole-mib.py | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/examples/v1arch/asyncore/manager/cmdgen/getbulk-pull-whole-mib.py b/examples/v1arch/asyncore/manager/cmdgen/getbulk-pull-whole-mib.py index dd8466af..4ea51dac 100644 --- a/examples/v1arch/asyncore/manager/cmdgen/getbulk-pull-whole-mib.py +++ b/examples/v1arch/asyncore/manager/cmdgen/getbulk-pull-whole-mib.py @@ -48,6 +48,7 @@ def cbTimerFun(timeNow): # noinspection PyUnusedLocal def cbRecvFun(transportDispatcher, transportDomain, transportAddress, wholeMsg, reqPDU=reqPDU, headVars=headVars): + while wholeMsg: rspMsg, wholeMsg = decoder.decode(wholeMsg, asn1Spec=v2c.Message()) @@ -81,6 +82,7 @@ def cbRecvFun(transportDispatcher, transportDomain, transportAddress, break else: transportDispatcher.jobFinished(1) + continue # Generate request for next row v2c.apiBulkPDU.setVarBinds( @@ -94,6 +96,7 @@ def cbRecvFun(transportDispatcher, transportDomain, transportAddress, if time() - startedAt > 3: raise Exception('Request timed out') startedAt = time() + return wholeMsg diff --git a/examples/v1arch/asyncore/manager/cmdgen/getnext-pull-whole-mib.py b/examples/v1arch/asyncore/manager/cmdgen/getnext-pull-whole-mib.py index c18b356a..b6216207 100644 --- a/examples/v1arch/asyncore/manager/cmdgen/getnext-pull-whole-mib.py +++ b/examples/v1arch/asyncore/manager/cmdgen/getnext-pull-whole-mib.py @@ -49,6 +49,7 @@ def cbTimerFun(timeNow): # noinspection PyUnusedLocal def cbRecvFun(transportDispatcher, transportDomain, transportAddress, wholeMsg, reqPDU=reqPDU, headVars=headVars): + while wholeMsg: rspMsg, wholeMsg = decoder.decode(wholeMsg, asn1Spec=pMod.Message()) rspPDU = pMod.apiMessage.getPDU(rspMsg) @@ -73,6 +74,7 @@ def cbRecvFun(transportDispatcher, transportDomain, transportAddress, break else: transportDispatcher.jobFinished(1) + continue # Generate request for next row pMod.apiPDU.setVarBinds( @@ -86,6 +88,7 @@ def cbRecvFun(transportDispatcher, transportDomain, transportAddress, if time() - startedAt > 3: raise Exception('Request timed out') startedAt = time() + return wholeMsg |