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

Gateway all interfaces when transport instance is active. This is a bit of a hack, and needs to be made configurable in the UI, but it will do for now.

This commit is contained in:
Mark Qvist 2022-10-16 00:25:07 +02:00
parent 8dcae9fa7a
commit a55143d2c8
1 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
sbapp/sideband/core.py
View File

@ -7,6 +7,7 @@ import time
import sqlite3 import sqlite3
import RNS.vendor.umsgpack as msgpack import RNS.vendor.umsgpack as msgpack
import RNS.Interfaces.Interface as Interface
if RNS.vendor.platformutils.get_platform() == "android": if RNS.vendor.platformutils.get_platform() == "android":
from jnius import autoclass, cast from jnius import autoclass, cast
@ -1169,7 +1170,14 @@ class SidebandCore():
group_id = group_id group_id = group_id
) )
autointerface.OUT = True autointerface.OUT = True
self.reticulum._add_interface(autointerface,ifac_netname=ifac_netname,ifac_netkey=ifac_netkey)
# TODO: Make this configurable in UI
if RNS.Reticulum.transport_enabled():
if_mode = Interface.Interface.MODE_GATEWAY
else:
if_mode = None
self.reticulum._add_interface(autointerface, mode = if_mode, ifac_netname = ifac_netname, ifac_netkey = ifac_netkey)
self.interface_local = autointerface self.interface_local = autointerface
except Exception as e: except Exception as e:
@ -1206,7 +1214,14 @@ class SidebandCore():
) )
tcpinterface.OUT = True tcpinterface.OUT = True
self.reticulum._add_interface(tcpinterface,ifac_netname=ifac_netname,ifac_netkey=ifac_netkey)
# TODO: Make this configurable in UI
if RNS.Reticulum.transport_enabled():
if_mode = Interface.Interface.MODE_GATEWAY
else:
if_mode = None
self.reticulum._add_interface(tcpinterface, mode=if_mode, ifac_netname=ifac_netname, ifac_netkey=ifac_netkey)
self.interface_tcp = tcpinterface self.interface_tcp = tcpinterface
except Exception as e: except Exception as e:
@ -1237,7 +1252,14 @@ class SidebandCore():
) )
i2pinterface.OUT = True i2pinterface.OUT = True
self.reticulum._add_interface(i2pinterface,ifac_netname=ifac_netname,ifac_netkey=ifac_netkey)
# TODO: Make this configurable in UI
if RNS.Reticulum.transport_enabled():
if_mode = Interface.Interface.MODE_GATEWAY
else:
if_mode = None
self.reticulum._add_interface(i2pinterface, mode = if_mode, ifac_netname=ifac_netname, ifac_netkey=ifac_netkey)
for si in RNS.Transport.interfaces: for si in RNS.Transport.interfaces:
if type(si) == RNS.Interfaces.I2PInterface.I2PInterfacePeer: if type(si) == RNS.Interfaces.I2PInterface.I2PInterfacePeer:
@ -1284,7 +1306,14 @@ class SidebandCore():
) )
rnodeinterface.OUT = True rnodeinterface.OUT = True
self.reticulum._add_interface(rnodeinterface,ifac_netname=ifac_netname,ifac_netkey=ifac_netkey)
# TODO: Make this configurable in UI
if RNS.Reticulum.transport_enabled():
if_mode = Interface.Interface.MODE_GATEWAY
else:
if_mode = Interface.Interface.MODE_FULL
self.reticulum._add_interface(rnodeinterface, mode = if_mode, ifac_netname = ifac_netname, ifac_netkey = ifac_netkey)
self.interface_rnode = rnodeinterface self.interface_rnode = rnodeinterface
except Exception as e: except Exception as e:
@ -1323,7 +1352,14 @@ class SidebandCore():
) )
serialinterface.OUT = True serialinterface.OUT = True
self.reticulum._add_interface(serialinterface,ifac_netname=ifac_netname,ifac_netkey=ifac_netkey)
# TODO: Make this configurable in UI
if RNS.Reticulum.transport_enabled():
if_mode = Interface.Interface.MODE_GATEWAY
else:
if_mode = Interface.Interface.MODE_FULL
self.reticulum._add_interface(serialinterface, mode = if_mode, ifac_netname = ifac_netname, ifac_netkey = ifac_netkey)
self.interface_serial = serialinterface self.interface_serial = serialinterface
except Exception as e: except Exception as e:
@ -1369,7 +1405,14 @@ class SidebandCore():
) )
modeminterface.OUT = True modeminterface.OUT = True
self.reticulum._add_interface(modeminterface,ifac_netname=ifac_netname,ifac_netkey=ifac_netkey)
# TODO: Make this configurable in UI
if RNS.Reticulum.transport_enabled():
if_mode = Interface.Interface.MODE_GATEWAY
else:
if_mode = Interface.Interface.MODE_FULL
self.reticulum._add_interface(modeminterface, mode = if_mode, ifac_netname = ifac_netname, ifac_netkey = ifac_netkey)
self.interface_modem = modeminterface self.interface_modem = modeminterface
except Exception as e: except Exception as e:
@ -1597,4 +1640,4 @@ panic_on_interface_error = No
[logging] [logging]
loglevel = 3 loglevel = 3
""" """