From 19b640b53b0ba8585b91a5f5fa23503e0fca76c2 Mon Sep 17 00:00:00 2001 From: pmelange Date: Mon, 5 Nov 2018 10:24:15 +0100 Subject: luci-app-olsr: cbi remove library version numbers in library search results Signed-off-by: pmelange --- applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua | 1 + applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua | 1 + 2 files changed, 2 insertions(+) diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua index 2d7cffe6e..59e99c867 100644 --- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua +++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua @@ -227,6 +227,7 @@ else -- create a loadplugin section for each found plugin for v in fs.dir("/usr/lib") do if v:sub(1, 6) == "olsrd_" then + v = string.match(v, "^(olsrd.*)%.so%..*") if not plugins[v] then mpi.uci:section( "olsrd", "LoadPlugin", nil, diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua index 12fa0a171..9873b0269 100644 --- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua +++ b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua @@ -227,6 +227,7 @@ else -- create a loadplugin section for each found plugin for v in fs.dir("/usr/lib") do if v:sub(1, 6) == "olsrd_" then + v=string.match(v, "^(olsrd_.*)%.so%..*") if not plugins[v] then mpi.uci:section( "olsrd6", "LoadPlugin", nil, -- cgit v1.2.3 From 4fc3ab47378df1ffdf766df2c514122a0217a2de Mon Sep 17 00:00:00 2001 From: pmelange Date: Mon, 5 Nov 2018 14:03:35 +0100 Subject: luci-base: network.lua add ipv6-prefix-assignment support to get_status_by_address Signed-off-by: pmelange --- modules/luci-base/luasrc/model/network.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/luci-base/luasrc/model/network.lua b/modules/luci-base/luasrc/model/network.lua index 7f7397032..49e1657aa 100644 --- a/modules/luci-base/luasrc/model/network.lua +++ b/modules/luci-base/luasrc/model/network.lua @@ -855,6 +855,14 @@ function get_status_by_address(self, addr) end end end + if s and s['ipv6-prefix-assignment'] then + local a + for _, a in ipairs(s['ipv6-prefix-assignment']) do + if a and a['local-address'] and a['local-address'].address == addr then + return net, s + end + end + end end end end -- cgit v1.2.3 From 6ef3a00f6bb8e7084aec6ff47375a77d77eee2d2 Mon Sep 17 00:00:00 2001 From: pmelange Date: Mon, 5 Nov 2018 17:20:16 +0100 Subject: luci-app-olsr: convert olsr.lua and overview.htm to new json plugin Signed-off-by: pmelange --- applications/luci-app-olsr/luasrc/controller/olsr.lua | 4 ++-- .../luci-app-olsr/luasrc/view/status-olsr/overview.htm | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/applications/luci-app-olsr/luasrc/controller/olsr.lua b/applications/luci-app-olsr/luasrc/controller/olsr.lua index c5fb2b2a5..ff4a248da 100644 --- a/applications/luci-app-olsr/luasrc/controller/olsr.lua +++ b/applications/luci-app-olsr/luasrc/controller/olsr.lua @@ -87,8 +87,8 @@ function action_json() local v4_port = tonumber(uci:get("olsrd", "olsrd_jsoninfo", "port") or "") or 9090 local v6_port = tonumber(uci:get("olsrd6", "olsrd_jsoninfo", "port") or "") or 9090 - jsonreq4 = utl.exec("(echo /status | nc 127.0.0.1 %d | sed -n '/^[}{ ]/p') 2>/dev/null" % v4_port) - jsonreq6 = utl.exec("(echo /status | nc ::1 %d | sed -n '/^[}{ ]/p') 2>/dev/null" % v6_port) + jsonreq4 = utl.exec("(echo /all | nc 127.0.0.1 %d | sed -n '/^[}{ ]/p') 2>/dev/null" % v4_port) + jsonreq6 = utl.exec("(echo /all | nc ::1 %d | sed -n '/^[}{ ]/p') 2>/dev/null" % v6_port) http.prepare_content("application/json") if not jsonreq4 or jsonreq4 == "" then jsonreq4 = "{}" diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm index f205edc16..7bfd73df2 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm @@ -61,12 +61,12 @@ XHR.poll(10, '<%=REQUEST_URI%>/json', { }, if (e = document.getElementById('version')) var version; var date; - if (info.v4.config.olsrdVersion != undefined) { - version = info.v4.config.olsrdVersion - date = info.v4.config.olsrdBuildDate - } else if (info.v6.config.olsrdVersion != undefined) { - version = info.v6.config.olsrdVersion - date = info.v6.config.olsrdBuildDate + if (info.v4.version.version != undefined) { + version = info.v4.version.version + date = info.v4.version.date + } else if (info.v6.version.version != undefined) { + version = info.v6.version.version + date = info.v6.version.date } else { version = 'unknown' date = 'unknown' -- cgit v1.2.3 From 9e7557b60638cc2981f1a837ef0708a1677632b9 Mon Sep 17 00:00:00 2001 From: pmelange Date: Mon, 5 Nov 2018 11:44:53 +0100 Subject: luci-app-olsr: convert interfaces.htm to new json plugin Signed-off-by: pmelange --- .../luci-app-olsr/luasrc/view/status-olsr/interfaces.htm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm index e3ccd0c23..7506f0702 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm @@ -33,12 +33,12 @@ local i = 1
<%=iface.name%>
-
<%=iface.state%>
-
<%=iface.olsrMTU%>
-
<%=iface.wireless and luci.i18n.translate('yes') or luci.i18n.translate('no')%>
-
<%=iface.ipv4Address or iface.ipv6Address%>
-
<%=iface.netmask%>
-
<%=iface.broadcast or iface.multicast%>
+
<%=iface.olsrInterface.up and luci.i18n.translate('up') or luci.i18n.translate('down')%>
+
<%=iface.olsrInterface.mtu%>
+
<%=iface.olsrInterface.wireless and luci.i18n.translate('yes') or luci.i18n.translate('no')%>
+
<%=iface.olsrInterface.ipAddress%>
+
<%=iface.olsrInterface.ipv4Address ~= '0.0.0.0' and iface.olsrInterface.ipv4Netmask%>
+
<%=iface.olsrInterface.ipv4Address ~= '0.0.0.0' and iface.olsrInterface.ipv4Broadcast or iface.olsrInterface.ipv6Multicast%>
<% i = ((i % 2) + 1) end %> -- cgit v1.2.3 From 7fb197c10a0c5b6d3908a6511ead043219be5492 Mon Sep 17 00:00:00 2001 From: pmelange Date: Mon, 5 Nov 2018 16:37:19 +0100 Subject: luci-app-olsr: convert mid.htm to new json plugin Signed-off-by: pmelange --- applications/luci-app-olsr/luasrc/controller/olsr.lua | 2 +- applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/applications/luci-app-olsr/luasrc/controller/olsr.lua b/applications/luci-app-olsr/luasrc/controller/olsr.lua index ff4a248da..e2e93d269 100644 --- a/applications/luci-app-olsr/luasrc/controller/olsr.lua +++ b/applications/luci-app-olsr/luasrc/controller/olsr.lua @@ -300,7 +300,7 @@ function action_mid() local function compare(a,b) if a.proto == b.proto then - return a.ipAddress < b.ipAddress + return a.main.ipAddress < b.main.ipAddress else return a.proto < b.proto end diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm index 8c9f63af0..9babd50a8 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm @@ -31,14 +31,14 @@ local i = 1 end aliases = v.ipAddress .. sep .. aliases end - local host = mid.ipAddress + local host = mid.main.ipAddress if mid.proto == '6' then - host = '[' .. mid.ipAddress .. ']' + host = '[' .. mid.main.ipAddress .. ']' end %>
-
<%=mid.ipAddress%>
+
<%=mid.main.ipAddress%>
<%=aliases%>
-- cgit v1.2.3 From 5fd51f05a8f6bf7da7247c8c568080db625efa96 Mon Sep 17 00:00:00 2001 From: pmelange Date: Mon, 5 Nov 2018 16:27:40 +0100 Subject: luci-app-olsr: convert olsr.lua and smartgw.htm to new json plugin Signed-off-by: pmelange --- .../luci-app-olsr/luasrc/controller/olsr.lua | 5 +- .../luasrc/view/status-olsr/smartgw.htm | 62 +++++++++++----------- 2 files changed, 34 insertions(+), 33 deletions(-) diff --git a/applications/luci-app-olsr/luasrc/controller/olsr.lua b/applications/luci-app-olsr/luasrc/controller/olsr.lua index e2e93d269..dc424c011 100644 --- a/applications/luci-app-olsr/luasrc/controller/olsr.lua +++ b/applications/luci-app-olsr/luasrc/controller/olsr.lua @@ -318,13 +318,14 @@ function action_smartgw() local function compare(a,b) if a.proto == b.proto then - return a.tcPathCost < b.tcPathCost + return a.cost < b.cost else return a.proto < b.proto end end - table.sort(data, compare) + table.sort(data.ipv4, compare) + table.sort(data.ipv6, compare) luci.template.render("status-olsr/smartgw", {gws=data, has_v4=has_v4, has_v6=has_v6}) end diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm index 46cc27dec..ba36ce980 100644 --- a/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm +++ b/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm @@ -17,23 +17,23 @@ end) if luci.http.formvalue("status") == "1" then local rv = {} - for k, gw in ipairs(gws) do - gw.tcPathCost = tonumber(gw.tcPathCost)/1024 or 0 - if gw.tcPathCost == 4096 then - gw.tcPathCost = 0 + for k, gw in ipairs(gws.ipv4, gws.ipv6) do + gw.cost = tonumber(gw.cost)/1024 or 0 + if gw.cost == 4096 then + gw.cost = 0 end rv[#rv+1] = { - proto = gw.proto, - ipAddress = gw.ipAddress, - status = gw.ipv4Status or gw.ipv6Status, - tcPathCost = string.format("%.3f", gw.tcPathCost), - hopCount = gw.hopCount, - uplinkSpeed = gw.uplinkSpeed, - downlinkSpeed = gw.downlinkSpeed, - v4 = gw.ipv4 and luci.i18n.translate('yes') or luci.i18n.translate('no'), - v6 = gw.ipv6 and luci.i18n.translate('yes') or luci.i18n.translate('no'), - externalPrefix = gw.externalPrefix + proto = gw.IPv4 and '4' or '6', + originator = gw.originator, + selected = gw.selected and luci.i18n.translate('yes') or luci.i18n.translate('no'), + cost = string.format("%.3f", gw.cost), + hops = gw.hops, + uplink = gw.uplink, + downlink = gw.downlink, + v4 = gw.IPv4 and luci.i18n.translate('yes') or luci.i18n.translate('no'), + v6 = gw.IPv6 and luci.i18n.translate('yes') or luci.i18n.translate('no'), + prefix = gw.prefix } end luci.http.prepare_content("application/json") @@ -58,9 +58,9 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 }, var linkgw; s += '
' if (smartgw.proto == '6') { - linkgw = '' + smartgw.ipAddress + '' + linkgw = '' + smartgw.originator + '' } else { - linkgw = '' + smartgw.ipAddress + '' + linkgw = '' + smartgw.originator + '' } s += String.format( @@ -73,7 +73,7 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 }, '
%s
' + '
%s
' + '
%s
', - linkgw, smartgw.status, smartgw.tcPathCost, smartgw.hopCount, smartgw.uplinkSpeed, smartgw.downlinkSpeed, smartgw.v4, smartgw.v6, smartgw.externalPrefix + linkgw, smartgw.selected, smartgw.cost, smartgw.hops, smartgw.uplink, smartgw.downlink, smartgw.v4, smartgw.v6, smartgw.prefix ) s += '
' } @@ -98,7 +98,7 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
<%:Gateway%>
-
<%:Status%>
+
<%:Selected%>
<%:ETX%>
<%:Hops%>
<%:Uplink%>
@@ -113,27 +113,27 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
<% for k, gw in ipairs(gws) do - gw.tcPathCost = tonumber(gw.tcPathCost)/1024 or 0 - if gw.tcPathCost == 4096 then - gw.tcPathCost = 0 + gw.cost = tonumber(gw.cost)/1024 or 0 + if gw.cost == 4096 then + gw.cost = 0 end %>
<% if gw.proto == '6' then %> -
<%=gw.ipAddress%>
+
<%=gw.originator%>
<% else %> -
<%=gw.ipAddress%>
+
<%=gw.originator%>
<% end %> -
<%=gw.ipv4Status or gw.ipv6Status or '-' %>
-
<%=string.format("%.3f", gw.tcPathCost)%>
-
<%=gw.hopCount%>
-
<%=gw.uplinkSpeed%>
-
<%=gw.downlinkSpeed%>
-
<%=gw.ipv4 and luci.i18n.translate('yes') or luci.i18n.translate('no')%>
-
<%=gw.ipv6 and luci.i18n.translate('yes') or luci.i18n.translate('no')%>
-
<%=gw.externalPrefix%>
+
<%=gw.selected and luci.i18n.translate('yes') or luci.i18n.translate('no')%>
+
<%=string.format("%.3f", gw.cost)%>
+
<%=gw.hops%>
+
<%=gw.uplink%>
+
<%=gw.downlink%>
+
<%=gw.IPv4 and luci.i18n.translate('yes') or luci.i18n.translate('no')%>
+
<%=gw.IPv6 and luci.i18n.translate('yes') or luci.i18n.translate('no')%>
+
<%=gw.prefix%>
<% i = ((i % 2) + 1) -- cgit v1.2.3