Git-Mirrors/Sideband
1
0
Fork 0
mirror of https://github.com/markqvist/Sideband.git synced 2025-07-20 13:38:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use abstract domain sockets for RPC. Use epoll backend for TCP connections on Android.

Browse source
This commit is contained in:
Mark Qvist 2025-04-09 17:16:30 +02:00
parent a97c6dc9bb
commit 9749147b34
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
sbapp/sideband/core.py
View file

@ -575,7 +575,7 @@ class SidebandCore():
RNS.log("Loading Sideband identity...", RNS.LOG_DEBUG) RNS.log("Loading Sideband identity...", RNS.LOG_DEBUG)
self.identity = RNS.Identity.from_file(self.identity_path) self.identity = RNS.Identity.from_file(self.identity_path)
self.rpc_addr = ("127.0.0.1", 48165) self.rpc_addr = f"\0sideband/rpc"
self.rpc_key = RNS.Identity.full_hash(self.identity.get_private_key()) self.rpc_key = RNS.Identity.full_hash(self.identity.get_private_key())
RNS.log("Loading Sideband configuration... "+str(self.config_path), RNS.LOG_DEBUG) RNS.log("Loading Sideband configuration... "+str(self.config_path), RNS.LOG_DEBUG)
@ -1790,7 +1790,7 @@ class SidebandCore():
try: try:
with self.rpc_lock: with self.rpc_lock:
if self.rpc_connection == None: if self.rpc_connection == None:
self.rpc_connection = multiprocessing.connection.Client(self.rpc_addr, authkey=self.rpc_key) self.rpc_connection = multiprocessing.connection.Client(self.rpc_addr, family="AF_UNIX", authkey=self.rpc_key)
self.rpc_connection.send(request) self.rpc_connection.send(request)
response = self.rpc_connection.recv() response = self.rpc_connection.recv()
return response return response
@ -1962,12 +1962,12 @@ class SidebandCore():
def __start_rpc_listener(self): def __start_rpc_listener(self):
try: try:
RNS.log("Starting RPC listener", RNS.LOG_DEBUG) RNS.log("Starting RPC listener", RNS.LOG_DEBUG)
self.rpc_listener = multiprocessing.connection.Listener(self.rpc_addr, authkey=self.rpc_key) self.rpc_listener = multiprocessing.connection.Listener(self.rpc_addr, family="AF_UNIX", 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()
except Exception as e: except Exception as e:
RNS.log("Could not start RPC listener on "+str(self.rpc_addr)+". Terminating now. Clear up anything using the port and try again.", RNS.LOG_ERROR) RNS.log("Could not start RPC listener on @"+str(self.rpc_addr[1:])+". Terminating now. Clear up anything using the port and try again.", RNS.LOG_ERROR)
RNS.panic() RNS.panic()
def __rpc_loop(self): def __rpc_loop(self):
@ -4115,13 +4115,13 @@ class SidebandCore():
ifac_size = None ifac_size = None
interface_config = { interface_config = {
"name": "TCPClientInterface", "name": "TCP Client",
"target_host": tcp_host, "target_host": tcp_host,
"target_port": tcp_port, "target_port": tcp_port,
"kiss_framing": False, "kiss_framing": False,
"i2p_tunneled": False, "i2p_tunneled": False,
} }
tcpinterface = RNS.Interfaces.TCPInterface.TCPClientInterface(RNS.Transport, interface_config) tcpinterface = RNS.Interfaces.BackboneInterface.BackboneClientInterface(RNS.Transport, interface_config)
tcpinterface.OUT = True tcpinterface.OUT = True
if RNS.Reticulum.transport_enabled(): if RNS.Reticulum.transport_enabled():