rt/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2026-10-26 02:48:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Extract outbound IFAC handling

Browse source
This commit is contained in:
Mark Qvist 2026-08-23 22:05:36 +02:00
parent e806ae5837
commit aef9e5b416
No known key found for this signature in database
1 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

64
RNS/Transport.py
View file

@ -1257,42 +1257,42 @@ class Transport:
def handle_outgoing_announces(outgoing):
for packet in sorted(outgoing, key=lambda p: p.hops): packet.send()
@staticmethod
def handle_outgoing_ifac_legacy(interface, raw):
# Calculate packet access code
ifac = interface.ifac_identity.sign(raw)[-interface.ifac_size:]
# Generate mask
mask = RNS.Cryptography.hkdf(length=len(raw)+interface.ifac_size, derive_from=ifac,
salt=interface.ifac_key, context=None)
# Set IFAC flag
new_header = bytes([raw[0] | 0x80, raw[1]])
# Assemble new payload with IFAC
new_raw = new_header+ifac+raw[2:]
# Mask payload
i = 0; masked_raw = b""
for byte in new_raw:
# Mask first header byte, but make sure the
# IFAC flag is still set
if i == 0: masked_raw += bytes([byte ^ mask[i] | 0x80])
# Mask second header byte and payload
elif i == 1 or i > interface.ifac_size+1: masked_raw += bytes([byte ^ mask[i]])
# Don't mask the IFAC itself
else: masked_raw += bytes([byte])
i += 1
return masked_raw
@staticmethod
def transmit(interface, raw):
try:
if hasattr(interface, "ifac_identity") and interface.ifac_identity != None:
# Calculate packet access code
ifac = interface.ifac_identity.sign(raw)[-interface.ifac_size:]
# Generate mask
mask = RNS.Cryptography.hkdf(length=len(raw)+interface.ifac_size,
derive_from=ifac,
salt=interface.ifac_key,
context=None)
# Set IFAC flag
new_header = bytes([raw[0] | 0x80, raw[1]])
# Assemble new payload with IFAC
new_raw = new_header+ifac+raw[2:]
# Mask payload
i = 0; masked_raw = b""
for byte in new_raw:
# Mask first header byte, but make sure the
# IFAC flag is still set
if i == 0: masked_raw += bytes([byte ^ mask[i] | 0x80])
# Mask second header byte and payload
elif i == 1 or i > interface.ifac_size+1: masked_raw += bytes([byte ^ mask[i]])
# Don't mask the IFAC itself
else: masked_raw += bytes([byte])
i += 1
# Send it
interface.process_outgoing(masked_raw)
interface.process_outgoing(Transport.handle_outgoing_ifac_legacy(interface, raw))
else: interface.process_outgoing(raw)
Transport.tx_packets += 1