Mirrors
/
Reticulum
mirror of https://github.com/markqvist/Reticulum.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #246 from gdt/fix-transmit-hash 

AutoInterface: Drop embedded scope identifier on fe80::
This commit is contained in:
markqvist 2023-03-02 11:34:00 +01:00 committed by GitHub
parent a06ae40797 e273900e87
commit a6551fc019
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
RNS/Interfaces/AutoInterface.py
View File

@ -23,6 +23,7 @@
from .Interface import Interface from .Interface import Interface
import socketserver import socketserver
import threading import threading
import re
import socket import socket
import struct import struct
import time import time
@ -53,6 +54,13 @@ class AutoInterface(Interface):
return AutoInterfaceHandler(callback, *args, **keys) return AutoInterfaceHandler(callback, *args, **keys)
return create_handler return create_handler
def descope_linklocal(self, link_local_addr):
# Drop scope specifier expressd as %ifname (macOS)
link_local_addr = link_local_addr.split("%")[0]
# Drop embedded scope specifier (NetBSD, OpenBSD)
link_local_addr = re.sub(r"fe80:[0-9a-f]*::","fe80::", link_local_addr)
return link_local_addr
def __init__(self, owner, name, group_id=None, discovery_scope=None, discovery_port=None, data_port=None, allowed_interfaces=None, ignored_interfaces=None, configured_bitrate=None): def __init__(self, owner, name, group_id=None, discovery_scope=None, discovery_port=None, data_port=None, allowed_interfaces=None, ignored_interfaces=None, configured_bitrate=None):
import importlib import importlib
if importlib.util.find_spec('netifaces') != None: if importlib.util.find_spec('netifaces') != None:
@ -158,9 +166,9 @@ class AutoInterface(Interface):
for address in addresses[self.netifaces.AF_INET6]: for address in addresses[self.netifaces.AF_INET6]:
if "addr" in address: if "addr" in address:
if address["addr"].startswith("fe80:"): if address["addr"].startswith("fe80:"):
link_local_addr = address["addr"] link_local_addr = self.descope_linklocal(address["addr"])
self.link_local_addresses.append(link_local_addr.split("%")[0]) self.link_local_addresses.append(link_local_addr)
self.adopted_interfaces[ifname] = link_local_addr.split("%")[0] self.adopted_interfaces[ifname] = link_local_addr
self.multicast_echoes[ifname] = time.time() 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)
@ -278,7 +286,7 @@ class AutoInterface(Interface):
for address in addresses[self.netifaces.AF_INET6]: for address in addresses[self.netifaces.AF_INET6]:
if "addr" in address: if "addr" in address:
if address["addr"].startswith("fe80:"): if address["addr"].startswith("fe80:"):
link_local_addr = address["addr"].split("%")[0] link_local_addr = self.descope_linklocal(address["addr"])
if link_local_addr != self.adopted_interfaces[ifname]: if link_local_addr != self.adopted_interfaces[ifname]:
old_link_local_address = self.adopted_interfaces[ifname] old_link_local_address = self.adopted_interfaces[ifname]
RNS.log("Replacing link-local address "+str(old_link_local_address)+" for "+str(ifname)+" with "+str(link_local_addr), RNS.LOG_DEBUG) RNS.log("Replacing link-local address "+str(old_link_local_address)+" for "+str(ifname)+" with "+str(link_local_addr), RNS.LOG_DEBUG)