diff options
| author | elie <elie> | 2005-10-12 16:08:24 +0000 |
|---|---|---|
| committer | elie <elie> | 2005-10-12 16:08:24 +0000 |
| commit | 6377d530c8b93214f3084f2da17834c7b9ba1dfb (patch) | |
| tree | 6094e0b0f888e4c3c9d281aa2a94c9bf5aff7561 | |
| parent | e294fefcc8e2d73657796400cfe95829209f9194 (diff) | |
| download | pysnmp-6377d530c8b93214f3084f2da17834c7b9ba1dfb.tar.gz | |
strip two leading var-binds from v2 trap PDU
| -rw-r--r-- | pysnmp/proto/proxy/rfc2576.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pysnmp/proto/proxy/rfc2576.py b/pysnmp/proto/proxy/rfc2576.py index 03347c8..365279d 100644 --- a/pysnmp/proto/proxy/rfc2576.py +++ b/pysnmp/proto/proxy/rfc2576.py @@ -48,6 +48,9 @@ __v2ToV1PduMap = { v2c.GetBulkRequestPDU.tagSet: v1.GetNextRequestPDU() # 4.1.1 } +__sysUpTime = (1,3,6,1,2,1,1,3) +__null = v1.Null() + # Trap map __v1ToV2TrapMap = { @@ -115,8 +118,8 @@ def v1ToV2(v1Pdu, origV2Pdu=None): else: snmpTrapOID = __v1ToV2TrapMap[genericTrap] - v2VarBinds.append((sysUpTime, None)) - v2VarBinds.append((snmpTrapOID, None)) + v2VarBinds.append((__sysUpTime, sysUpTime)) + v2VarBinds.append((snmpTrapOID, __null)) # 3.1.4 --> done below @@ -201,6 +204,8 @@ def v2ToV1(v2Pdu, origV1Pdu=None): # 3.2.5 v1.apiTrapPDU.setTimeStamp(v1Pdu, v2VarBinds[0][1]) + v2VarBinds = v2VarBinds[2:] + # 3.2.6 --> done below if rfc3411.responseClassPDUs.has_key(pduType): |