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

Fix routes on freifunk public status page

Browse source
This commit is contained in:
Manuel Munz 2015-06-28 15:55:37 +02:00
parent e3ee086d19
commit 3a9e1af526
1 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
modules/luci-mod-freifunk/luasrc/view/freifunk/public_status.htm
View file

@ -49,6 +49,32 @@ for _, dev in ipairs(devices) do
end end
local has_iwinfo = pcall(require, "iwinfo") local has_iwinfo = pcall(require, "iwinfo")
-- Find default routes
local _, r, def4, def6
for _, r in ipairs(ip.routes({ type = 1, dest_exact = "0.0.0.0/0" })) do
def4 = {
gateway = r.gw:string(),
dest = r.dest:string(),
dev = r.dev,
metr = r.metric or 0
}
break
end
for _, r in ipairs(ip.routes({ type = 1, dest_exact = "::/0" })) do
def6 = {
gateway = r.gw:string(),
dest = r.dest:string(),
dev = r.dev,
metr = r.metric or 0
}
break
end
if luci.http.formvalue("status") == "1" then if luci.http.formvalue("status") == "1" then
local rv = { } local rv = { }
for dev in pairs(netdevs) do for dev in pairs(netdevs) do
@ -67,30 +93,6 @@ if luci.http.formvalue("status") == "1" then
end end
-- Find default routes
local _, r, def4, def6
for _, r in ipairs(ip.routes({ type = 1, dest_exact = "0.0.0.0/0" })) do
def4 = {
gateway = r.gw:string(),
dest = r.dest:string(),
dev = r.dev,
metr = r.metric or 0
}
break
end
for _, r in ipairs(ip.routes({ type = 1, dest_exact = "::/0" })) do
def6 = {
gateway = r.gw:string(),
dest = r.dest:string(),
dev = r.dev,
metr = r.metric or 0
}
break
end
rv[#rv+1] = { rv[#rv+1] = {
time = time, time = time,
uptime = uptime, uptime = uptime,
@ -297,7 +299,7 @@ end
if bitrate ~= "N/A" then if bitrate ~= "N/A" then
bitrate = ( bitrate / 1000 ).."Mb/s" bitrate = ( bitrate / 1000 ).."Mb/s"
end end
local interface = net.iwdata.ifname or "N/A" local interface = netiwdata.ifname or "N/A"
%> %>
<tr class="cbi-section-table-row cbi-rowstyle-1"> <tr class="cbi-section-table-row cbi-rowstyle-1">
<td class="cbi-value-field" id="<%=net:ifname()%>-signal"><%=signal_string%></td> <td class="cbi-value-field" id="<%=net:ifname()%>-signal"><%=signal_string%></td>
@ -323,7 +325,7 @@ end
<div class="cbi-section"> <div class="cbi-section">
<div class="cbi-section-node"> <div class="cbi-section-node">
<% if not defroutev4 and not defroutev6 then %> <% if not def4 and not def6 then %>
<%:No default routes known.%> <%:No default routes known.%>
<%else%> <%else%>
<table class="cbi-section-table"> <table class="cbi-section-table">
@ -334,23 +336,22 @@ end
<th class="cbi-section-table-cell"><%:Metric%></th> <th class="cbi-section-table-cell"><%:Metric%></th>
</tr> </tr>
<% if defroutev4 then %> <% if def4 then %>
<tr class="cbi-section-table-row cbi-rowstyle-1"> <tr class="cbi-section-table-row cbi-rowstyle-1">
<td class="cbi-value-field" id="v4dst"><%=defroutev4.dest%></td> <td class="cbi-value-field" id="v4dst"><%=def4.dest%></td>
<td class="cbi-value-field" id="v4dev"><%=defroutev4.device%></td> <td class="cbi-value-field" id="v4dev"><%=def4.dev%></td>
<td class="cbi-value-field" id="v4gw"><%=defroutev4.gateway%></td> <td class="cbi-value-field" id="v4gw"><%=def4.gateway%></td>
<td class="cbi-value-field" id="v4metr"><%=defroutev4.metric%></td> <td class="cbi-value-field" id="v4metr"><%=def4.metr%></td>
</tr> </tr>
<% end <% end
if defroutev6 then %> if def6 then %>
<tr class="cbi-section-table-row cbi-rowstyle-2"> <tr class="cbi-section-table-row cbi-rowstyle-2">
<td class="cbi-value-field" id="v6dst"><%=defroutev6.dest%></td> <td class="cbi-value-field" id="v6dst"><%=def6.dest%></td>
<td class="cbi-value-field" id="v6dev"><%=defroutev6.device%></td> <td class="cbi-value-field" id="v6dev"><%=def6.dev%></td>
<td class="cbi-value-field" id="v6gw"><%=defroutev6.nexthop%></td> <td class="cbi-value-field" id="v6gw"><%=def6.gateway%></td>
<td class="cbi-value-field" id="v6metr"><%=defroutev6.metric%></td> <td class="cbi-value-field" id="v6metr"><%=def6.metr%></td>
</tr> </tr>
<% end %> <% end %>