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

Work on AutoInterface recovery on WiFi carrier loss

Browse Source
This commit is contained in:
Mark Qvist 2022-02-22 14:43:14 +01:00
parent 05288d7c97
commit aae10ede72
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
RNS/Interfaces/AutoInterface.py
View File

@ -43,6 +43,7 @@ class AutoInterface(Interface):
self.peers = {} self.peers = {}
self.link_local_addresses = [] self.link_local_addresses = []
self.adopted_interfaces = {} self.adopted_interfaces = {}
self.multicast_echoes = {}
self.outbound_udp_socket = None self.outbound_udp_socket = None
@ -123,6 +124,7 @@ class AutoInterface(Interface):
link_local_addr = address["addr"] link_local_addr = address["addr"]
self.link_local_addresses.append(link_local_addr.split("%")[0]) self.link_local_addresses.append(link_local_addr.split("%")[0])
self.adopted_interfaces[ifname] = link_local_addr.split("%")[0] self.adopted_interfaces[ifname] = link_local_addr.split("%")[0]
self.multicast_echoes[ifname] = time.time()
RNS.log(str(self)+" Selecting link-local address "+str(link_local_addr)+" for interface "+str(ifname), RNS.LOG_EXTREME) RNS.log(str(self)+" Selecting link-local address "+str(link_local_addr)+" for interface "+str(ifname), RNS.LOG_EXTREME)
if link_local_addr == None: if link_local_addr == None:
@ -215,12 +217,15 @@ class AutoInterface(Interface):
time.sleep(self.peer_job_interval) time.sleep(self.peer_job_interval)
now = time.time() now = time.time()
timed_out_peers = [] timed_out_peers = []
# Check for timed out peers
for peer_addr in self.peers: for peer_addr in self.peers:
peer = self.peers[peer_addr] peer = self.peers[peer_addr]
last_heard = peer[1] last_heard = peer[1]
if now > last_heard+self.peering_timeout: if now > last_heard+self.peering_timeout:
timed_out_peers.append(peer_addr) timed_out_peers.append(peer_addr)
# Remove any timed out peers
for peer_addr in timed_out_peers: for peer_addr in timed_out_peers:
removed_peer = self.peers.pop(peer_addr) removed_peer = self.peers.pop(peer_addr)
RNS.log(str(self)+" removed peer "+str(peer_addr)+" on "+str(removed_peer[0]), RNS.LOG_DEBUG) RNS.log(str(self)+" removed peer "+str(peer_addr)+" on "+str(removed_peer[0]), RNS.LOG_DEBUG)
@ -232,6 +237,7 @@ class AutoInterface(Interface):
time.sleep(self.announce_interval) time.sleep(self.announce_interval)
def peer_announce(self, ifname): def peer_announce(self, ifname):
try:
link_local_address = self.adopted_interfaces[ifname] link_local_address = self.adopted_interfaces[ifname]
discovery_token = RNS.Identity.full_hash(self.group_id+link_local_address.encode("utf-8")) discovery_token = RNS.Identity.full_hash(self.group_id+link_local_address.encode("utf-8"))
announce_socket = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM) announce_socket = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
@ -240,9 +246,24 @@ class AutoInterface(Interface):
ifis = struct.pack("I", socket.if_nametoindex(ifname)) ifis = struct.pack("I", socket.if_nametoindex(ifname))
announce_socket.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_MULTICAST_IF, ifis) announce_socket.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_MULTICAST_IF, ifis)
announce_socket.sendto(discovery_token, addr_info[0][4]) announce_socket.sendto(discovery_token, addr_info[0][4])
except Exception as e:
RNS.log(str(self)+" Exception while sending multicast peer announce: "+str(e))
def add_peer(self, addr, ifname): def add_peer(self, addr, ifname):
if not addr in self.link_local_addresses: if addr in self.link_local_addresses:
ifname = None
for interface_name in self.adopted_interfaces:
if self.adopted_interfaces[interface_name] == addr:
ifname = interface_name
if ifname != None:
self.multicast_echoes[ifname] = time.time()
# TODO: Remove
RNS.log(str(self)+" updated multicast echo time to "+str(self.multicast_echoes[ifname])+" for "+str(addr)+".", RNS.LOG_DEBUG)
else:
RNS.log("Received multicast echo on unexpected interface", RNS.LOG_WARNING)
else:
if not addr in self.peers: if not addr in self.peers:
self.peers[addr] = [ifname, time.time()] self.peers[addr] = [ifname, time.time()]
RNS.log(str(self)+" added peer "+str(addr)+" on "+str(ifname), RNS.LOG_DEBUG) RNS.log(str(self)+" added peer "+str(addr)+" on "+str(ifname), RNS.LOG_DEBUG)

4
RNS/Reticulum.py
View File

@ -273,6 +273,7 @@ class Reticulum:
self.__start_local_interface() self.__start_local_interface()
if self.is_shared_instance or self.is_standalone_instance: if self.is_shared_instance or self.is_standalone_instance:
RNS.log("Bringing up system interfaces...", RNS.LOG_DEBUG)
interface_names = [] interface_names = []
for name in self.config["interfaces"]: for name in self.config["interfaces"]:
if not name in interface_names: if not name in interface_names:
@ -546,6 +547,9 @@ class Reticulum:
RNS.log("The interface name \""+name+"\" was already used. Check your configuration file for errors!", RNS.LOG_ERROR) RNS.log("The interface name \""+name+"\" was already used. Check your configuration file for errors!", RNS.LOG_ERROR)
RNS.panic() RNS.panic()
RNS.log("System interfaces are ready", RNS.LOG_DEBUG)
def __create_default_config(self): def __create_default_config(self):
self.config = ConfigObj(__default_rns_config__) self.config = ConfigObj(__default_rns_config__)