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-06-03 03:20:52 -04:00
parent 37a8e58fc7
commit 5d7ca3770f
1 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
routlin/maintenance.py
View file

@ -535,24 +535,34 @@ def rotate_radius_log(radius_cfg):
# Main
# ===================================================================
ARP_MAX_AGE_SECS = 4 * 3600
def refresh_arp_cache():
try:
result = subprocess.run(['ip', 'neigh'], capture_output=True, text=True, timeout=5)
entries = {}
result = subprocess.run(['ip', '-stats', 'neigh'], capture_output=True, text=True, timeout=5)
best = {} # mac -> (used_secs, entry_dict)
for line in result.stdout.splitlines():
parts = line.split()
if 'lladdr' not in parts:
continue
state = parts[-1]
if state in ('FAILED', 'PERMANENT', 'NOARP', 'INCOMPLETE'):
if ':' in parts[0]: # skip IPv6
continue
iface = parts[2] if len(parts) > 2 else ''
if iface.startswith('br-') or iface == 'docker0':
continue
state = parts[-1]
if state in ('FAILED', 'PERMANENT', 'NOARP', 'INCOMPLETE'):
continue
used_match = re.search(r'used\s+(\d+)/', line)
used_secs = int(used_match.group(1)) if used_match else 0
if used_secs > ARP_MAX_AGE_SECS:
continue
idx = parts.index('lladdr')
mac = parts[idx + 1].lower()
entries[mac] = {'ip': parts[0], 'state': state}
ARP_CACHE_FILE.write_text(json.dumps(entries))
if mac not in best or used_secs < best[mac][0]:
best[mac] = (used_secs, {'ip': parts[0], 'state': state})
ARP_CACHE_FILE.write_text(json.dumps({m: e for m, (_, e) in best.items()}))
except Exception as exc:
print(f"WARNING: Could not refresh ARP cache: {exc}")