Copyright 2008 Steven Barth <steven@midlink.org>
Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
-
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
if luci.http.formvalue("status") == "1" then
local rv = {}
for k, link in ipairs(links) do
- link.Cost = tonumber(link.Cost) or 0
- local color = olsrtools.etx_color(link.Cost)
+ link.linkCost = tonumber(link.linkCost)/1024 or 0
+ if link.linkCost == 4096 then
+ link.linkCost = 0
+ end
+ local color = olsrtools.etx_color(link.linkCost)
+ local snr_color = olsrtools.snr_color(link.snr)
defaultgw_color = ""
if link.defaultgw == 1 then
defaultgw_color = "#ffff99"
end
rv[#rv+1] = {
- rip = link["Remote IP"],
- hn = link["Hostname"],
- lip = link["Local IP"],
- dev = link["Local Device"],
- lq = link.LQ,
- nlq = link.NLQ,
- cost = string.format("%.3f", link.Cost),
+ rip = link.remoteIP,
+ hn = link.hostname,
+ lip = link.localIP,
+ ifn = link.interface,
+ lq = string.format("%.3f", link.linkQuality),
+ nlq = string.format("%.3f",link.neighborLinkQuality),
+ cost = string.format("%.3f", link.linkCost),
+ snr = link.snr,
+ signal = link.signal,
+ noise = link.noise,
color = color,
- dfgcolor = defaultgw_color
+ snr_color = snr_color,
+ dfgcolor = defaultgw_color,
+ proto = link.proto
}
end
luci.http.prepare_content("application/json")
{
var neigh = info[idx];
- s += String.format(
- '<tr class="cbi-section-table-row cbi-rowstyle-'+(1 + (idx % 2))+'">' +
- '<td class="cbi-section-table-cell" style="background-color:%s"><a href="http://%s/cgi-bin-status.html">%s</a></td>',
- neigh.dfgcolor, neigh.rip, neigh.rip
+ if (neigh.proto == '6') {
+ s += String.format(
+ '<tr class="cbi-section-table-row cbi-rowstyle-'+(1 + (idx % 2))+' proto-%s">' +
+ '<td class="cbi-section-table-titles" style="background-color:%s"><a href="http://[%s]/cgi-bin-status.html">%s</a></td>',
+ neigh.proto, neigh.dfgcolor, neigh.rip, neigh.rip
);
+ } else {
+ s += String.format(
+ '<tr class="cbi-section-table-row cbi-rowstyle-'+(1 + (idx % 2))+' proto-%s">' +
+ '<td class="cbi-section-table-titles" style="background-color:%s"><a href="http://%s/cgi-bin-status.html">%s</a></td>',
+ neigh.proto, neigh.dfgcolor, neigh.rip, neigh.rip
+ );
+ }
if (neigh.hn) {
- s += String.format(
- '<td class="cbi-section-table-
cell" style="background-color:%s"><a href="http://%s/cgi-bin-status.html">%s</a></td>',
+ s += String.format(
+ '<td class="cbi-section-table-
titles" style="background-color:%s"><a href="http://%s/cgi-bin-status.html">%s</a></td>',
neigh.dfgcolor, neigh.hn, neigh.hn
- );
- }
- else {
+ );
+ } else {
s += String.format(
- '<td class="cbi-section-table-cell" style="background-color:%s">?</td>',
+ '<td class="cbi-section-table-titles" style="background-color:%s">?</td>',
neigh.dfgcolor
- );
- }
+ );
+ }
s += String.format(
- '<td class="cbi-section-table-cell" style="background-color:%s">%s</td>' +
- '<td class="cbi-section-table-cell" style="background-color:%s">%s</td>' +
- '<td class="cbi-section-table-cell" style="background-color:%s">%s</td>' +
- '<td class="cbi-section-table-cell" style="background-color:%s">%s</td>' +
- '<td class="cbi-section-table-cell" style="background-color:%s">%s</td>' +
+ '<td class="cbi-section-table-titles" style="background-color:%s">%s</td>' +
+ '<td class="cbi-section-table-titles" style="background-color:%s">%s</td>' +
+ '<td class="cbi-section-table-titles" style="background-color:%s">%s</td>' +
+ '<td class="cbi-section-table-titles" style="background-color:%s">%s</td>' +
+ '<td class="cbi-section-table-titles" style="background-color:%s">%s</td>' +
+ '<td class="cbi-section-table-titles" style="background-color:%s" title="Signal: %s Noise: %s">%s</td>' +
'</tr>',
-
- neigh.dfgcolor, neigh.lip, neigh.dfgcolor, neigh.dev, neigh.dfgcolor, neigh.lq, neigh.dfgcolor, neigh.nlq, neigh.color, neigh.cost || '?'
- );
+ neigh.dfgcolor, neigh.ifn, neigh.dfgcolor, neigh.lip, neigh.dfgcolor, neigh.lq, neigh.dfgcolor, neigh.nlq, neigh.color, neigh.cost, neigh.snr_color, neigh.signal, neigh.noise, neigh.snr || '?'
+ );
}
nt.innerHTML = s;
<h2><a id="content" name="content"><%:OLSR connections%></a></h2>
+<div id="togglebuttons"></div>
+
<fieldset class="cbi-section">
<legend><%:Overview of currently established OLSR connections%></legend>
<tr class="cbi-section-table-titles">
<th class="cbi-section-table-cell"><%:Neighbour IP%></th>
<th class="cbi-section-table-cell"><%:Hostname%></th>
+ <th class="cbi-section-table-cell"><%:Interface%></th>
<th class="cbi-section-table-cell"><%:Local interface IP%></th>
- <th class="cbi-section-table-cell"><%:Device%></th>
<th class="cbi-section-table-cell">LQ</th>
<th class="cbi-section-table-cell">NLQ</th>
<th class="cbi-section-table-cell">ETX</th>
+ <th class="cbi-section-table-cell">SNR</th>
</tr>
</thead>
<tbody id="olsr_neigh_table">
<% local i = 1
for k, link in ipairs(links) do
- link.Cost = tonumber(link.Cost) or 0
- color = olsrtools.etx_color(link.Cost)
+ link.linkCost = tonumber(link.linkCost)/1024 or 0
+ if link.linkCost == 4096 then
+ link.linkCost = 0
+ end
+
+ color = olsrtools.etx_color(link.linkCost)
+ snr_color = olsrtools.snr_color(link.snr)
+
+ if link.snr == 0 then
+ link.snr = '?'
+ end
defaultgw_color = ""
if link.defaultgw == 1 then
end
%>
- <tr class="cbi-section-table-row cbi-rowstyle-<%=i%>">
- <td class="cbi-section-table-cell" style="background-color:<%=defaultgw_color%>"><a href="http://<%=link["Remote IP"]%>/cgi-bin-status.html"><%=link["Remote IP"]%></a></td>
- <td class="cbi-section-table-cell" style="background-color:<%=defaultgw_color%>"><a href="http://<%=link["Hostname"]%>/cgi-bin-status.html"><%=link["Hostname"]%></a></td>
- <td class="cbi-section-table-cell" style="background-color:<%=defaultgw_color%>"><%=link["Local IP"]%></td>
- <td class="cbi-section-table-cell" style="background-color:<%=defaultgw_color%>"><%=link["Local Device"]%></td>
- <td class="cbi-section-table-cell" style="background-color:<%=defaultgw_color%>"><%=link.LQ%></td>
- <td class="cbi-section-table-cell" style="background-color:<%=defaultgw_color%>"><%=link.NLQ%></td>
- <td class="cbi-section-table-cell" style="background-color:<%=color%>"><%=string.format("%.3f", link.Cost)%></td>
+ <tr class="cbi-section-table-row cbi-rowstyle-<%=i%> proto-<%=link.proto%>">
+ <% if link.proto == "6" then %>
+ <td class="cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><a href="http://[<%=link.remoteIP%>]/cgi-bin-status.html"><%=link.remoteIP%></a></td>
+ <% else %>
+ <td class="cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><a href="http://<%=link.remoteIP%>/cgi-bin-status.html"><%=link.remoteIP%></a></td>
+ <% end %>
+ <td class="cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><a href="http://<%=link.hostname%>/cgi-bin-status.html"><%=link.hostname%></a></td>
+ <td class="cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><%=link.interface%></td>
+ <td class="cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><%=link.localIP%></td>
+ <td class="cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><%=string.format("%.3f", link.linkQuality)%></td>
+ <td class="cbi-section-table-titles" style="background-color:<%=defaultgw_color%>"><%=string.format("%.3f", link.neighborLinkQuality)%></td>
+ <td class="cbi-section-table-titles" style="background-color:<%=color%>"><%=string.format("%.3f", link.linkCost)%></td>
+ <td class="cbi-section-table-titles" style="background-color:<%=snr_color%>" title="Signal: <%=link.signal%> Noise: <%=link.noise%>"><%=link.snr%></td>
</tr>
<%
i = ((i % 2) + 1)
</table>
<br />
-<h3><%:Legend%>:</h3>
-<ul>
- <li><strong>LQ: </strong><%:Success rate of packages received from the neighbour%></li>
- <li><strong>NLQ: </strong><%:Success rate of packages sent to the neighbour%></li>
- <li><strong>ETX: </strong><%:Expected retransmission count%></li>
-</ul>
+<%+status-olsr/legend%>
</fieldset>
+<%+status-olsr/common_js%>
<%+footer%>
projects / project / luci.git / blobdiff