Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

modules/admin-full: whitesapce cleanup in routes.lua

Browse source 
libs/sys:		code changes in routes6() and defaultroute6()
This commit is contained in:
Jo-Philipp Wich 2008-11-30 19:12:58 +00:00
parent cd8e12d72a
commit 46bb17c2d2
2 changed files with 52 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libs/sys/luasrc/sys.lua
View file

@ -321,14 +321,15 @@ end
function net.defaultroute6() function net.defaultroute6()
local route = nil local route = nil
local routes6 = net.routes6() local routes6 = net.routes6()
if not routes6 then if routes6 then
return nil
end
for _, r in pairs(routes6) do for _, r in pairs(routes6) do
if r.dest:prefix() == 0 and (not route or route.metric > r.metric) then if r.dest:prefix() == 0 and
(not route or route.metric > r.metric)
then
route = r route = r
end end
end end
end
return route return route
end end
@ -419,12 +420,9 @@ end
-- { "source", "dest", "nexthop", "metric", "refcount", "usecount", -- { "source", "dest", "nexthop", "metric", "refcount", "usecount",
-- "flags", "device" } -- "flags", "device" }
function net.routes6() function net.routes6()
if luci.fs.access("/proc/net/ipv6_route", "r") then
local routes = { } local routes = { }
if not luci.fs.access("/proc/net/ipv6_route", "r") then
return nil
end
for line in io.lines("/proc/net/ipv6_route") do for line in io.lines("/proc/net/ipv6_route") do
local dst_ip, dst_prefix, src_ip, src_prefix, nexthop, local dst_ip, dst_prefix, src_ip, src_prefix, nexthop,
@ -460,6 +458,7 @@ function net.routes6()
return routes return routes
end end
end
--- Tests whether the given host responds to ping probes. --- Tests whether the given host responds to ping probes.
-- @param host String containing a hostname or IPv4 address -- @param host String containing a hostname or IPv4 address

7
modules/admin-full/luasrc/model/cbi/admin_network/routes.lua
View file

@ -42,7 +42,10 @@ if not arg or not arg[1] then
return routes[section].gateway:string() return routes[section].gateway:string()
end end
metric = v:option(DummyValue, "Metric", translate("metric")) metric = v:option(DummyValue, "metric", translate("metric"))
function metric.cfgvalue(self, section)
return routes[section].metric
end
if routes6 then if routes6 then
v = m:section(Table, routes6, translate("a_n_routes_kernel6")) v = m:section(Table, routes6, translate("a_n_routes_kernel6"))
@ -63,7 +66,7 @@ if not arg or not arg[1] then
return routes6[section].source:string() return routes6[section].source:string()
end end
metric = v:option(DummyValue, "Metric", translate("metric")) metric = v:option(DummyValue, "metric", translate("metric"))
function metric.cfgvalue(self, section) function metric.cfgvalue(self, section)
return string.format( "%08X", routes6[section].metric ) return string.format( "%08X", routes6[section].metric )
end end