mirror/python
1
0
Fork 0
mirror of https://github.com/meshtastic/python.git synced 2026-01-02 12:57:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #469 from marek22k/improve-argument-handling

Browse Source 
Improve argument handling
This commit is contained in:
Ben Meadors
2024-01-04 20:30:36 -06:00
committed by GitHub
parent 7908fda1cf b468a0c908
commit fe8ae6237e
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
meshtastic/__main__.py
View File

@@ -771,7 +771,10 @@ def onConnected(interface):
if interface.noProto:
logging.warning(f"Not starting Tunnel - disabled by noProto")
else:
tunnel.Tunnel(interface, subnet=args.tunnel_net)
if args.tunnel_net:
tunnel.Tunnel(interface, subnet=args.tunnel_net)
else:
tunnel.Tunnel(interface)
if args.ack or (args.dest != BROADCAST_ADDR and waitForAckNak):
print(

6
meshtastic/tunnel.py
View File

@@ -49,6 +49,12 @@ class Tunnel:
if not iface:
raise Exception("Tunnel() must have a interface")
if not subnet:
raise Exception("Tunnel() must have a subnet")
if not netmask:
raise Exception("Tunnel() must have a netmask")
self.iface = iface
self.subnetPrefix = subnet