* luci/app-olsr: fix olsr status pages

diff --git a/applications/luci-olsr/luasrc/controller/olsr.lua b/applications/luci-olsr/luasrc/controller/olsr.lua
index c0a7f5fe6b1f03c87d96a61f7000143c7ec01cdc..c80a75cc1ec18a4fd48233f9bcfb41510a12ab53 100644 (file)
--- a/applications/luci-olsr/luasrc/controller/olsr.lua
+++ b/applications/luci-olsr/luasrc/controller/olsr.lua
@@ -72,8 +72,8 @@ function action_index()
        end
 
        local function compare(a, b)
-               local c = tonumber(a.ETX)
-               local d = tonumber(b.ETX)
+               local c = tonumber(a.Cost)
+               local d = tonumber(b.Cost)
 
                if not c or c == 0 then
                        return false
@@ -128,7 +128,7 @@ function action_topology()
        end
 
        local function compare(a, b)
-               return a["Destination IP"] < b["Destination IP"]
+               return a["Dest. IP"] < b["Dest. IP"]
        end
 
        table.sort(data.Topology, compare)
@@ -145,7 +145,7 @@ function action_hna()
        end
 
        local function compare(a, b)
-               return a.Network < b.Network
+               return a.Destination < b.Destination
        end
 
        table.sort(data.HNA, compare)
@@ -162,7 +162,7 @@ function action_mid()
        end
 
        local function compare(a, b)
-               return a.IP < b.IP
+               return a["IP address"] < b["IP address"]
        end
 
        table.sort(data.MID, compare)

diff --git a/applications/luci-olsr/luasrc/view/status-olsr/hna.htm b/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
index 35dec2d8e34c9e1204a0da040a0bee781f4f4f5f..e15a235f9526f3d46c3b8fa8f790672bb23980cd 100644 (file)
--- a/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/hna.htm
@@ -22,7 +22,7 @@ $Id$
 </tr>
 <% for k, route in ipairs(routes) do %>
 <tr>
-<td><%=route.Network%>/<%=route.Netmask%></td>
+<td><%=route.Destination%></td>
 <td><a href="http://<%=route.Gateway%>"><%=route.Gateway%></a></td>
 </tr>
 <% end %>

diff --git a/applications/luci-olsr/luasrc/view/status-olsr/index.htm b/applications/luci-olsr/luasrc/view/status-olsr/index.htm
index 035d6dd1e8db0a378bf60a6e63dd97ccb78934d5..037151d1da5ad70a4de744623b55b9d1fe08645e 100644 (file)
--- a/applications/luci-olsr/luasrc/view/status-olsr/index.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/index.htm
@@ -27,23 +27,23 @@ $Id$
 <% for k, link in ipairs(links) do 
        local color = "#bb3333"
        
-       link.ETX = tonumber(link.ETX) or 0
-       if link.ETX == 0 then
+       link.Cost = tonumber(link.Cost) or 0
+       if link.Cost == 0 then
                color = "#bb3333"
-       elseif link.ETX < 4 then
+       elseif link.Cost < 4 then
                color = "#00cc00"
-       elseif link.ETX < 10 then
+       elseif link.Cost < 10 then
                color = "#ffcb05"
-       elseif link.ETX < 100 then
+       elseif link.Cost < 100 then
                color = "#ff6600"
        end
 %>
 <tr>
-<td><a href="http://<%=link["remote IP"]%>"><%=link["remote IP"]%></a></td>
+<td><a href="http://<%=link["Remote IP"]%>"><%=link["Remote IP"]%></a></td>
 <td><%=link["Local IP"]%></td>
-<td><%=link.LinkQuality%></td>
+<td><%=link.LQ%></td>
 <td><%=link.NLQ%></td>
-<td style="background-color:<%=color%>"><%=string.format("%.3f", link.ETX)%></td>
+<td style="background-color:<%=color%>"><%=string.format("%.3f", link.Cost)%></td>
 </tr>
 <% end %>
 </table>

diff --git a/applications/luci-olsr/luasrc/view/status-olsr/mid.htm b/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
index d82ac924a6167ad532640e34fe36d4d71d8efe6c..0646bb5f605ec1778c0aa81e5aa852e13e1c2cca 100644 (file)
--- a/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/mid.htm
@@ -22,7 +22,7 @@ $Id$
 </tr>
 <% for k, mid in ipairs(mids) do %>
 <tr>
-<td><a href="http://<%=mid.IP%>"><%=mid.IP%></a></td>
+<td><a href="http://<%=mid["IP address"]%>"><%=mid["IP address"]%></a></td>
 <td><%=mid.Aliases%></td>
 </tr>
 <% end %>

diff --git a/applications/luci-olsr/luasrc/view/status-olsr/routes.htm b/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
index 253a771261d42b37d595f1b7b983992738a355b9..27d9670806445344be2823541907446a1621429b 100644 (file)
--- a/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/routes.htm
@@ -39,7 +39,7 @@ $Id$
 %>
 <tr>
 <td><%=route.Destination%></td>
-<td><%=route.Gateway%></td>
+<td><%=route["Gateway IP"]%></td>
 <td><%=route.Interface%></td>
 <td><%=route.Metric%></td>
 <td style="background-color:<%=color%>"><%=string.format("%.3f", tonumber(route.ETX) or 0)%></td>

diff --git a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm b/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
index c7bd93574a0abee064f07e649cef3d4de8dd8ef7..df10b78466abe1538ea18beb0b48e8fb0750e166 100644 (file)
--- a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
+++ b/applications/luci-olsr/luasrc/view/status-olsr/topology.htm
@@ -26,11 +26,11 @@ $Id$
 <% for k, route in ipairs(routes) do 
 %>
 <tr>
-<td><a href="http://<%=route["Destination IP"]%>"><%=route["Destination IP"]%></a></td>
+<td><a href="http://<%=route["Dest. IP"]%>"><%=route["Dest. IP"]%></a></td>
 <td><a href="http://<%=route["Last hop IP"]%>"><%=route["Last hop IP"]%></a></td>
 <td><%=route.LQ%></td>
-<td><%=route.ILQ%></td>
-<td><%=string.format("%.3f", tonumber(route.ETX) or 0)%></td>
+<td><%=route.NLQ%></td>
+<td><%=string.format("%.3f", tonumber(route.Cost) or 0)%></td>
 </tr>
 <% end %>
 </table>