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

Fixed AutoInterface peering hashes on WiFi devices that employ MAC address randomisation on reconnects and roaming

Browse Source
This commit is contained in:
Mark Qvist 2022-10-19 11:57:09 +02:00
parent 5b1b18e84a
commit 81fc920bdf
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
RNS/Interfaces/AutoInterface.py
View File

@ -267,6 +267,22 @@ class AutoInterface(Interface):
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)
for ifname in self.adopted_interfaces: for ifname in self.adopted_interfaces:
# Check that the link-local address has not changed
try:
addresses = self.netifaces.ifaddresses(ifname)
if self.netifaces.AF_INET6 in addresses:
link_local_addr = None
for address in addresses[self.netifaces.AF_INET6]:
if "addr" in address:
if address["addr"].startswith("fe80:"):
link_local_addr = address["addr"].split("%")[0]
if link_local_addr != self.adopted_interfaces[ifname]:
self.adopted_interfaces[ifname] = link_local_addr
except Exception as e:
RNS.log("Could not get device information while updating link-local addresses for "+str(self)+". The contained exception was: "+str(e), RNS.LOG_ERROR)
# Check multicast echo timeouts
last_multicast_echo = 0 last_multicast_echo = 0
if ifname in self.multicast_echoes: if ifname in self.multicast_echoes:
last_multicast_echo = self.multicast_echoes[ifname] last_multicast_echo = self.multicast_echoes[ifname]