summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorManuel Munz <freifunk@somakoma.de>2012-05-28 01:31:44 +0000
committerManuel Munz <freifunk@somakoma.de>2012-05-28 01:31:44 +0000
commitaf094a27e2888b7cd5c1d53c58c0f05479bf833e (patch)
tree80ed68f4160dc4597facf9dec9dd0183ef9ce488
parentb3e5467ec6d9782bd2c2fa64869bfab8c54dd8aa (diff)
applications/olsr: Device was not properly shown for ipv6 adresses which used the short form, this should take care of that issue
-rw-r--r--applications/luci-olsr/luasrc/controller/olsr.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/applications/luci-olsr/luasrc/controller/olsr.lua b/applications/luci-olsr/luasrc/controller/olsr.lua
index a47496b31a..371bad8707 100644
--- a/applications/luci-olsr/luasrc/controller/olsr.lua
+++ b/applications/luci-olsr/luasrc/controller/olsr.lua
@@ -336,8 +336,9 @@ function fetch_txtinfo(otable)
data[name][di]['Local Device'] = fields[k]
uci:foreach("network", "interface",
function(s)
- local localip = string.gsub(fields[k], ' ', '')
+ local localip = string.gsub(fields[k], ' ', ''):upper()
if s.ip6addr then
+ s.ip6addr = luci.ip.IPv6(s.ip6addr):string()
local ip6addr = string.gsub(s.ip6addr, '\/.*', '')
if ip6addr == localip then
data[name][di]['Local Device'] = s['.name'] or s.interface