William/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2024-11-26 23:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implemented endpoint tunneling and path restoration on intermittent link layer connections.

Browse Source
This commit is contained in:
Mark Qvist 2021-09-18 20:38:23 +02:00
parent 7af14cec84
commit 1351316f17
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
RNS/Transport.py
View File

@ -34,7 +34,7 @@ class Transport:
PATHFINDER_R = 1 # Retransmit retries PATHFINDER_R = 1 # Retransmit retries
PATHFINDER_T = 10 # Retry grace period PATHFINDER_T = 10 # Retry grace period
PATHFINDER_RW = 10 # Random window for announce rebroadcast PATHFINDER_RW = 10 # Random window for announce rebroadcast
PATHFINDER_E = 30 # Path expiration in seconds PATHFINDER_E = 60*60*24*7 # Path expiration in seconds
# TODO: Calculate an optimal number for this in # TODO: Calculate an optimal number for this in
# various situations # various situations
@ -979,15 +979,6 @@ class Transport:
tnl_snth_dst = RNS.Destination(None, RNS.Destination.OUT, RNS.Destination.PLAIN, Transport.APP_NAME, "tunnel", "synthesize") tnl_snth_dst = RNS.Destination(None, RNS.Destination.OUT, RNS.Destination.PLAIN, Transport.APP_NAME, "tunnel", "synthesize")
# TODO: Remove
# RNS.log("Tunnel synth for "+str(interface))
# RNS.log("Transport ID : "+str(Transport.identity))
# RNS.log("Tunnel ID : "+RNS.hexrep(tunnel_id))
# RNS.log("IF hash : "+RNS.hexrep(interface_hash))
# RNS.log("Rnd hash : "+RNS.hexrep(random_hash))
# RNS.log("Public key : "+RNS.hexrep(public_key))
# RNS.log("Signature : "+RNS.hexrep(signature))
packet = RNS.Packet(tnl_snth_dst, data, packet_type = RNS.Packet.DATA, transport_type = RNS.Transport.BROADCAST, header_type = RNS.Packet.HEADER_1, attached_interface = interface) packet = RNS.Packet(tnl_snth_dst, data, packet_type = RNS.Packet.DATA, transport_type = RNS.Transport.BROADCAST, header_type = RNS.Packet.HEADER_1, attached_interface = interface)
packet.send() packet.send()
@ -1010,20 +1001,9 @@ class Transport:
remote_transport_identity = RNS.Identity(create_keys=False) remote_transport_identity = RNS.Identity(create_keys=False)
remote_transport_identity.load_public_key(public_key) remote_transport_identity.load_public_key(public_key)
# TODO: Remove
# RNS.log("Transport ID : "+str(remote_transport_identity))
# RNS.log("Tunnel ID : "+RNS.hexrep(tunnel_id))
# RNS.log("IF hash : "+RNS.hexrep(interface_hash))
# RNS.log("Rnd hash : "+RNS.hexrep(random_hash))
# RNS.log("Public key : "+RNS.hexrep(public_key))
# RNS.log("Signature : "+RNS.hexrep(signature))
if remote_transport_identity.validate(signature, signed_data): if remote_transport_identity.validate(signature, signed_data):
# RNS.log("Signature is valid")
Transport.handle_tunnel(tunnel_id, packet.receiving_interface) Transport.handle_tunnel(tunnel_id, packet.receiving_interface)
# else:
# TODO: Remove
# RNS.log("Signature is invalid")
except Exception as e: except Exception as e:
RNS.log("An error occurred while validating tunnel establishment packet.", RNS.LOG_DEBUG) RNS.log("An error occurred while validating tunnel establishment packet.", RNS.LOG_DEBUG)
RNS.log("The contained exception was: "+str(e), RNS.LOG_DEBUG) RNS.log("The contained exception was: "+str(e), RNS.LOG_DEBUG)