diff options
| author | elie <elie> | 2012-07-22 09:24:42 +0000 |
|---|---|---|
| committer | elie <elie> | 2012-07-22 09:24:42 +0000 |
| commit | 32df61a9ff508c70d216f60fde614b0bfcfa7fc7 (patch) | |
| tree | 461a57782ac9c7b67492b1d96e18219906104538 | |
| parent | fd6583984924ec62f55f9ffc813409c22af43766 (diff) | |
| download | pysnmp-git-32df61a9ff508c70d216f60fde614b0bfcfa7fc7.tar.gz | |
cast transportDispatcher's timing values into ints to match incrementing
integer counter
| -rw-r--r-- | pysnmp/proto/mpmod/rfc3412.py | 4 | ||||
| -rw-r--r-- | pysnmp/proto/secmod/rfc3414/service.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pysnmp/proto/mpmod/rfc3412.py b/pysnmp/proto/mpmod/rfc3412.py index a8238845..9eb4a91c 100644 --- a/pysnmp/proto/mpmod/rfc3412.py +++ b/pysnmp/proto/mpmod/rfc3412.py @@ -612,7 +612,7 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel): 'contextName': contextName } - expireAt = self.__expirationTimer + 300 / snmpEngine.transportDispatcher.getTimerResolution() + expireAt = int(self.__expirationTimer + 300 / snmpEngine.transportDispatcher.getTimerResolution()) if expireAt not in self.__engineIDsExpQueue: self.__engineIDsExpQueue[expireAt] = [] self.__engineIDsExpQueue[expireAt].append(k) @@ -787,7 +787,7 @@ class SnmpV3MessageProcessingModel(AbstractMessageProcessingModel): if self.__expirationTimer in self.__engineIDsExpQueue: for engineKey in self.__engineIDsExpQueue[self.__expirationTimer]: del self.__engineIDs[engineKey] - debug.logger & debug.flagMP and debug.logger('__expireEnginesInfo: expiring %s' % (engineKey,)) + debug.logger & debug.flagMP and debug.logger('__expireEnginesInfo: expiring %r' % (engineKey,)) del self.__engineIDsExpQueue[self.__expirationTimer] self.__expirationTimer = self.__expirationTimer + 1 diff --git a/pysnmp/proto/secmod/rfc3414/service.py b/pysnmp/proto/secmod/rfc3414/service.py index cf889f35..2bea14ee 100644 --- a/pysnmp/proto/secmod/rfc3414/service.py +++ b/pysnmp/proto/secmod/rfc3414/service.py @@ -706,7 +706,7 @@ class SnmpUSMSecurityModel(AbstractSecurityModel): int(time.time()) ) - expireAt = self.__expirationTimer + 300 / snmpEngine.transportDispatcher.getTimerResolution() + expireAt = int(self.__expirationTimer + 300 / snmpEngine.transportDispatcher.getTimerResolution()) if expireAt not in self.__timelineExpQueue: self.__timelineExpQueue[expireAt] = [] self.__timelineExpQueue[expireAt].append( @@ -773,7 +773,7 @@ class SnmpUSMSecurityModel(AbstractSecurityModel): msgAuthoritativeEngineTime, int(time.time()) ) - expireAt = self.__expirationTimer + 300 / snmpEngine.transportDispatcher.getTimerResolution() + expireAt = int(self.__expirationTimer + 300 / snmpEngine.transportDispatcher.getTimerResolution()) if expireAt not in self.__timelineExpQueue: self.__timelineExpQueue[expireAt] = [] self.__timelineExpQueue[expireAt].append( @@ -882,7 +882,7 @@ class SnmpUSMSecurityModel(AbstractSecurityModel): for engineIdKey in self.__timelineExpQueue[self.__expirationTimer]: if engineIdKey in self.__timeline: del self.__timeline[engineIdKey] - debug.logger & debug.flagSM and debug.logger('__expireEnginesInfo: expiring %s' % (engineIdKey,)) + debug.logger & debug.flagSM and debug.logger('__expireTimelineInfo: expiring %r' % (engineIdKey,)) del self.__timelineExpQueue[self.__expirationTimer] self.__expirationTimer = self.__expirationTimer + 1 |