Git-Mirrors/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2025-07-25 15:55:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use internal netinfo implementation

Browse source
This commit is contained in:
Mark Qvist 2025-04-11 12:22:58 +02:00
parent d34cefe31d
commit 8e4b0b3b16
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
RNS/Interfaces/AutoInterface.py
View file

@ -102,9 +102,9 @@ class AutoInterface(Interface):
ignored_interfaces = c.as_list("ignored_devices") if "ignored_devices" in c else None ignored_interfaces = c.as_list("ignored_devices") if "ignored_devices" in c else None
configured_bitrate = c["configured_bitrate"] if "configured_bitrate" in c else None configured_bitrate = c["configured_bitrate"] if "configured_bitrate" in c else None
from RNS.vendor.ifaddr import niwrapper from RNS.vendor import netinfo
super().__init__() super().__init__()
self.netinfo = niwrapper self.netinfo = netinfo
self.HW_MTU = AutoInterface.HW_MTU self.HW_MTU = AutoInterface.HW_MTU
self.IN = True self.IN = True

2
RNS/Interfaces/BackboneInterface.py
View file

@ -55,7 +55,7 @@ class BackboneInterface(Interface):
@staticmethod @staticmethod
def get_address_for_if(name, bind_port, prefer_ipv6=False): def get_address_for_if(name, bind_port, prefer_ipv6=False):
import RNS.vendor.ifaddr.niwrapper as netinfo from RNS.vendor import netinfo
ifaddr = netinfo.ifaddresses(name) ifaddr = netinfo.ifaddresses(name)
if len(ifaddr) < 1: if len(ifaddr) < 1:
raise SystemError(f"No addresses available on specified kernel interface \"{name}\" for BackboneInterface to bind to") raise SystemError(f"No addresses available on specified kernel interface \"{name}\" for BackboneInterface to bind to")

2
RNS/Interfaces/TCPInterface.py
View file

@ -445,7 +445,7 @@ class TCPServerInterface(Interface):
@staticmethod @staticmethod
def get_address_for_if(name, bind_port, prefer_ipv6=False): def get_address_for_if(name, bind_port, prefer_ipv6=False):
import RNS.vendor.ifaddr.niwrapper as netinfo from RNS.vendor import netinfo
ifaddr = netinfo.ifaddresses(name) ifaddr = netinfo.ifaddresses(name)
if len(ifaddr) < 1: if len(ifaddr) < 1:
raise SystemError(f"No addresses available on specified kernel interface \"{name}\" for TCPServerInterface to bind to") raise SystemError(f"No addresses available on specified kernel interface \"{name}\" for TCPServerInterface to bind to")

4
RNS/Interfaces/UDPInterface.py
View file

@ -35,13 +35,13 @@ class UDPInterface(Interface):
@staticmethod @staticmethod
def get_address_for_if(name): def get_address_for_if(name):
import RNS.vendor.ifaddr.niwrapper as netinfo from RNS.vendor import netinfo
ifaddr = netinfo.ifaddresses(name) ifaddr = netinfo.ifaddresses(name)
return ifaddr[netinfo.AF_INET][0]["addr"] return ifaddr[netinfo.AF_INET][0]["addr"]
@staticmethod @staticmethod
def get_broadcast_for_if(name): def get_broadcast_for_if(name):
import RNS.vendor.ifaddr.niwrapper as netinfo from RNS.vendor import netinfo
ifaddr = netinfo.ifaddresses(name) ifaddr = netinfo.ifaddresses(name)
return ifaddr[netinfo.AF_INET][0]["broadcast"] return ifaddr[netinfo.AF_INET][0]["broadcast"]