haraldwolff
/
pysnmp-sky
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix var-bind initialization from ObjectIdentity at hlapi

pull/168/head
Ilya Etingof 2018-07-05 10:38:56 +02:00
parent 06eeaf6fbf
commit 23d1aa7bf5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -1,11 +1,12 @@
Revision 4.4.5, released 2018-04-XX Revision 4.4.5, released 2018-07-XX
----------------------------------- -----------------------------------
- Fixed broken InetAddressType rendering caused by a pyasn1 regression - Fixed broken InetAddressType rendering caused by a pyasn1 regression
- Fixed typo in RFC1158 module - Fixed typo in RFC1158 module
- Fixed possible infinite loop in GETBULK response PDU builder - Fixed possible infinite loop in GETBULK response PDU builder
- Fixed memory leak in the T`config.delContext()` VACM management harness - Fixed memory leak in the T`config.delContext()` VACM management harness
- Fixed var-binds initialization from `ObjectIdentity` object at `hlapi`
Revision 4.4.4, released 2018-01-03 Revision 4.4.4, released 2018-01-03
----------------------------------- -----------------------------------

8
pysnmp/hlapi/varbinds.py
View File

@ -29,8 +29,8 @@ class CommandGeneratorVarBinds(AbstractVarBinds):
for varBind in varBinds: for varBind in varBinds:
if isinstance(varBind, ObjectType): if isinstance(varBind, ObjectType):
pass pass
elif isinstance(varBind[0], ObjectIdentity): elif isinstance(varBind, ObjectIdentity):
varBind = ObjectType(*varBind) varBind = ObjectType(varBind)
elif isinstance(varBind[0][0], tuple): # legacy elif isinstance(varBind[0][0], tuple): # legacy
varBind = ObjectType(ObjectIdentity(varBind[0][0][0], varBind[0][0][1], *varBind[0][1:]), varBind[1]) varBind = ObjectType(ObjectIdentity(varBind[0][0][0], varBind[0][0][1], *varBind[0][1:]), varBind[1])
else: else:
@ -57,8 +57,8 @@ class NotificationOriginatorVarBinds(AbstractVarBinds):
for varBind in varBinds: for varBind in varBinds:
if isinstance(varBind, ObjectType): if isinstance(varBind, ObjectType):
pass pass
elif isinstance(varBind[0], ObjectIdentity): elif isinstance(varBind, ObjectIdentity):
varBind = ObjectType(*varBind) varBind = ObjectType(varBind)
else: else:
varBind = ObjectType(ObjectIdentity(varBind[0]), varBind[1]) varBind = ObjectType(ObjectIdentity(varBind[0]), varBind[1])
__varBinds.append(varBind.resolveWithMib(mibViewController)) __varBinds.append(varBind.resolveWithMib(mibViewController))