mirror of
https://github.com/markqvist/Reticulum.git
synced 2024-11-22 13:40:19 +00:00
Merge branch 'master' of github.com:markqvist/Reticulum
This commit is contained in:
commit
b6928b7d83
@ -58,9 +58,7 @@ class Packet:
|
|||||||
# Header types
|
# Header types
|
||||||
HEADER_1 = 0x00 # Normal header format
|
HEADER_1 = 0x00 # Normal header format
|
||||||
HEADER_2 = 0x01 # Header format used for packets in transport
|
HEADER_2 = 0x01 # Header format used for packets in transport
|
||||||
HEADER_3 = 0x02 # Reserved
|
header_types = [HEADER_1, HEADER_2]
|
||||||
HEADER_4 = 0x03 # Reserved
|
|
||||||
header_types = [HEADER_1, HEADER_2, HEADER_3, HEADER_4]
|
|
||||||
|
|
||||||
# Packet context types
|
# Packet context types
|
||||||
NONE = 0x00 # Generic data packet
|
NONE = 0x00 # Generic data packet
|
||||||
@ -215,7 +213,7 @@ class Packet:
|
|||||||
self.flags = self.raw[0]
|
self.flags = self.raw[0]
|
||||||
self.hops = self.raw[1]
|
self.hops = self.raw[1]
|
||||||
|
|
||||||
self.header_type = (self.flags & 0b11000000) >> 6
|
self.header_type = (self.flags & 0b01000000) >> 6
|
||||||
self.transport_type = (self.flags & 0b00110000) >> 4
|
self.transport_type = (self.flags & 0b00110000) >> 4
|
||||||
self.destination_type = (self.flags & 0b00001100) >> 2
|
self.destination_type = (self.flags & 0b00001100) >> 2
|
||||||
self.packet_type = (self.flags & 0b00000011)
|
self.packet_type = (self.flags & 0b00000011)
|
||||||
|
@ -1427,12 +1427,12 @@ class Transport:
|
|||||||
# Check that the announced destination matches
|
# Check that the announced destination matches
|
||||||
# the handlers aspect filter
|
# the handlers aspect filter
|
||||||
execute_callback = False
|
execute_callback = False
|
||||||
|
announce_identity = RNS.Identity.recall(packet.destination_hash)
|
||||||
if handler.aspect_filter == None:
|
if handler.aspect_filter == None:
|
||||||
# If the handlers aspect filter is set to
|
# If the handlers aspect filter is set to
|
||||||
# None, we execute the callback in all cases
|
# None, we execute the callback in all cases
|
||||||
execute_callback = True
|
execute_callback = True
|
||||||
else:
|
else:
|
||||||
announce_identity = RNS.Identity.recall(packet.destination_hash)
|
|
||||||
handler_expected_hash = RNS.Destination.hash_from_name_and_identity(handler.aspect_filter, announce_identity)
|
handler_expected_hash = RNS.Destination.hash_from_name_and_identity(handler.aspect_filter, announce_identity)
|
||||||
if packet.destination_hash == handler_expected_hash:
|
if packet.destination_hash == handler_expected_hash:
|
||||||
execute_callback = True
|
execute_callback = True
|
||||||
|
Loading…
Reference in New Issue
Block a user