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 15:29:23 -04:00
parent e2573fbf12
commit f0504f802e
8 changed files with 67 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

16
routlin/core.py
View file

@ -99,7 +99,7 @@ from validation import (
VALID_PROTOCOLS, VALID_BLOCKLIST_FORMATS,
int_range, domainname,
is_wg, is_dynamic_ip,
derive_vlan_id, derive_interface, validate_config,
derive_interface, validate_config,
)
PRODUCT_NAME = "routlin"
@ -210,7 +210,7 @@ def resolve_vlan_options(vlan):
}
def is_physical(vlan):
return derive_vlan_id(vlan.get("subnet", ""), vlan.get("subnet_mask", 24)) == 1
return vlan.get("vlan_id") == 1
def networkd_stem(vlan):
return f"10-{PRODUCT_NAME}-{vlan['name']}"
@ -329,7 +329,7 @@ def apply_networkd(data, dry_run=False, only_if_changed=False):
If only_if_changed=True, write files only when content differs from disk
and skip the networkd reload if nothing changed. Used by --apply mode.
"""
all_vlan_ids = [derive_vlan_id(v.get('subnet', ''), v.get('subnet_mask', 24)) for v in data["vlans"] if not is_wg(v)]
all_vlan_ids = [v.get('vlan_id') for v in data["vlans"] if not is_wg(v)]
managed_ifaces = [derive_interface(v, data) for v in data["vlans"]]
changed = False
@ -347,7 +347,7 @@ def apply_networkd(data, dry_run=False, only_if_changed=False):
if is_wg(vlan):
continue
iface = derive_interface(vlan, data)
vid = derive_vlan_id(vlan.get('subnet', ''), vlan.get('subnet_mask', 24))
vid = vlan.get('vlan_id')
stem = networkd_stem(vlan)
if not is_physical(vlan):
@ -453,7 +453,7 @@ def build_vlan_dnsmasq_conf(vlan, data, iface):
line("# Generated by core.py -- do not edit manually.")
line("# Edit config.json and re-run: sudo python3 core.py --apply")
line(f"# VLAN: {name} (vlan_id={derive_vlan_id(vlan.get('subnet', ''), vlan.get('subnet_mask', 24))})")
line(f"# VLAN: {name} (vlan_id={vlan.get('vlan_id')})")
line()
line(f"pid-file={vlan_pid_file(vlan)}")
if not is_wg(vlan):
@ -1872,7 +1872,7 @@ def build_radius_users(data):
]
for vlan in data["vlans"]:
vlan_id = derive_vlan_id(vlan.get('subnet', ''), vlan.get('subnet_mask', 24))
vlan_id = vlan.get('vlan_id')
for r in vlan.get("reservations", []):
if r.get("enabled") is not True:
continue
@ -1888,7 +1888,7 @@ def build_radius_users(data):
"",
]
default_id = derive_vlan_id(default_vlan.get('subnet', ''), default_vlan.get('subnet_mask', 24))
default_id = default_vlan.get('vlan_id')
lines += [
f"# Default -- unknown MACs land on VLAN {default_id} ({default_vlan['name']})",
"DEFAULT Auth-Type := Accept",
@ -2913,7 +2913,7 @@ def cmd_apply(data, dry_run=False):
print(f" Would write: {RADIUS_USERS_FILE}")
print(f" {total_macs} MAC reservation(s)")
if default_vlan:
print(f" DEFAULT -> VLAN {derive_vlan_id(default_vlan.get('subnet', ''), default_vlan.get('subnet_mask', 24))} ({default_vlan['name']})")
print(f" DEFAULT -> VLAN {default_vlan.get('vlan_id')} ({default_vlan['name']})")
print(f" Would ensure freeradius is running")
if avahi_enabled(data):
print()