From 01600b96a4921f03802f71fbc43a83e4ac3f57cb Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Fri, 5 May 2023 10:37:22 +0200 Subject: [PATCH] Fix import paths --- RNS/Reticulum.py | 1 + RNS/vendor/ifaddr/niwrapper.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/RNS/Reticulum.py b/RNS/Reticulum.py index e0950c9..49e6b98 100755 --- a/RNS/Reticulum.py +++ b/RNS/Reticulum.py @@ -906,6 +906,7 @@ class Reticulum: except Exception as e: RNS.log("The interface \""+name+"\" could not be created. Check your configuration file for errors!", RNS.LOG_ERROR) RNS.log("The contained exception was: "+str(e), RNS.LOG_ERROR) + raise e RNS.panic() else: RNS.log("The interface name \""+name+"\" was already used. Check your configuration file for errors!", RNS.LOG_ERROR) diff --git a/RNS/vendor/ifaddr/niwrapper.py b/RNS/vendor/ifaddr/niwrapper.py index 6bc2bf3..bd44c72 100644 --- a/RNS/vendor/ifaddr/niwrapper.py +++ b/RNS/vendor/ifaddr/niwrapper.py @@ -8,11 +8,11 @@ AF_INET6 = socket.AF_INET6.value AF_INET = socket.AF_INET.value def interfaces() -> List[str]: - adapters = ifaddr.get_adapters(include_unconfigured=True) + adapters = RNS.vendor.ifaddr.get_adapters(include_unconfigured=True) return [a.name for a in adapters] def ifaddresses(ifname) -> dict: - adapters = ifaddr.get_adapters(include_unconfigured=True) + adapters = RNS.vendor.ifaddr.get_adapters(include_unconfigured=True) ifa = {} for a in adapters: if a.name == ifname: