Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-olsr: convert olsr.lua and smartgw.htm to new json plugin

Browse source 
Signed-off-by: pmelange <isprotejesvalkata@gmail.com>
This commit is contained in:
pmelange 2018-11-05 16:27:40 +01:00
parent 7fb197c10a
commit 5fd51f05a8
2 changed files with 34 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
applications/luci-app-olsr/luasrc/controller/olsr.lua
View file

@ -318,13 +318,14 @@ function action_smartgw()
local function compare(a,b) local function compare(a,b)
if a.proto == b.proto then if a.proto == b.proto then
return a.tcPathCost < b.tcPathCost return a.cost < b.cost
else else
return a.proto < b.proto return a.proto < b.proto
end end
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}) luci.template.render("status-olsr/smartgw", {gws=data, has_v4=has_v4, has_v6=has_v6})
end end

62
applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm
View file

@ -17,23 +17,23 @@ end)
if luci.http.formvalue("status") == "1" then if luci.http.formvalue("status") == "1" then
local rv = {} local rv = {}
for k, gw in ipairs(gws) do for k, gw in ipairs(gws.ipv4, gws.ipv6) do
gw.tcPathCost = tonumber(gw.tcPathCost)/1024 or 0 gw.cost = tonumber(gw.cost)/1024 or 0
if gw.tcPathCost == 4096 then if gw.cost == 4096 then
gw.tcPathCost = 0 gw.cost = 0
end end
rv[#rv+1] = { rv[#rv+1] = {
proto = gw.proto, proto = gw.IPv4 and '4' or '6',
ipAddress = gw.ipAddress, originator = gw.originator,
status = gw.ipv4Status or gw.ipv6Status, selected = gw.selected and luci.i18n.translate('yes') or luci.i18n.translate('no'),
tcPathCost = string.format("%.3f", gw.tcPathCost), cost = string.format("%.3f", gw.cost),
hopCount = gw.hopCount, hops = gw.hops,
uplinkSpeed = gw.uplinkSpeed, uplink = gw.uplink,
downlinkSpeed = gw.downlinkSpeed, downlink = gw.downlink,
v4 = gw.ipv4 and luci.i18n.translate('yes') or luci.i18n.translate('no'), 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'), v6 = gw.IPv6 and luci.i18n.translate('yes') or luci.i18n.translate('no'),
externalPrefix = gw.externalPrefix prefix = gw.prefix
} }
end end
luci.http.prepare_content("application/json") luci.http.prepare_content("application/json")
@ -58,9 +58,9 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
var linkgw; var linkgw;
s += '<div class="tr cbi-section-table-row cbi-rowstyle-'+(1 + (idx % 2))+' proto-' + smartgw.proto + '">' s += '<div class="tr cbi-section-table-row cbi-rowstyle-'+(1 + (idx % 2))+' proto-' + smartgw.proto + '">'
if (smartgw.proto == '6') { if (smartgw.proto == '6') {
linkgw = '<a href="http://[' + smartgw.ipAddress + ']/cgi-bin-status.html">' + smartgw.ipAddress + '</a>' linkgw = '<a href="http://[' + smartgw.originator + ']/cgi-bin-status.html">' + smartgw.originator + '</a>'
} else { } else {
linkgw = '<a href="http://' + smartgw.ipAddress + '/cgi-bin-status.html">' + smartgw.ipAddress + '</a>' linkgw = '<a href="http://' + smartgw.originator + '/cgi-bin-status.html">' + smartgw.originator + '</a>'
} }
s += String.format( s += String.format(
@ -73,7 +73,7 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
'<div class="td cbi-section-table-cell">%s</div>' + '<div class="td cbi-section-table-cell">%s</div>' +
'<div class="td cbi-section-table-cell">%s</div>' + '<div class="td cbi-section-table-cell">%s</div>' +
'<div class="td cbi-section-table-cell">%s</div>', '<div class="td cbi-section-table-cell">%s</div>',
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 += '</div>' s += '</div>'
} }
@ -98,7 +98,7 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
<div class="thead"> <div class="thead">
<div class="tr cbi-section-table-titles"> <div class="tr cbi-section-table-titles">
<div class="th cbi-section-table-cell"><%:Gateway%></div> <div class="th cbi-section-table-cell"><%:Gateway%></div>
<div class="th cbi-section-table-cell"><%:Status%></div> <div class="th cbi-section-table-cell"><%:Selected%></div>
<div class="th cbi-section-table-cell"><%:ETX%></div> <div class="th cbi-section-table-cell"><%:ETX%></div>
<div class="th cbi-section-table-cell"><%:Hops%></div> <div class="th cbi-section-table-cell"><%:Hops%></div>
<div class="th cbi-section-table-cell"><%:Uplink%></div> <div class="th cbi-section-table-cell"><%:Uplink%></div>
@ -113,27 +113,27 @@ XHR.poll(10, '<%=REQUEST_URI%>', { status: 1 },
<div class="tbody" id="olsrd_smartgw"> <div class="tbody" id="olsrd_smartgw">
<% for k, gw in ipairs(gws) do <% for k, gw in ipairs(gws) do
gw.tcPathCost = tonumber(gw.tcPathCost)/1024 or 0 gw.cost = tonumber(gw.cost)/1024 or 0
if gw.tcPathCost == 4096 then if gw.cost == 4096 then
gw.tcPathCost = 0 gw.cost = 0
end end
%> %>
<div class="tr cbi-section-table-row cbi-rowstyle-<%=i%> proto-<%=proto%>"> <div class="tr cbi-section-table-row cbi-rowstyle-<%=i%> proto-<%=proto%>">
<% if gw.proto == '6' then %> <% if gw.proto == '6' then %>
<div class="td cbi-section-table-cell"><a href="http://[<%=gw.ipAddress%>]/cgi-bin-status.html"><%=gw.ipAddress%></a></div> <div class="td cbi-section-table-cell"><a href="http://[<%=gw.originator%>]/cgi-bin-status.html"><%=gw.originator%></a></div>
<% else %> <% else %>
<div class="td cbi-section-table-cell"><a href="http://<%=gw.ipAddress%>/cgi-bin-status.html"><%=gw.ipAddress%></a></div> <div class="td cbi-section-table-cell"><a href="http://<%=gw.originator%>/cgi-bin-status.html"><%=gw.originator%></a></div>
<% end %> <% end %>
<div class="td cbi-section-table-cell"><%=gw.ipv4Status or gw.ipv6Status or '-' %></div> <div class="td cbi-section-table-cell"><%=gw.selected and luci.i18n.translate('yes') or luci.i18n.translate('no')%></div>
<div class="td cbi-section-table-cell"><%=string.format("%.3f", gw.tcPathCost)%></div> <div class="td cbi-section-table-cell"><%=string.format("%.3f", gw.cost)%></div>
<div class="td cbi-section-table-cell"><%=gw.hopCount%></div> <div class="td cbi-section-table-cell"><%=gw.hops%></div>
<div class="td cbi-section-table-cell"><%=gw.uplinkSpeed%></div> <div class="td cbi-section-table-cell"><%=gw.uplink%></div>
<div class="td cbi-section-table-cell"><%=gw.downlinkSpeed%></div> <div class="td cbi-section-table-cell"><%=gw.downlink%></div>
<div class="td cbi-section-table-cell"><%=gw.ipv4 and luci.i18n.translate('yes') or luci.i18n.translate('no')%></div> <div class="td cbi-section-table-cell"><%=gw.IPv4 and luci.i18n.translate('yes') or luci.i18n.translate('no')%></div>
<div class="td cbi-section-table-cell"><%=gw.ipv6 and luci.i18n.translate('yes') or luci.i18n.translate('no')%></div> <div class="td cbi-section-table-cell"><%=gw.IPv6 and luci.i18n.translate('yes') or luci.i18n.translate('no')%></div>
<div class="td cbi-section-table-cell"><%=gw.externalPrefix%></div> <div class="td cbi-section-table-cell"><%=gw.prefix%></div>
</div> </div>
<% i = ((i % 2) + 1) <% i = ((i % 2) + 1)