diff options
| -rw-r--r-- | applications/luci-olsr/luasrc/controller/olsr.lua | 3 | ||||
| -rw-r--r-- | applications/luci-olsr/luasrc/view/status-olsr/index.htm | 3 | ||||
| -rw-r--r-- | applications/luci-olsr/luasrc/view/status-olsr/topology.htm | 6 |
3 files changed, 10 insertions, 2 deletions
diff --git a/applications/luci-olsr/luasrc/controller/olsr.lua b/applications/luci-olsr/luasrc/controller/olsr.lua index a00dc3c547..1eede44649 100644 --- a/applications/luci-olsr/luasrc/controller/olsr.lua +++ b/applications/luci-olsr/luasrc/controller/olsr.lua @@ -157,11 +157,12 @@ function fetch_txtinfo(otable) local lines = luci.util.split(tbl, "\n") local name = table.remove(lines, 1):sub(8) local keys = luci.util.split(table.remove(lines, 1), "\t") + local split = #keys - 1 data[name] = {} for j, line in ipairs(lines) do - local fields = luci.util.split(line, "\t") + local fields = luci.util.split(line, "\t", split) data[name][j] = {} for k, key in pairs(keys) do data[name][j][key] = fields[k] diff --git a/applications/luci-olsr/luasrc/view/status-olsr/index.htm b/applications/luci-olsr/luasrc/view/status-olsr/index.htm index dabacd15a7..70329e76be 100644 --- a/applications/luci-olsr/luasrc/view/status-olsr/index.htm +++ b/applications/luci-olsr/luasrc/view/status-olsr/index.htm @@ -11,6 +11,9 @@ <th>ETX</th> </tr> <% for k, link in ipairs(links) do + if link.Linkcost then + link.LinkQuality, link.NLQ, link.ETX = link.Linkcost:match("(.*)/(.*)\t(.*)") + end local color = "#bb3333" link.ETX = tonumber(link.ETX) diff --git a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm b/applications/luci-olsr/luasrc/view/status-olsr/topology.htm index 6ad9f5c673..7871e133e3 100644 --- a/applications/luci-olsr/luasrc/view/status-olsr/topology.htm +++ b/applications/luci-olsr/luasrc/view/status-olsr/topology.htm @@ -9,7 +9,11 @@ <th>ILQ</th> <th>ETX</th> </tr> -<% for k, route in ipairs(routes) do %> +<% for k, route in ipairs(routes) do + if route.Linkcost then + route.LQ, route.ILQ, route.ETX = route.Linkcost:match("(.*)/(.*)\t(.*)") + end +%> <tr> <td><a href="http://<%=route["Destination IP"]%>"><%=route["Destination IP"]%></a></td> <td><a href="http://<%=route["Last hop IP"]%>"><%=route["Last hop IP"]%></a></td> |