From bd9286ef419fc4064deae7ba2ccfbe9625c301eb Mon Sep 17 00:00:00 2001 From: Jonathan Warren Date: Wed, 28 Jan 2015 14:14:28 -0500 Subject: [PATCH] msg objects now contain an objectVersion --- src/shared.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/shared.py b/src/shared.py index ec16e6e9..cfe24340 100644 --- a/src/shared.py +++ b/src/shared.py @@ -591,7 +591,7 @@ def checkAndShareObjectWithPeers(data): """ if len(data) > 2 ** 18: logger.info('The payload length of this object is too large (%s bytes). Ignoring it.' % len(data)) - return + return 0 # Let us check to make sure that the proof of work is sufficient. if not isProofOfWorkSufficient(data): logger.info('Proof of work is insufficient.') @@ -663,6 +663,9 @@ def _checkAndShareUndefinedObjectWithPeers(data): def _checkAndShareMsgWithPeers(data): embeddedTime, = unpack('>Q', data[8:16]) readPosition = 20 # bypass nonce, time, and object type + objectVersion, objectVersionLength = decodeVarint( + data[readPosition:readPosition + 9]) + readPosition += objectVersionLength streamNumber, streamNumberLength = decodeVarint( data[readPosition:readPosition + 9]) if not streamNumber in streamsInWhichIAmParticipating: