mgrotke/linuxrouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Development

Browse source
This commit is contained in:
Matthew Grotke 2026-05-27 03:28:44 -04:00
parent ca2091a98b
commit 9e290d958a
3 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
docker/routlin-dash/app/action_networklayout.py
View file

@ -199,6 +199,12 @@ def networklayout_tablevlans_edit():
entry.pop('hostname', None)
new_identities.append(entry)
gateway_raw = sanitize.ip(request.form.get('gateway', ''))
inferred_gw = (min(identity_ips, key=lambda ip: int(ip.split('.')[-1]))
if identity_ips else '')
new_stored_gw = gateway_raw if (gateway_raw and gateway_raw != inferred_gw) else ''
existing_gw = existing.get('dhcp_information', {}).get('explicit_overrides', {}).get('gateway', '')
_ids_unchanged = (
len(new_identities) == len(old_identities) and
all(
@ -215,7 +221,8 @@ def networklayout_tablevlans_edit():
and radius_default == bool(existing.get('radius_default', False))
and mdns_reflection == bool(existing.get('mdns_reflection', False))
and sorted(use_blocklists) == sorted(existing.get('use_blocklists', []))
and _ids_unchanged):
and _ids_unchanged
and new_stored_gw == existing_gw):
flash('No changes were made.', 'info')
return redirect(VIEW)
@ -231,6 +238,11 @@ def networklayout_tablevlans_edit():
'use_blocklists': use_blocklists,
'server_identities': new_identities,
})
dhcp_overrides = existing.setdefault('dhcp_information', {}).setdefault('explicit_overrides', {})
if new_stored_gw:
dhcp_overrides['gateway'] = new_stored_gw
else:
dhcp_overrides.pop('gateway', None)
errors = validate.validate_config(cfg)
if errors:
for msg in errors: