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

sync (#546)

Browse source
This commit is contained in:
suyuan 2024-09-22 15:21:45 +08:00 committed by GitHub
commit 511231cc1a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -445,13 +445,14 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm
cssc = 'rgb(144, 240, 144)'; cssc = 'rgb(144, 240, 144)';
statusIcon = "<%=resource%>/openmptcprouter/images/statusWarning.png"; statusIcon = "<%=resource%>/openmptcprouter/images/statusWarning.png";
statusMessageClass = "warning"; statusMessageClass = "warning";
statusMessage = "Some connectivity tests failed"; statusMessage = "Some connectivity tests failed" + '<br />';
break;
default: default:
stat = 'Unknown'; stat = 'Unknown';
cssc = 'rgb(144, 240, 144)'; cssc = 'rgb(144, 240, 144)';
statusIcon = "<%=resource%>/openmptcprouter/images/statusWarning.png"; statusIcon = "<%=resource%>/openmptcprouter/images/statusWarning.png";
statusMessageClass = "warning"; statusMessageClass = "warning";
statusMessage = "Unknown status"; statusMessage = "Unknown status (" + mArray.wans[i].status + ")" + '<br />';
} }
// Populate info // Populate info
var wanip = mArray.wans[i].wanip; var wanip = mArray.wans[i].wanip;

7
luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
View file

@ -305,6 +305,10 @@ return view.extend({
o = s.taboption('general', form.DynamicList, 'ipset', o = s.taboption('general', form.DynamicList, 'ipset',
_('IP sets'), _('IP sets'),
_('List of IP sets to populate with the IPs of DNS lookup results of the FQDNs also specified here.')); _('List of IP sets to populate with the IPs of DNS lookup results of the FQDNs also specified here.'));
o.filter = function(section_id, name) {
return (section_id.startsWith('omr_dscp') == false);
};
o.optional = true; o.optional = true;
o.placeholder = '/example.org/ipset,ipset6'; o.placeholder = '/example.org/ipset,ipset6';
@ -754,6 +758,9 @@ return view.extend({
_('List of IP sets to populate with the IPs of DNS lookup results of the FQDNs also specified here.')); _('List of IP sets to populate with the IPs of DNS lookup results of the FQDNs also specified here.'));
ss = o.subsection; ss = o.subsection;
ss.filter = function(section_id, name) {
return (section_id.startsWith('omr_') == false);
};
ss.addremove = true; ss.addremove = true;
ss.anonymous = true; ss.anonymous = true;

3
openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter
View file

@ -1273,6 +1273,7 @@ function interfaces_status()
local mac = section ["macaddr"] or "" local mac = section ["macaddr"] or ""
local itype = section ["type"] or "" local itype = section ["type"] or ""
local state = uci:get("openmptcprouter", interface, "state") or "" local state = uci:get("openmptcprouter", interface, "state") or ""
local connectivity = "OK"
--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
@ -1311,7 +1312,7 @@ function interfaces_status()
if enabled == "0" then return end if enabled == "0" then return end
local connectivity = "OK" --local connectivity = "OK"
if ipaddr == "" and ifname ~= nil and ifname ~= "" and proto ~= "dhcpv6" then if ipaddr == "" and ifname ~= nil and ifname ~= "" and proto ~= "dhcpv6" then
ipaddr = ut.trim(sys.exec("ip -4 -br addr ls dev " .. ifname .. " | awk -F'[ /]+' '{print $3}' | tr -d '\n'")) ipaddr = ut.trim(sys.exec("ip -4 -br addr ls dev " .. ifname .. " | awk -F'[ /]+' '{print $3}' | tr -d '\n'"))
end end