Skip to content

fix(ns-ipsec): synchronize disabled state for existing routes in edit tunnel API #1567

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

Open
m-dilorenzi wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(ns-ipsec): synchronize disabled state for existing routes in edit tunnel API #1567

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6cfee7
fix(ns-ipsec): synchronize disabled state for existing routes in edit…
m-dilorenzi Mar 13, 2026
7eecbb9
fix(ns-ipsec): update copyright year
m-dilorenzi Mar 13, 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
18 changes: 12 additions & 6 deletions packages/ns-api/files/ns.ipsectunnel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/python3

#
# Copyright (C) 2022 Nethesis S.r.l.
# Copyright (C) 2026 Nethesis S.r.l.
# SPDX-License-Identifier: GPL-2.0-only
#

Expand Down Expand Up @@ -415,7 +415,8 @@ def edit_tunnel(args):
current_remote = set(rs for (ls, rs) in existing_pairs)
new_remote = set(args['remote_subnet'])
dname = f'ipsec{if_id}'

route_disabled = '0' if args['enabled'] == '1' else '1'

if current_remote != new_remote:
# Build map of existing routes: target -> route_name
existing_routes = {}
Expand Down Expand Up @@ -446,11 +447,16 @@ def edit_tunnel(args):
u.set('network', rname, 'target', net)
u.set('network', rname, 'interface', dname)
u.set('network', rname, 'ns_link', link)
u.set('network', rname, 'disabled', '0' if args['enabled'] == '1' else '1')
u.set('network', rname, 'disabled', route_disabled)
ri = ri + 1

u.save('network')


# Sync disabled state on all existing routes
for r in utils.get_all_by_type(u, 'network', 'route'):
if u.get('network', r, 'ns_link', default='') == link:
uci_set_if_changed(u, 'network', r, 'disabled', route_disabled)

u.save('network')

# Update remote section (only if changed)
uci_set_if_changed(u, 'ipsec', id, 'ns_name', args['ns_name'])
for opt in ['gateway', 'keyexchange', 'local_identifier', 'local_ip', 'enabled', 'remote_identifier', 'pre_shared_key']:
Expand Down
Loading