Skip to content

fix(wireguard): use first free name for new peer tunnels #1926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tbaile merged 4 commits into from
Oct 14, 2026
Merged

fix(wireguard): use first free name for new peer tunnels #1926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d60041
fix(wireguard): use first free name for new peer tunnels
m-dilorenzi Oct 9, 2026
511bb38
fix(wireguard): restart the right interface from wg10 on
m-dilorenzi Oct 9, 2026
3872cf2
fix(wireguard): suggest the first free listen port
m-dilorenzi Oct 9, 2026
e7547e0
refactor(wireguard): get the tunnel name from __next_instance()
m-dilorenzi Oct 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 43 additions & 42 deletions packages/ns-api/files/ns.wireguard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,24 +107,21 @@ def list_tunnels():
def get_instance_defaults():
u = EUci()
ret = {}
next_instance = 1
for entry in u.get('network'):
if u.get('network', entry, 'proto', default='') == 'wireguard':
next_instance += 1
if next_instance == 1:
listen_port = 51820
else:
listen_port = 51820 + next_instance - 1
interface = f'wg{next_instance}'
ret["listen_port"] = listen_port
ret["instance"] = interface
# search for a free network
used_ports = []
used_networks = []
interfaces = utils.get_all_by_type(u, "network", "interface")
for i in interfaces:
interface = interfaces[i]
if interface.get("proto") == "wireguard":
used_networks.append(u.get("network", i, "ns_network", default=""))
used_ports.append(interface.get("listen_port", ""))
used_networks.append(interface.get("ns_network", ""))
# search for the first free port
listen_port = 51820
while str(listen_port) in used_ports:
listen_port += 1
ret["listen_port"] = listen_port
ret["instance"] = __next_instance()
# search for a free network
network = ovpn.random_network()
while network in used_networks:
network = ovpn.get_random_network()
Expand Down Expand Up @@ -647,21 +644,23 @@ def import_configuration(args):
config_parser = configparser.ConfigParser(allow_no_value=True)
config_parser.read_string(data)

defaults = get_instance_defaults()
instance = __next_instance()
if instance is None:
return utils.generic_error("no_free_instance")

e_uci = EUci()
e_uci.set('network', defaults['instance'], 'interface')
e_uci.set('network', defaults['instance'], 'proto', 'wireguard')
e_uci.set('network', defaults['instance'], 'private_key', config_parser["Interface"]["PrivateKey"])
e_uci.set('network', defaults['instance'], 'addresses', [config_parser["Interface"]["Address"]])
e_uci.set('network', instance, 'interface')
e_uci.set('network', instance, 'proto', 'wireguard')
e_uci.set('network', instance, 'private_key', config_parser["Interface"]["PrivateKey"])
e_uci.set('network', instance, 'addresses', [config_parser["Interface"]["Address"]])
if 'DNS' in config_parser['Interface']:
e_uci.set('network', defaults['instance'], 'dns', [ip.strip() for ip in config_parser["Interface"]["DNS"].split(',')])
e_uci.set('network', defaults['instance'], 'ns_type', 'tunnel')
e_uci.set('network', defaults['instance'], 'ns_name', f"imported_{defaults['instance']}")
e_uci.set('network', instance, 'dns', [ip.strip() for ip in config_parser["Interface"]["DNS"].split(',')])
e_uci.set('network', instance, 'ns_type', 'tunnel')
e_uci.set('network', instance, 'ns_name', f"imported_{instance}")

