Fix PDU consistency check in notification originator

lextudio · Aug 26, 2024 · 2838892 · 2838892
1 parent 72bf329
commit 2838892
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -16,6 +16,7 @@ Revision 7.0.3, released on Aug 26, 2024
   automation around building well-formed SNMP messages is and mediating
   differences between SNMP versions is not present in this new `v1arch`
   layer.
+
 - The signature of the hlapi `.sendNotification()` call has changed
   to accept `*varBinds` instead of a sequence of `varBinds`. The rationale
   is to unify this method call with similar methods of CommandGenerator.

diff --git a/pysnmp/hlapi/asyncio/__init__.py b/pysnmp/hlapi/asyncio/__init__.py
@@ -0,0 +1,9 @@
+#
+# This file is part of pysnmp software.
+#
+# Copyright (c) 2005-2019, Ilya Etingof <[email protected]>
+# License: http://snmplabs.com/pysnmp/license.html
+#
+
+# default is v3arch
+from pysnmp.hlapi.v3arch.asyncio import *
diff --git a/pysnmp/hlapi/v1arch/asyncio/ntforg.py b/pysnmp/hlapi/v1arch/asyncio/ntforg.py
@@ -137,7 +137,7 @@ def _ensureVarBinds(varBinds):
         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:
@@ -149,7 +149,7 @@ def _ensureVarBinds(varBinds):
         # 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: