projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix display of v6 Routing metric on Freifunk status pages
[project/luci.git]
/
modules
/
freifunk
/
luasrc
/
model
/
cbi
/
freifunk
/
public_status.lua
diff --git
a/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua
b/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua
index
016a0b7
..
14e6d56
100644
(file)
--- a/
modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua
+++ b/
modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua
@@
-1,6
+1,7
@@
require "luci.sys"
require "luci.tools.webadmin"
require "luci.sys"
require "luci.tools.webadmin"
+local bit = require "bit"
local uci = luci.model.uci.cursor_state()
local ffzone = luci.tools.webadmin.firewall_find_zone("freifunk")
local uci = luci.model.uci.cursor_state()
local ffzone = luci.tools.webadmin.firewall_find_zone("freifunk")
@@
-202,7
+203,10
@@
if #routes6 > 0 then
metric = v6:option(DummyValue, "metric", translate("metric"))
function metric.cfgvalue(self, section)
metric = v6:option(DummyValue, "metric", translate("metric"))
function metric.cfgvalue(self, section)
- return string.format("%X", routes6[section].metric)
+ local metr = routes6[section].metric
+ local lower = bit.band(metr, 0xffff)
+ local higher = bit.rshift(bit.band(metr, 0xffff0000), 16)
+ return "%04X%04X" % {higher, lower}
end
end
end
end