jacob.eva/Reticulum
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved announce handling for local clients.

Browse Source
This commit is contained in:
Mark Qvist 2021-08-29 12:43:54 +02:00
parent 71c3333e10
commit b694cbdc91
1 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
RNS/Transport.py
View File

@ -734,20 +734,39 @@ class Transport:
announce_context = RNS.Packet.NONE announce_context = RNS.Packet.NONE
announce_data = packet.data announce_data = packet.data
for local_interface in Transport.local_client_interfaces: if Transport.from_local_client(packet) and packet.context == RNS.Packet.PATH_RESPONSE:
new_announce = RNS.Packet( for interface in Transport.interfaces:
announce_destination, if packet.receiving_interface != interface:
announce_data, new_announce = RNS.Packet(
RNS.Packet.ANNOUNCE, announce_destination,
context = announce_context, announce_data,
header_type = RNS.Packet.HEADER_2, RNS.Packet.ANNOUNCE,
transport_type = Transport.TRANSPORT, context = announce_context,
transport_id = Transport.identity.hash, header_type = RNS.Packet.HEADER_2,
attached_interface = local_interface transport_type = Transport.TRANSPORT,
) transport_id = Transport.identity.hash,
attached_interface = interface
)
new_announce.hops = packet.hops
new_announce.send()
else:
for local_interface in Transport.local_client_interfaces:
new_announce = RNS.Packet(
announce_destination,
announce_data,
RNS.Packet.ANNOUNCE,
context = announce_context,
header_type = RNS.Packet.HEADER_2,
transport_type = Transport.TRANSPORT,
transport_id = Transport.identity.hash,
attached_interface = local_interface
)
new_announce.hops = packet.hops
new_announce.send()
new_announce.hops = packet.hops
new_announce.send()
Transport.destination_table[packet.destination_hash] = [now, received_from, announce_hops, expires, random_blobs, packet.receiving_interface, packet] Transport.destination_table[packet.destination_hash] = [now, received_from, announce_hops, expires, random_blobs, packet.receiving_interface, packet]
RNS.log("Path to "+RNS.prettyhexrep(packet.destination_hash)+" is now "+str(announce_hops)+" hops away via "+RNS.prettyhexrep(received_from)+" on "+str(packet.receiving_interface), RNS.LOG_VERBOSE) RNS.log("Path to "+RNS.prettyhexrep(packet.destination_hash)+" is now "+str(announce_hops)+" hops away via "+RNS.prettyhexrep(received_from)+" on "+str(packet.receiving_interface), RNS.LOG_VERBOSE)