summaryrefslogtreecommitdiff
path: root/pysnmp/proto
diff options
context:
space:
mode:
authorIlya Etingof <etingof@gmail.com>2017-03-23 00:33:32 +0100
committerIlya Etingof <etingof@gmail.com>2017-03-23 00:33:32 +0100
commit806cf54f2f02854260cb1948e2825b2a2f586469 (patch)
tree5de7e4f79bd99cb6f82411d88fa6a1d530aaa5e1 /pysnmp/proto
parente9eca3a5501417b106e6e9449bbe2d1648f6446f (diff)
downloadpysnmp-git-806cf54f2f02854260cb1948e2825b2a2f586469.tar.gz
more concise unknown PDU event handling
Diffstat (limited to 'pysnmp/proto')
-rw-r--r--pysnmp/proto/rfc3412.py17
1 files changed, 7 insertions, 10 deletions
diff --git a/pysnmp/proto/rfc3412.py b/pysnmp/proto/rfc3412.py
index 97dca0ae..1a06dec4 100644
--- a/pysnmp/proto/rfc3412.py
+++ b/pysnmp/proto/rfc3412.py
@@ -361,6 +361,7 @@ class MsgAndPduDispatcher(object):
debug.logger & debug.flagDsp and debug.logger('receiveMessage: unhandled PDU type')
+ # 4.2.2.1.2.c
try:
(destTransportDomain,
destTransportAddress,
@@ -372,25 +373,21 @@ class MsgAndPduDispatcher(object):
statusInformation
)
- except (error.StatusInformation, error.ProtocolError):
- debug.logger & debug.flagDsp and debug.logger(
- 'receiveMessage: report failed, statusInformation %s' % sys.exc_info()[1])
- return restOfWholeMsg
-
- # 4.2.2.1.2.c
- try:
snmpEngine.transportDispatcher.sendMessage(
outgoingMessage, destTransportDomain,
destTransportAddress
)
- except PySnmpError: # XXX
- pass
+ except PySnmpError:
+ debug.logger & debug.flagDsp and debug.logger(
+ 'receiveMessage: report failed, statusInformation %s' % sys.exc_info()[1])
- debug.logger & debug.flagDsp and debug.logger('receiveMessage: reporting succeeded')
+ else:
+ debug.logger & debug.flagDsp and debug.logger('receiveMessage: reporting succeeded')
# 4.2.2.1.2.d
return restOfWholeMsg
+
else:
snmpEngine.observer.storeExecutionContext(
snmpEngine, 'rfc3412.receiveMessage:request',