mirror of
https://github.com/markqvist/NomadNet.git
synced 2025-05-17 05:12:21 -04:00
Interface Management initial (2/2)
This commit is contained in:
RFNexus
parent
c415345f59
commit
dfa7adc21e
5 changed files with 1016 additions and 211 deletions
|
|
@ -1 +1 @@
|
|||
__version__ = "0.6.1"
|
||||
__version__ = "0.6.2"
|
||||
|
|
|
|||
|
|
@ -387,8 +387,223 @@ Links can be inserted into micron documents. See the `*Markup`* section of this
|
|||
|
||||
'''
|
||||
|
||||
TOPIC_INTERFACES = '''
|
||||
>TODO
|
||||
TOPIC_INTERFACES = '''>Interfaces
|
||||
|
||||
Reticulum supports using many kinds of devices as networking interfaces, and allows you to mix and match them in any way you choose.
|
||||
|
||||
The number of distinct network topologies you can create with Reticulum is more or less endless, but common to them all is that you will need to define one or more interfaces for Reticulum to use.
|
||||
|
||||
The `![ Interfaces ]`! section of NomadNet lets you add, monitor, and update interfaces configured for your Reticulum instance.
|
||||
|
||||
If you are starting NomadNet for the first time you will find that an `!AutoInterface`! has been added by default. This interface will try to use your available network device to communicate with other peers discovered on your local network.
|
||||
|
||||
Interfaces come in many different types and can interact with physical mediums like LoRa radios or standard IP networks.
|
||||
|
||||
>>Viewing Interfaces
|
||||
|
||||
To view more info about an interface, navigate using the `!Up`! and `!Down`! arrow keys or by clicking with the mouse. Pressing `! < Enter >`! on a selected interface will bring you to a detailed interface view, which will show configuration parameters and realtime charts. From here you can also disable or edit the interface. To change the orientation of the TX/RX charts, press `!< V >`! for a vertical layout, and `!< H >`! for a horizontal view.
|
||||
|
||||
>>Updating Interfaces
|
||||
|
||||
To edit an interface, select the interface and press `!< Ctrl + E >`!.
|
||||
|
||||
To remove an interface, select the interface and press `!< Ctrl + X >`!. You can also perform both of these actions from the details view.
|
||||
|
||||
>>Adding Interfaces
|
||||
|
||||
To add a new interface, press `!< Ctrl + A >`!. From here you can select which type of interface you want to add. Each unique interface type will have different configuration options.
|
||||
|
||||
`Ffff`! (!) Note:`! After adding or modifying interfaces, you will need to restart NomadNet or your Reticulum instance for changes to take effect.`f`b
|
||||
|
||||
|
||||
>Interface Types
|
||||
|
||||
>>AutoInterface
|
||||
|
||||
The Auto Interface enables communication with other discoverable Reticulum nodes over autoconfigured IPv6 and UDP. It does not need any functional IP infrastructure like routers or DHCP servers, but will require at least some sort of switching medium between peers (a wired switch, a hub, a WiFi access point or similar).
|
||||
|
||||
```
|
||||
Required Parameters:
|
||||
Interface Name
|
||||
|
||||
Optional Parameters:
|
||||
Devices: Specific network devices to use
|
||||
Ignored Devices: Network devices to exclude
|
||||
Group ID: Create isolated networks on the same physical LAN
|
||||
Discovery Scope: Can set to link, admin, site, organisation or global
|
||||
```
|
||||
|
||||
The AutoInterface is ideal for quickly connecting to other Reticulum nodes on your local network without complex configuration.
|
||||
|
||||
>>TCPClientInterface
|
||||
|
||||
The TCP Client interface connects to remote TCP server interfaces, enabling communication over the Internet or private networks.
|
||||
|
||||
```
|
||||
Required Parameters:
|
||||
Target Host: Hostname or IP address of the server
|
||||
Target Port: Port number to connect to
|
||||
|
||||
Optional Parameters:
|
||||
I2P Tunneled: Enable for connecting through I2P
|
||||
KISS Framing: Enable for KISS framing for software modems
|
||||
```
|
||||
|
||||
This interface is commonly used to connect to Reticulum testnets or other persistent nodes on the Internet.
|
||||
|
||||
>>TCPServerInterface
|
||||
|
||||
The TCP Server interface listens for incoming connections, allowing other Reticulum peers to connect to your node using TCPClientInterface.
|
||||
|
||||
```
|
||||
Required Parameters:
|
||||
Listen IP: IP address to bind to (0.0.0.0 for all interfaces)
|
||||
Listen Port: Port number to listen on
|
||||
|
||||
Optional Parameters:
|
||||
Prefer IPv6: Bind to IPv6 address if available
|
||||
I2P Tunneled: Enable for I2P tunnel support
|
||||
Device: Specific network device to use (e,g
|
||||
```
|
||||
|
||||
Useful when you want other nodes to be able to connect to your Transport instance over TCP/IP.
|
||||
|
||||
>>UDPInterface
|
||||
|
||||
The UDP interface allows communication over IP networks using UDP packets.
|
||||
|
||||
```
|
||||
Required Parameters:
|
||||
Listen IP: IP address to bind to
|
||||
Listen Port: Port to listen on
|
||||
Forward IP: IP address to forward to (Can be broadcast address)
|
||||
Forward Port: Port to forward to
|
||||
|
||||
Optional Parameters:
|
||||
Device: Specific network device to use
|
||||
```
|
||||
|
||||
>>I2PInterface
|
||||
|
||||
The I2P interface enables connections over the Invisible Internet Protocol. The I2PInterface requires an I2P daemon to be running on your system, such as `!i2pd`!
|
||||
|
||||
```
|
||||
Optional Parameters:
|
||||
Peers: I2P addresses to connect to (Can be left as none if running as a Transport)
|
||||
```
|
||||
|
||||
|
||||
>>RNodeInterface
|
||||
|
||||
The RNode interface allows using LoRa transceivers running RNode firmware as Reticulum network interfaces.
|
||||
|
||||
```
|
||||
Required Parameters:
|
||||
Port: Serial port or BLE device path
|
||||
Frequency: Operating frequency in MHz
|
||||
Bandwidth: Channel bandwidth
|
||||
TX Power: Transmit power in dBm
|
||||
Spreading Factor: LoRa spreading factor (7-12)
|
||||
Coding Rate: LoRa coding rate (4:5-4:8)
|
||||
|
||||
Optional Parameters:
|
||||
ID Callsign: Station identification
|
||||
ID Interval: Identification interval in seconds
|
||||
Airtime Limits: Control duty cycle
|
||||
```
|
||||
|
||||
The interface includes a parameter calculator to estimate link budget, sensitivity, and data rate on the air based on your settings.
|
||||
|
||||
>>RNodeMultiInterface
|
||||
|
||||
The RNode Multi Interface is designed for use with specific hardware platforms that support multiple subinterfaces or virtual radios. For most LoRa hardware platforms, you will want to use the standard `!RNodeInterface`! instead.
|
||||
|
||||
```
|
||||
Required Parameters:
|
||||
Port: Serial port or BLE device path
|
||||
Subinterfaces: Configuration for each subinterface / virtual radio port
|
||||
|
||||
```
|
||||
|
||||
>>SerialInterface
|
||||
|
||||
The Serial interface enables using direct serial connections as Reticulum interfaces.
|
||||
|
||||
```
|
||||
Required Parameters:
|
||||
Port: Serial port path
|
||||
Speed: Baud rate of serial device
|
||||
Databits: Number of data bits
|
||||
Parity: Parity setting
|
||||
Stopbits: Number of stop bits
|
||||
```
|
||||
|
||||
>>KISSInterface
|
||||
|
||||
The KISS interface supports packet radio modems and TNCs using the KISS protocol.
|
||||
|
||||
```
|
||||
Required Parameters:
|
||||
|
||||
Port: Serial port path
|
||||
Speed: Baud rate of serial device
|
||||
Databits: Number of data bits
|
||||
Parity: Parity setting
|
||||
Stopbits: Number of stop bits
|
||||
Preamble: Modem preamble in milliseconds
|
||||
TX Tail: Transmit tail in milliseconds
|
||||
Slottime: CSMA slottime in milliseconds
|
||||
Persistence: CSMA persistence value
|
||||
|
||||
Optional Parameters:
|
||||
|
||||
ID Callsign: Station identification
|
||||
ID Interval: Identification interval in seconds
|
||||
Flow Control: Enable packet flow control
|
||||
```
|
||||
|
||||
>>PipeInterface
|
||||
|
||||
The Pipe interface allows using external programs as Reticulum interfaces via stdin and stdout.
|
||||
|
||||
```
|
||||
Required Parameters:
|
||||
|
||||
Command: External command to execute
|
||||
|
||||
Optional Parameters:
|
||||
Respawn Delay: Seconds to wait before restarting after failure
|
||||
```
|
||||
|
||||
<
|
||||
>>
|
||||
-∿
|
||||
For more information and to view the full Interface documentation consult the Reticulum manual or visit https://reticulum.network/manual/interfaces.html (Requires external Internet connection)
|
||||
|
||||
|
||||
>Interface Access Code (IFAC) Settings
|
||||
|
||||
Interface Access Codes create private networks and securely segment network traffic. Under `!Show more options`!, you'll find these IFAC settings:
|
||||
|
||||
`!Virtual Network Name`! (network_name):
|
||||
When added, creates a logical network that only communicates with other interfaces using the same name. This allows multiple separate Reticulum networks to exist on the same physical channel or medium.
|
||||
|
||||
`!IFAC Passphrase`! (passphrase):
|
||||
Sets an authentication passphrase for the interface. Only interfaces configured with the same passphrase will be able to communicate. Can be used with or without a network name.
|
||||
|
||||
`!IFAC Size`! (ifac_size):
|
||||
Controls the length of Interface Authentication Codes (8-512 bits). Larger sizes provide stronger security but add overhead to each packet. The default of `!8`! is usually appropriate for most uses.
|
||||
|
||||
>Interface Modes
|
||||
|
||||
When running a Transport node, you can configure interface modes that affect how Reticulum selects paths, propagates announces, and discovers routes:
|
||||
|
||||
`!full`!: Default mode with all discovery, meshing and transport functionality
|
||||
`!gateway`!: Discovers paths on behalf of other nodes
|
||||
`!access_point`!: Operates as a network access point
|
||||
`!roaming`!: For physically mobile interfaces
|
||||
`!boundary`!: For interfaces connecting different network segments
|
||||
|
||||
'''
|
||||
|
||||
TOPIC_CONVERSATIONS = '''>Conversations
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -279,5 +279,260 @@ class FormMultiList(urwid.Pile, FormField):
|
|||
self.error = "At least one entry is required"
|
||||
break
|
||||
|
||||
self.error_widget.set_text(("error", self.error or ""))
|
||||
return self.error is None
|
||||
|
||||
|
||||
class FormMultiTable(urwid.Pile, FormField):
|
||||
def __init__(self, config_key, fields, validation_types=None, transform=None, **kwargs):
|
||||
self.entries = []
|
||||
self.fields = fields
|
||||
self.error_widget = urwid.Text("")
|
||||
self.error = None
|
||||
self.validation_types = validation_types or []
|
||||
|
||||
header_columns = [('weight', 3, urwid.Text(("list_focus", "Name")))]
|
||||
for field_key, field_config in self.fields.items():
|
||||
header_columns.append(('weight', 2, urwid.Text(("list_focus", field_config.get("label", field_key)))))
|
||||
header_columns.append((4, urwid.Text(("list_focus", ""))))
|
||||
|
||||
self.header_row = urwid.Columns(header_columns)
|
||||
|
||||
first_entry = self.create_entry_row()
|
||||
self.entries.append(first_entry)
|
||||
|
||||
self.add_button = urwid.Button("+ Add ", on_press=self.add_entry)
|
||||
add_button_padded = urwid.Padding(self.add_button, left=2, right=2)
|
||||
|
||||
pile_widgets = [
|
||||
self.header_row,
|
||||
urwid.Divider("-"),
|
||||
first_entry,
|
||||
add_button_padded
|
||||
]
|
||||
|
||||
urwid.Pile.__init__(self, pile_widgets)
|
||||
FormField.__init__(self, config_key, transform)
|
||||
|
||||
def create_entry_row(self, name="", values=None):
|
||||
if values is None:
|
||||
values = {}
|
||||
|
||||
name_edit = urwid.Edit("", name)
|
||||
|
||||
columns = [('weight', 3, name_edit)]
|
||||
|
||||
field_widgets = {}
|
||||
for field_key, field_config in self.fields.items():
|
||||
field_value = values.get(field_key, "")
|
||||
|
||||
if field_config.get("type") == "checkbox":
|
||||
widget = urwid.CheckBox("", state=bool(field_value))
|
||||
elif field_config.get("type") == "dropdown":
|
||||
# TODO: dropdown in MultiTable
|
||||
widget = urwid.Edit("", str(field_value))
|
||||
else:
|
||||
widget = urwid.Edit("", str(field_value))
|
||||
|
||||
field_widgets[field_key] = widget
|
||||
columns.append(('weight', 2, widget))
|
||||
|
||||
remove_button = urwid.Button("×", on_press=lambda button: self.remove_entry(button, entry_row))
|
||||
columns.append((4, remove_button))
|
||||
|
||||
entry_row = urwid.Columns(columns)
|
||||
entry_row.name_edit = name_edit
|
||||
entry_row.field_widgets = field_widgets
|
||||
|
||||
return entry_row
|
||||
|
||||
def remove_entry(self, button, entry_row):
|
||||
if len(self.entries) > 1:
|
||||
self.entries.remove(entry_row)
|
||||
self.contents = [(w, self.options()) for w in self.get_pile_widgets()]
|
||||
|
||||
def add_entry(self, button):
|
||||
new_entry = self.create_entry_row()
|
||||
self.entries.append(new_entry)
|
||||
|
||||
self.contents = [(w, self.options()) for w in self.get_pile_widgets()]
|
||||
|
||||
def get_pile_widgets(self):
|
||||
return [
|
||||
self.header_row,
|
||||
urwid.Divider("-")
|
||||
] + self.entries + [
|
||||
urwid.Padding(self.add_button, left=2, right=2)
|
||||
]
|
||||
|
||||
def get_value(self):
|
||||
values = {}
|
||||
for entry in self.entries:
|
||||
name = entry.name_edit.edit_text.strip()
|
||||
if name:
|
||||
subinterface = {}
|
||||
subinterface["interface_enabled"] = True
|
||||
|
||||
for field_key, widget in entry.field_widgets.items():
|
||||
field_config = self.fields.get(field_key, {})
|
||||
|
||||
if hasattr(widget, "get_state"):
|
||||
value = widget.get_state()
|
||||
elif hasattr(widget, "edit_text"):
|
||||
value = widget.edit_text.strip()
|
||||
|
||||
transform = field_config.get("transform")
|
||||
if transform and value:
|
||||
try:
|
||||
value = transform(value)
|
||||
except (ValueError, TypeError):
|
||||
pass
|
||||
value = ""
|
||||
|
||||
if value:
|
||||
subinterface[field_key] = value
|
||||
|
||||
values[name] = subinterface
|
||||
|
||||
return self.transform(values) if self.transform else values
|
||||
|
||||
def set_value(self, value):
|
||||
self.entries = []
|
||||
|
||||
if not value:
|
||||
self.entries.append(self.create_entry_row())
|
||||
else:
|
||||
for name, config in value.items():
|
||||
self.entries.append(self.create_entry_row(name=name, values=config))
|
||||
|
||||
self.contents = [(w, self.options()) for w in self.get_pile_widgets()]
|
||||
|
||||
def validate(self):
|
||||
values = self.get_value()
|
||||
self.error = None
|
||||
|
||||
for validation in self.validation_types:
|
||||
if validation == "required" and not values:
|
||||
self.error = "At least one subinterface is required"
|
||||
break
|
||||
|
||||
self.error_widget.set_text(("error", self.error or ""))
|
||||
return self.error is None
|
||||
|
||||
|
||||
class FormKeyValuePairs(urwid.Pile, FormField):
|
||||
def __init__(self, config_key, validation_types=None, transform=None, **kwargs):
|
||||
self.entries = []
|
||||
self.error_widget = urwid.Text("")
|
||||
self.error = None
|
||||
self.validation_types = validation_types or []
|
||||
|
||||
header_columns = [
|
||||
('weight', 1, urwid.AttrMap(urwid.Text("Parameter Key"), "multitable_header")),
|
||||
('weight', 1, urwid.AttrMap(urwid.Text("Parameter Value"), "multitable_header")),
|
||||
(4, urwid.AttrMap(urwid.Text("Action"), "multitable_header"))
|
||||
]
|
||||
|
||||
self.header_row = urwid.AttrMap(urwid.Columns(header_columns), "multitable_header")
|
||||
|
||||
first_entry = self.create_entry_row()
|
||||
self.entries.append(first_entry)
|
||||
|
||||
self.add_button = urwid.Button("+ Add Parameter", on_press=self.add_entry)
|
||||
add_button_padded = urwid.Padding(self.add_button, left=2, right=2)
|
||||
|
||||
pile_widgets = [
|
||||
self.header_row,
|
||||
urwid.Divider("-"),
|
||||
first_entry,
|
||||
add_button_padded
|
||||
]
|
||||
|
||||
urwid.Pile.__init__(self, pile_widgets)
|
||||
FormField.__init__(self, config_key, transform)
|
||||
|
||||
def create_entry_row(self, key="", value=""):
|
||||
key_edit = urwid.Edit("", key)
|
||||
value_edit = urwid.Edit("", value)
|
||||
|
||||
remove_button = urwid.Button("×", on_press=lambda button: self.remove_entry(button, entry_row))
|
||||
|
||||
entry_row = urwid.Columns([
|
||||
('weight', 1, key_edit),
|
||||
('weight', 1, value_edit),
|
||||
(4, remove_button)
|
||||
])
|
||||
|
||||
entry_row.key_edit = key_edit
|
||||
entry_row.value_edit = value_edit
|
||||
|
||||
return entry_row
|
||||
|
||||
def remove_entry(self, button, entry_row):
|
||||
if len(self.entries) > 1:
|
||||
self.entries.remove(entry_row)
|
||||
self.contents = [(w, self.options()) for w in self.get_pile_widgets()]
|
||||
|
||||
def add_entry(self, button):
|
||||
new_entry = self.create_entry_row()
|
||||
self.entries.append(new_entry)
|
||||
|
||||
self.contents = [(w, self.options()) for w in self.get_pile_widgets()]
|
||||
|
||||
def get_pile_widgets(self):
|
||||
return [
|
||||
self.header_row,
|
||||
urwid.Divider("-")
|
||||
] + self.entries + [
|
||||
urwid.Padding(self.add_button, left=2, right=2)
|
||||
]
|
||||
|
||||
def get_value(self):
|
||||
values = {}
|
||||
for entry in self.entries:
|
||||
key = entry.key_edit.edit_text.strip()
|
||||
value = entry.value_edit.edit_text.strip()
|
||||
|
||||
if key:
|
||||
if value.isdigit():
|
||||
values[key] = int(value)
|
||||
elif value.replace('.', '', 1).isdigit() and value.count('.') <= 1:
|
||||
values[key] = float(value)
|
||||
elif value.lower() == 'true':
|
||||
values[key] = True
|
||||
elif value.lower() == 'false':
|
||||
values[key] = False
|
||||
else:
|
||||
values[key] = value
|
||||
|
||||
return self.transform(values) if self.transform else values
|
||||
|
||||
def set_value(self, value):
|
||||
self.entries = []
|
||||
|
||||
if not value or not isinstance(value, dict):
|
||||
self.entries.append(self.create_entry_row())
|
||||
else:
|
||||
for key, val in value.items():
|
||||
self.entries.append(self.create_entry_row(key=key, value=str(val)))
|
||||
|
||||
self.contents = [(w, self.options()) for w in self.get_pile_widgets()]
|
||||
|
||||
def validate(self):
|
||||
values = self.get_value()
|
||||
self.error = None
|
||||
|
||||
keys = [entry.key_edit.edit_text.strip() for entry in self.entries
|
||||
if entry.key_edit.edit_text.strip()]
|
||||
if len(keys) != len(set(keys)):
|
||||
self.error = "Duplicate keys are not allowed"
|
||||
self.error_widget.set_text(("error", self.error))
|
||||
return False
|
||||
|
||||
for validation in self.validation_types:
|
||||
if validation == "required" and not values:
|
||||
self.error = "Atleast one parameter is required"
|
||||
break
|
||||
|
||||
self.error_widget.set_text(("error", self.error or ""))
|
||||
return self.error is None
|
||||
2
setup.py
2
setup.py
|
|
@ -30,6 +30,6 @@ setuptools.setup(
|
|||
entry_points= {
|
||||
'console_scripts': ['nomadnet=nomadnet.nomadnet:main']
|
||||
},
|
||||
install_requires=["rns>=0.9.3", "lxmf>=0.6.2", "urwid>=2.6.16", "qrcode"],
|
||||
install_requires=["rns>=0.9.4", "lxmf>=0.6.3", "urwid>=2.6.16", "qrcode"],
|
||||
python_requires=">=3.7",
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue