Added rotating message identifier for when messages > 65535 per peer

Tribler · Oct 4, 2017 · cdb7438 · cdb7438
1 parent b28d34f
commit cdb7438
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/ipv8/deprecated/payload.py b/ipv8/deprecated/payload.py
@@ -85,7 +85,7 @@ def __init__(self, destination_address, source_lan_address, source_wan_address,
         self._source_wan_address = source_wan_address
         self._advice = advice
         self._connection_type = connection_type
-        self._identifier = identifier
+        self._identifier = identifier % 65536
         if sync:
             self._time_low, self._time_high, self._modulo, self._offset, self._bloom_filter = sync
         else:
@@ -231,7 +231,7 @@ def __init__(self, destination_address, source_lan_address, source_wan_address,
         self._wan_introduction_address = wan_introduction_address
         self._connection_type = connection_type
         self._tunnel = tunnel
-        self._identifier = identifier
+        self._identifier = identifier % 65536
 
     def to_pack_list(self):
         encoded_connection_type = encode_connection_type(self._connection_type)
@@ -319,7 +319,7 @@ def __init__(self, lan_walker_address, wan_walker_address, identifier):
         super(PunctureRequestPayload, self).__init__()
         self._lan_walker_address = lan_walker_address
         self._wan_walker_address = wan_walker_address
-        self._identifier = identifier
+        self._identifier = identifier % 65536
 
     def to_pack_list(self):
         data = [('4SH', inet_aton(self._lan_walker_address[0]), self._lan_walker_address[1]),
@@ -369,7 +369,7 @@ def __init__(self, source_lan_address, source_wan_address, identifier):
         super(PuncturePayload, self).__init__()
         self._source_lan_address = source_lan_address
         self._source_wan_address = source_wan_address
-        self._identifier = identifier
+        self._identifier = identifier % 65536
 
     def to_pack_list(self):
         data = [('4SH', inet_aton(self._source_lan_address[0]), self._source_lan_address[1]),

diff --git a/ipv8/peerdiscovery/deprecated/discovery_payload.py b/ipv8/peerdiscovery/deprecated/discovery_payload.py
@@ -9,7 +9,7 @@ class SimilarityRequestPayload(Payload):
 
     def __init__(self, identifier, lan_address, wan_address, connection_type, preference_list):
         super(SimilarityRequestPayload, self).__init__()
-        self._identifier = identifier
+        self._identifier = identifier % 65536
         self._preference_list = preference_list
         self._lan_address = lan_address
         self._wan_address = wan_address
@@ -64,7 +64,7 @@ class SimilarityResponsePayload(Payload):
 
     def __init__(self, identifier, preference_list, tb_overlap):
         super(SimilarityResponsePayload, self).__init__()
-        self._identifier = identifier
+        self._identifier = identifier % 65536
         self._preference_list = preference_list
         self._tb_overlap = tb_overlap
 
@@ -103,7 +103,7 @@ class PingPayload(Payload):
 
     def __init__(self, identifier):
         super(PingPayload, self).__init__()
-        self._identifier = identifier
+        self._identifier = identifier % 65536
 
     def to_pack_list(self):
         data = [('H', self._identifier), ]