From: Steven Barth <steven@midlink.org>
Date: Wed, 10 Dec 2008 21:45:29 +0000 (+0000)
Subject: Fixed an overflow error with IPv6 route metric
X-Git-Tag: 0.9.0~909
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5412893954dd557c17d38971e010baf1f7528ce4;p=oweals%2Fluci.git

Fixed an overflow error with IPv6 route metric
---

diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua b/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
index be6629774..4767e07d5 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
@@ -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