peer_id = utils.get_random_id()
peer_instance = f"{defaults['instance']}_{peer_id}_peer"
e_uci.set('network', peer_instance, f'wireguard_{defaults["instance"]}')
peer_instance = f"{instance}_{peer_id}_peer"
e_uci.set('network', peer_instance, f'wireguard_{instance}')
e_uci.set('network', peer_instance, 'public_key', config_parser["Peer"]["PublicKey"])
if 'PresharedKey' in config_parser['Peer']:
e_uci.set('network', peer_instance, 'preshared_key', config_parser["Peer"]["PresharedKey"])
Expand All @@ -670,11 +669,11 @@ def import_configuration(args):
e_uci.set('network', peer_instance, 'endpoint_port', config_parser["Peer"]["Endpoint"].split(':')[1])
e_uci.set('network', peer_instance, 'route_allowed_ips', True)
e_uci.set('network', peer_instance, 'persistent_keepalive', config_parser["Peer"].get("PersistentKeepalive", "25"))
e_uci.set('network', peer_instance, 'ns_link', f'network/{defaults["instance"]}')
e_uci.set('network', peer_instance, 'ns_link', f'network/{instance}')
e_uci.save('network')
zone = f"{defaults['instance']}vpn"
firewall.add_trusted_zone(e_uci, zone, link=f"network/{defaults['instance']}")
firewall.add_interface_to_zone(e_uci, defaults['instance'], zone)
zone = f"{instance}vpn"
firewall.add_trusted_zone(e_uci, zone, link=f"network/{instance}")
firewall.add_interface_to_zone(e_uci, instance, zone)
except Exception:
return utils.validation_error("config", "invalid_file_format")

Expand Down Expand Up @@ -744,19 +743,21 @@ def add_tunnel(args):
if err:
return err

defaults = get_instance_defaults()
instance = __next_instance()
if instance is None:
return utils.generic_error("no_free_instance")
e_uci = EUci()
e_uci.set('network', defaults['instance'], 'interface')
e_uci.set('network', defaults['instance'], 'proto', 'wireguard')
e_uci.set('network', defaults['instance'], 'private_key', args['peer_private_key'])
e_uci.set('network', defaults['instance'], 'addresses', [args['reserved_ip']])
e_uci.set('network', defaults['instance'], 'ns_type', 'tunnel')
e_uci.set('network', defaults['instance'], 'ns_name', args['name'])
e_uci.set('network', defaults['instance'], 'disabled', not args['enabled'])
e_uci.set('network', instance, 'interface')
e_uci.set('network', instance, 'proto', 'wireguard')
e_uci.set('network', instance, 'private_key', args['peer_private_key'])
e_uci.set('network', instance, 'addresses', [args['reserved_ip']])
e_uci.set('network', instance, 'ns_type', 'tunnel')
e_uci.set('network', instance, 'ns_name', args['name'])
e_uci.set('network', instance, 'disabled', not args['enabled'])

peer_id = utils.get_random_id()
peer_instance = f"{defaults['instance']}_{peer_id}_peer"
e_uci.set('network', peer_instance, f'wireguard_{defaults["instance"]}')
peer_instance = f"{instance}_{peer_id}_peer"
e_uci.set('network', peer_instance, f'wireguard_{instance}')
e_uci.set('network', peer_instance, 'public_key', args['server_public_key'])
if 'pre_shared_key' in args and args['pre_shared_key'] != '':
e_uci.set('network', peer_instance, 'preshared_key', args['pre_shared_key'])
Expand All @@ -773,13 +774,13 @@ def add_tunnel(args):
e_uci.set('network', peer_instance, 'endpoint_port', args['udp_port'])
e_uci.set("network", peer_instance, "route_allowed_ips", True)
e_uci.set('network', peer_instance, 'persistent_keepalive', args.get('persistent_keepalive', '25'))
e_uci.set('network', peer_instance, 'ns_link', f'network/{defaults["instance"]}')
e_uci.set('network', peer_instance, 'ns_link', f'network/{instance}')
if 'dns' in args:
e_uci.set('network', defaults['instance'], 'dns', args['dns'])
e_uci.set('network', instance, 'dns', args['dns'])
e_uci.save('network')
zone = f"{defaults['instance']}vpn"
firewall.add_trusted_zone(e_uci, zone, link=f"network/{defaults['instance']}")
firewall.add_interface_to_zone(e_uci, defaults["instance"], zone)
zone = f"{instance}vpn"
firewall.add_trusted_zone(e_uci, zone, link=f"network/{instance}")
firewall.add_interface_to_zone(e_uci, instance, zone)

return {"result": "success"}

Expand Down
2 changes: 1 addition & 1 deletion packages/ns-api/files/post-commit/restart-wireguard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
interfaces_to_restart = []
for entry in changes['network']:
if entry[1].startswith('wg'):
interfaces_to_restart.append(entry[1][:3])
interfaces_to_restart.append(entry[1].split('_')[0])
for item in set(interfaces_to_restart):
subprocess.call(f'ifdown {item} ; ifup {item}', shell=True)
Loading