Git-Mirrors/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2025-06-06 22:18:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use abstract domain sockets for RPC

Browse source
This commit is contained in:
Mark Qvist 2025-04-09 17:15:38 +02:00
parent 628c4984a3
commit 3049049d5b
3 changed files with 37 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
RNS/Interfaces/LocalInterface.py
View file

@ -62,7 +62,7 @@ class LocalClientInterface(Interface):
self.HW_MTU = 262144 self.HW_MTU = 262144
self.online = False self.online = False
if socket_path != None and RNS.vendor.platformutils.use_epoll(): self.socket_path = f"\0rns/{socket_path}" if socket_path != None and RNS.vendor.platformutils.use_af_unix(): self.socket_path = f"\0rns/{socket_path}"
else: self.socket_path = None else: self.socket_path = None
self.IN = True self.IN = True
@ -341,7 +341,7 @@ class LocalServerInterface(Interface):
self.online = False self.online = False
self.clients = 0 self.clients = 0
if socket_path != None and RNS.vendor.platformutils.is_linux(): self.socket_path = f"\0rns/{socket_path}" if socket_path != None and RNS.vendor.platformutils.use_af_unix(): self.socket_path = f"\0rns/{socket_path}"
else: self.socket_path = None else: self.socket_path = None
self.IN = True self.IN = True

40
RNS/Reticulum.py
View file

