mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Display on status page that bridge is not a good idea

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2021-03-05 21:20:52 +01:00
parent 23fb2cf5e5
commit a34a7b3215
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
View file

@ -424,6 +424,7 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm
ip6addr=replaceLastNChars(ip6addr,"x",6); ip6addr=replaceLastNChars(ip6addr,"x",6);
} }
var ifname = mArray.wans[i].ifname; var ifname = mArray.wans[i].ifname;
var iftype = mArray.wans[i].iftype;
var whois = mArray.wans[i].whois; var whois = mArray.wans[i].whois;
var whois6 = mArray.wans[i].whois6; var whois6 = mArray.wans[i].whois6;
var signal = mArray.wans[i].signal; var signal = mArray.wans[i].signal;
@ -596,6 +597,11 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm
statusMessage += '<%:Network interface duplicated%>' + '<br />'; statusMessage += '<%:Network interface duplicated%>' + '<br />';
statusMessageClass = "error"; statusMessageClass = "error";
} }
if(iftype == "bridge")
{
statusMessage += '<%:Bridge can't have multipath enabled%>' + '<br />';
statusMessageClass = "error";
}
if(duplicatemac) if(duplicatemac)
{ {
statusMessage += '<%:Network interface MAC address duplicated%>' + '<br />'; statusMessage += '<%:Network interface MAC address duplicated%>' + '<br />';

2
luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
View file

@ -1119,6 +1119,7 @@ function interfaces_status()
local proto = section["proto"] or "" local proto = section["proto"] or ""
local ipv6 = section["ipv6"] or "0" local ipv6 = section["ipv6"] or "0"
local mac = section ["macaddr"] or "" local mac = section ["macaddr"] or ""
local itype = section ["type"] or ""
--if not ipaddr or not gateway then return end --if not ipaddr or not gateway then return end
-- Don't show if0 in the overview -- Don't show if0 in the overview
@ -1479,6 +1480,7 @@ function interfaces_status()
rx = rx, rx = rx,
tx = tx, tx = tx,
zonewan = zonewan, zonewan = zonewan,
iftype = itype,
} }
if ifname ~= nil and ifname:match("^tun.*") then if ifname ~= nil and ifname:match("^tun.*") then
table.insert(mArray.tunnels, data); table.insert(mArray.tunnels, data);