diff options
| author | Ilya Etingof <etingof@gmail.com> | 2019-02-25 09:32:56 +0100 |
|---|---|---|
| committer | Ilya Etingof <etingof@gmail.com> | 2019-02-25 09:32:56 +0100 |
| commit | 0780b2474eefbc3cfb1f2857657dfdd14e1def90 (patch) | |
| tree | b322e909af7b1e590ade5b85012fec26ec01dbd4 | |
| parent | 9e484d801bf395e6ecd796f42b3eec9e2272f8fb (diff) | |
| download | pysnmp-git-0780b2474eefbc3cfb1f2857657dfdd14e1def90.tar.gz | |
Fix PDU consistency check in notification originator
| -rw-r--r-- | examples/hlapi/v3arch/asyncore/sync/agent/ntforg/custom-v1-trap.py | 2 | ||||
| -rw-r--r-- | pysnmp/entity/rfc3413/ntforg.py | 4 | ||||
| -rw-r--r-- | pysnmp/hlapi/v1arch/asyncio/ntforg.py | 4 | ||||
| -rw-r--r-- | pysnmp/hlapi/v1arch/asyncore/ntforg.py | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/examples/hlapi/v3arch/asyncore/sync/agent/ntforg/custom-v1-trap.py b/examples/hlapi/v3arch/asyncore/sync/agent/ntforg/custom-v1-trap.py index 017fc8b8..90f14519 100644 --- a/examples/hlapi/v3arch/asyncore/sync/agent/ntforg/custom-v1-trap.py +++ b/examples/hlapi/v3arch/asyncore/sync/agent/ntforg/custom-v1-trap.py @@ -31,7 +31,7 @@ iterator = sendNotification( ContextData(), 'trap', NotificationType( - ObjectIdentity('1.3.6.1.4.1.20408.4.1.1.2.0.432'), + ObjectIdentity('1.3.6.1.4.1.20408.4.1.1.2.0.432') ).addVarBinds( ('1.3.6.1.2.1.1.3.0', 12345), ('1.3.6.1.6.3.18.1.3.0', '127.0.0.1'), diff --git a/pysnmp/entity/rfc3413/ntforg.py b/pysnmp/entity/rfc3413/ntforg.py index c4e84a53..e73dbf19 100644 --- a/pysnmp/entity/rfc3413/ntforg.py +++ b/pysnmp/entity/rfc3413/ntforg.py @@ -238,7 +238,7 @@ class NotificationOriginator(object): for idx, varBind in enumerate(varBinds[1:]): if varBind[0] == sysUpTime: varBinds[0] = varBind - del varBinds[idx] + del varBinds[idx + 1] break if len(varBinds) < 2: @@ -248,7 +248,7 @@ class NotificationOriginator(object): # Search for and reposition snmpTrapOID if it's elsewhere for idx, varBind in enumerate(varBinds[2:]): if varBind[0] == snmpTrapOID: - del varBinds[idx] + del varBinds[idx + 2] if varBinds[1][0] == snmpTrapOID: varBinds[1] = varBind else: diff --git a/pysnmp/hlapi/v1arch/asyncio/ntforg.py b/pysnmp/hlapi/v1arch/asyncio/ntforg.py index 96005813..a9f623ed 100644 --- a/pysnmp/hlapi/v1arch/asyncio/ntforg.py +++ b/pysnmp/hlapi/v1arch/asyncio/ntforg.py @@ -141,7 +141,7 @@ def sendNotification(snmpDispatcher, authData, transportTarget, for idx, varBind in enumerate(varBinds[1:]): if varBind[0] == sysUpTime: varBinds[0] = varBind - del varBinds[idx] + del varBinds[idx + 1] break if len(varBinds) < 2: @@ -151,7 +151,7 @@ def sendNotification(snmpDispatcher, authData, transportTarget, # Search for and reposition snmpTrapOID if it's elsewhere for idx, varBind in enumerate(varBinds[2:]): if varBind[0] == snmpTrapOID: - del varBinds[idx] + del varBinds[idx + 2] if varBinds[1][0] == snmpTrapOID: varBinds[1] = varBind else: diff --git a/pysnmp/hlapi/v1arch/asyncore/ntforg.py b/pysnmp/hlapi/v1arch/asyncore/ntforg.py index 0e0f61d4..808d4a31 100644 --- a/pysnmp/hlapi/v1arch/asyncore/ntforg.py +++ b/pysnmp/hlapi/v1arch/asyncore/ntforg.py @@ -131,7 +131,7 @@ def sendNotification(snmpDispatcher, authData, transportTarget, for idx, varBind in enumerate(varBinds[1:]): if varBind[0] == sysUpTime: varBinds[0] = varBind - del varBinds[idx] + del varBinds[idx + 1] break if len(varBinds) < 2: @@ -141,7 +141,7 @@ def sendNotification(snmpDispatcher, authData, transportTarget, # Search for and reposition snmpTrapOID if it's elsewhere for idx, varBind in enumerate(varBinds[2:]): if varBind[0] == snmpTrapOID: - del varBinds[idx] + del varBinds[idx + 2] if varBinds[1][0] == snmpTrapOID: varBinds[1] = varBind else: |