@ -26,6 +26,7 @@ if get_platform() == "android":
from .Interfaces import Interface from .Interfaces import Interface
from .Interfaces import LocalInterface from .Interfaces import LocalInterface
from .Interfaces import AutoInterface from .Interfaces import AutoInterface
from .Interfaces import BackboneInterface
from .Interfaces import TCPInterface from .Interfaces import TCPInterface
from .Interfaces import UDPInterface from .Interfaces import UDPInterface
from .Interfaces import I2PInterface from .Interfaces import I2PInterface
@ -255,6 +256,7 @@ class Reticulum:
self.share_instance = True self.share_instance = True
self.rpc_listener = None self.rpc_listener = None
self.rpc_key = None self.rpc_key = None
self.rpc_type = "AF_INET"
self.ifac_salt = Reticulum.IFAC_SALT self.ifac_salt = Reticulum.IFAC_SALT
@ -316,12 +318,18 @@ class Reticulum:
RNS.Transport.start(self) RNS.Transport.start(self)
if RNS.vendor.platformutils.use_af_unix():
self.rpc_addr = f"\0rns/{self.local_socket_path}/rpc"
self.rpc_type = "AF_UNIX"
else:
self.rpc_addr = ("127.0.0.1", self.local_control_port) self.rpc_addr = ("127.0.0.1", self.local_control_port)
self.rpc_type = "AF_INET"
if self.rpc_key == None: if self.rpc_key == None:
self.rpc_key = RNS.Identity.full_hash(RNS.Transport.identity.get_private_key()) self.rpc_key = RNS.Identity.full_hash(RNS.Transport.identity.get_private_key())
if self.is_shared_instance: if self.is_shared_instance:
self.rpc_listener = multiprocessing.connection.Listener(self.rpc_addr, authkey=self.rpc_key) self.rpc_listener = multiprocessing.connection.Listener(self.rpc_addr, family=self.rpc_type, authkey=self.rpc_key)
thread = threading.Thread(target=self.rpc_loop) thread = threading.Thread(target=self.rpc_loop)
thread.daemon = True thread.daemon = True
thread.start() thread.start()
@ -434,9 +442,11 @@ class Reticulum:
if option == "share_instance": if option == "share_instance":
value = self.config["reticulum"].as_bool(option) value = self.config["reticulum"].as_bool(option)
self.share_instance = value self.share_instance = value
if RNS.vendor.platformutils.use_af_unix():
if option == "instance_name": if option == "instance_name":
value = self.config["reticulum"][option] value = self.config["reticulum"][option]
self.local_socket_path = value self.local_socket_path = value
else: self.local_socket_path = "default"
if option == "shared_instance_port": if option == "shared_instance_port":
value = int(self.config["reticulum"][option]) value = int(self.config["reticulum"][option])
self.local_interface_port = value self.local_interface_port = value
@ -938,9 +948,11 @@ class Reticulum:
except Exception as e: except Exception as e:
RNS.log("An error ocurred while handling RPC call from local client: "+str(e), RNS.LOG_ERROR) RNS.log("An error ocurred while handling RPC call from local client: "+str(e), RNS.LOG_ERROR)
def get_rpc_client(self): return multiprocessing.connection.Client(self.rpc_addr, family=self.rpc_type, authkey=self.rpc_key)
def get_interface_stats(self): def get_interface_stats(self):
if self.is_connected_to_shared_instance: if self.is_connected_to_shared_instance:
rpc_connection = multiprocessing.connection.Client(self.rpc_addr, authkey=self.rpc_key) rpc_connection = self.get_rpc_client()
rpc_connection.send({"get": "interface_stats"}) rpc_connection.send({"get": "interface_stats"})
response = rpc_connection.recv() response = rpc_connection.recv()
return response return response
@ -1087,7 +1099,7 @@ class Reticulum:
def get_path_table(self, max_hops=None): def get_path_table(self, max_hops=None):
if self.is_connected_to_shared_instance: if self.is_connected_to_shared_instance:
rpc_connection = multiprocessing.connection.Client(self.rpc_addr, authkey=self.rpc_key) rpc_connection = self.get_rpc_client()
rpc_connection.send({"get": "path_table", "max_hops": max_hops}) rpc_connection.send({"get": "path_table", "max_hops": max_hops})
response = rpc_connection.recv() response = rpc_connection.recv()
return response return response
@ -1111,7 +1123,7 @@ class Reticulum:
def get_rate_table(self): def get_rate_table(self):
if self.is_connected_to_shared_instance: if self.is_connected_to_shared_instance:
rpc_connection = multiprocessing.connection.Client(self.rpc_addr, authkey=self.rpc_key) rpc_connection = self.get_rpc_client()
rpc_connection.send({"get": "rate_table"}) rpc_connection.send({"get": "rate_table"})
response = rpc_connection.recv() response = rpc_connection.recv()
return response return response
@ -1132,7 +1144,7 @@ class Reticulum:
def drop_path(self, destination): def drop_path(self, destination):
if self.is_connected_to_shared_instance: if self.is_connected_to_shared_instance:
rpc_connection = multiprocessing.connection.Client(self.rpc_addr, authkey=self.rpc_key) rpc_connection = self.get_rpc_client()
rpc_connection.send({"drop": "path", "destination_hash": destination}) rpc_connection.send({"drop": "path", "destination_hash": destination})
response = rpc_connection.recv() response = rpc_connection.recv()
return response return response
@ -1142,7 +1154,7 @@ class Reticulum:
def drop_all_via(self, transport_hash): def drop_all_via(self, transport_hash):
if self.is_connected_to_shared_instance: if self.is_connected_to_shared_instance:
rpc_connection = multiprocessing.connection.Client(self.rpc_addr, authkey=self.rpc_key) rpc_connection = self.get_rpc_client()
rpc_connection.send({"drop": "all_via", "destination_hash": transport_hash}) rpc_connection.send({"drop": "all_via", "destination_hash": transport_hash})
response = rpc_connection.recv() response = rpc_connection.recv()
return response return response
@ -1158,7 +1170,7 @@ class Reticulum:
def drop_announce_queues(self): def drop_announce_queues(self):
if self.is_connected_to_shared_instance: if self.is_connected_to_shared_instance:
rpc_connection = multiprocessing.connection.Client(self.rpc_addr, authkey=self.rpc_key) rpc_connection = self.get_rpc_client()
rpc_connection.send({"drop": "announce_queues"}) rpc_connection.send({"drop": "announce_queues"})
response = rpc_connection.recv() response = rpc_connection.recv()
return response return response
@ -1168,7 +1180,7 @@ class Reticulum:
def get_next_hop_if_name(self, destination): def get_next_hop_if_name(self, destination):
if self.is_connected_to_shared_instance: if self.is_connected_to_shared_instance:
rpc_connection = multiprocessing.connection.Client(self.rpc_addr, authkey=self.rpc_key) rpc_connection = self.get_rpc_client()
rpc_connection.send({"get": "next_hop_if_name", "destination_hash": destination}) rpc_connection.send({"get": "next_hop_if_name", "destination_hash": destination})
response = rpc_connection.recv() response = rpc_connection.recv()
return response return response
@ -1179,7 +1191,7 @@ class Reticulum:
def get_first_hop_timeout(self, destination): def get_first_hop_timeout(self, destination):
if self.is_connected_to_shared_instance: if self.is_connected_to_shared_instance:
try: try:
rpc_connection = multiprocessing.connection.Client(self.rpc_addr, authkey=self.rpc_key) rpc_connection = self.get_rpc_client()
rpc_connection.send({"get": "first_hop_timeout", "destination_hash": destination}) rpc_connection.send({"get": "first_hop_timeout", "destination_hash": destination})
response = rpc_connection.recv() response = rpc_connection.recv()
@ -1198,7 +1210,7 @@ class Reticulum:
def get_next_hop(self, destination): def get_next_hop(self, destination):
if self.is_connected_to_shared_instance: if self.is_connected_to_shared_instance:
rpc_connection = multiprocessing.connection.Client(self.rpc_addr, authkey=self.rpc_key) rpc_connection = self.get_rpc_client()
rpc_connection.send({"get": "next_hop", "destination_hash": destination}) rpc_connection.send({"get": "next_hop", "destination_hash": destination})
response = rpc_connection.recv() response = rpc_connection.recv()
@ -1209,7 +1221,7 @@ class Reticulum:
def get_link_count(self): def get_link_count(self):
if self.is_connected_to_shared_instance: if self.is_connected_to_shared_instance:
rpc_connection = multiprocessing.connection.Client(self.rpc_addr, authkey=self.rpc_key) rpc_connection = self.get_rpc_client()
rpc_connection.send({"get": "link_count"}) rpc_connection.send({"get": "link_count"})
response = rpc_connection.recv() response = rpc_connection.recv()
return response return response
@ -1219,7 +1231,7 @@ class Reticulum:
def get_packet_rssi(self, packet_hash): def get_packet_rssi(self, packet_hash):
if self.is_connected_to_shared_instance: if self.is_connected_to_shared_instance:
rpc_connection = multiprocessing.connection.Client(self.rpc_addr, authkey=self.rpc_key) rpc_connection = self.get_rpc_client()
rpc_connection.send({"get": "packet_rssi", "packet_hash": packet_hash}) rpc_connection.send({"get": "packet_rssi", "packet_hash": packet_hash})
response = rpc_connection.recv() response = rpc_connection.recv()
return response return response
@ -1233,7 +1245,7 @@ class Reticulum:
def get_packet_snr(self, packet_hash): def get_packet_snr(self, packet_hash):
if self.is_connected_to_shared_instance: if self.is_connected_to_shared_instance:
rpc_connection = multiprocessing.connection.Client(self.rpc_addr, authkey=self.rpc_key) rpc_connection = self.get_rpc_client()
rpc_connection.send({"get": "packet_snr", "packet_hash": packet_hash}) rpc_connection.send({"get": "packet_snr", "packet_hash": packet_hash})
response = rpc_connection.recv() response = rpc_connection.recv()
return response return response
@ -1247,7 +1259,7 @@ class Reticulum:
def get_packet_q(self, packet_hash): def get_packet_q(self, packet_hash):
if self.is_connected_to_shared_instance: if self.is_connected_to_shared_instance:
rpc_connection = multiprocessing.connection.Client(self.rpc_addr, authkey=self.rpc_key) rpc_connection = self.get_rpc_client()
rpc_connection.send({"get": "packet_q", "packet_hash": packet_hash}) rpc_connection.send({"get": "packet_q", "packet_hash": packet_hash})
response = rpc_connection.recv() response = rpc_connection.recv()
return response return response

6
RNS/vendor/platformutils.py vendored
View file

@ -33,7 +33,11 @@ def is_windows():
return False return False
def use_epoll(): def use_epoll():
if is_linux(): return True if is_linux() or is_android(): return True
else: return False
def use_af_unix():
if is_linux() or is_android(): return True
else: return False else: return False
def platform_checks(): def platform_checks():