Fixed an overflow error with IPv6 route metric
authorSteven Barth <steven@midlink.org>
Wed, 10 Dec 2008 21:45:29 +0000 (21:45 +0000)
committerSteven Barth <steven@midlink.org>
Wed, 10 Dec 2008 21:45:29 +0000 (21:45 +0000)
modules/admin-full/luasrc/model/cbi/admin_network/routes.lua

index be6629774fda4f9b830be0180db6757bf724014f..4767e07d5db832ad0f23ca9323385ffa47e755a5 100644 (file)
@@ -15,6 +15,7 @@ require("luci.tools.webadmin")
 m = Map("network", translate("a_n_routes"), translate("a_n_routes1"))
 
 local routes6 = luci.sys.net.routes6()
+local bit = require "bit"
 
 if not arg or not arg[1] then
        local routes = luci.sys.net.routes()
@@ -68,7 +69,10 @@ if not arg or not arg[1] then
 
                metric = v:option(DummyValue, "metric", translate("metric"))
                function metric.cfgvalue(self, section)
-                       return string.format( "%08X", 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