some more debugging

2 files changed, 11 insertions, 4 deletions

diff --git a/pysnmp/proto/mpmod/rfc3412.py b/pysnmp/proto/mpmod/rfc3412.py
index b65a2ca..8868037 100644
--- a/pysnmp/proto/mpmod/rfc3412.py
+++ b/pysnmp/proto/mpmod/rfc3412.py
@@ -3,7 +3,7 @@ from pysnmp.proto.mpmod.base import AbstractMessageProcessingModel
 from pysnmp.proto.secmod import rfc3414
 from pysnmp.proto import rfc1905, rfc3411, error, api
 from pyasn1.type import univ, namedtype, constraint
-from pyasn1.codec.ber import encoder, decoder
+from pyasn1.codec.ber import decoder
 from pyasn1.error import PyAsn1Error
 from pysnmp import debug
 
@@ -154,6 +154,8 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
         # XXX need to coerce MIB value as it has incompatible constraints set
         headerData.setComponentByPosition(3, int(securityModel))
 
+        debug.logger & debug.flagMP and debug.logger('prepareOutgoingMessage: %s' % (msg.prettyPrint(),))
+
         smHandler = snmpEngine.securityModels.get(securityModel)
         if smHandler is None:
             raise error.StatusInformation(
@@ -371,6 +373,8 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
         # 7.1.7e
         headerData.setComponentByPosition(3, securityModel)
 
+        debug.logger & debug.flagMP and debug.logger('prepareResponseMessage: %s' % (msg.prettyPrint(),))
+
         smHandler = snmpEngine.securityModels.get(securityModel)
         if smHandler is None:
             raise error.StatusInformation(
@@ -425,7 +429,7 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel):
                 errorIndication = 'parseError'
                 )
 
-        debug.logger & debug.flagMP and debug.logger('prepareDataElements: msg decoded')
+        debug.logger & debug.flagMP and debug.logger('prepareDataElements: %s' % (msg.prettyPrint(),))
 
         # 7.2.3
         headerData = msg.getComponentByPosition(1)
diff --git a/pysnmp/proto/secmod/rfc3414/service.py b/pysnmp/proto/secmod/rfc3414/service.py
index afa4b13..99eb23d 100644
--- a/pysnmp/proto/secmod/rfc3414/service.py
+++ b/pysnmp/proto/secmod/rfc3414/service.py
@@ -358,6 +358,8 @@ class SnmpUSMSecurityModel(AbstractSecurityModel):
                 4, '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
                 )
 
+            debug.logger & debug.flagSM and debug.logger('__generateRequestOrResponseMsg: %s' % (securityParameters.prettyPrint(),))
+            
             msg.setComponentByPosition(2, encoder.encode(securityParameters))
 
             wholeMsg = encoder.encode(msg)
@@ -373,6 +375,7 @@ class SnmpUSMSecurityModel(AbstractSecurityModel):
         # 3.1.8b
         else:
             securityParameters.setComponentByPosition(4, '')
+            debug.logger & debug.flagSM and debug.logger('__generateRequestOrResponseMsg: %s' % (securityParameters.prettyPrint(),))
             msg.setComponentByPosition(2, encoder.encode(securityParameters))
             authenticatedWholeMsg = encoder.encode(msg)
             debug.logger & debug.flagSM and debug.logger('__generateRequestOrResponseMsg: plain outgoing msg')
@@ -459,8 +462,8 @@ class SnmpUSMSecurityModel(AbstractSecurityModel):
                errorIndication='parseError'
                )
 
-        debug.logger & debug.flagSM and debug.logger('processIncomingMsg: securityParams parsed')
-       
+        debug.logger & debug.flagSM and debug.logger('processIncomingMsg: %s' % (securityParameters.prettyPrint(),))
+
         # 3.2.9 -- moved up here to be able to report
         # maxSizeResponseScopedPDU on error
         maxSizeResponseScopedPDU = maxMessageSize - 512   # XXX