christian/rmm2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WAN IP fix: IPv4 bevorzugen, PPPoE-Interfaces korrekt erkennen

Browse Source
This commit is contained in:
cynfo3000 2026-03-04 00:04:32 +01:00
parent 983ecf390c
commit 5d26158b53
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/src/pages/Agents.jsx
View File

@ -136,12 +136,14 @@ export default function Agents() {
: null : null
const gateways = sys?.gateways || [] const gateways = sys?.gateways || []
// WAN IP: prefer gateway with WAN role, fallback to interface with WAN role, fallback to a.ip // WAN IP: find interface with WAN role AND a valid IPv4 address
const ifaces = sys?.network_interfaces || [] const ifaces = sys?.network_interfaces || []
const wanIface = ifaces.find(i => (i.role || '').toUpperCase() === 'WAN') const isIPv4 = (ip) => ip && /^\d+\.\d+\.\d+\.\d+/.test(ip)
const lanIface = ifaces.find(i => (i.role || '').toUpperCase() === 'LAN') const wanIface = ifaces.find(i => (i.role || '').toUpperCase() === 'WAN' && isIPv4(i.ip))
const wanGw = gateways.find(g => (g.name || '').toUpperCase().includes('WAN')) || ifaces.find(i => (i.role || '').toUpperCase() === 'WAN' && i.ip)
const wanIp = wanIface?.ip || wanGw?.address || a.ip || '' const lanIface = ifaces.find(i => (i.role || '').toUpperCase() === 'LAN' && isIPv4(i.ip))
|| ifaces.find(i => (i.role || '').toUpperCase() === 'LAN' && i.ip)
const wanIp = wanIface?.ip || a.ip || ''
const lanIp = lanIface?.ip || '' const lanIp = lanIface?.ip || ''
return { return {