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

applications/luci-radvd: fix various issues

Browse source
This commit is contained in:
Jo-Philipp Wich 2011-05-04 08:55:57 +00:00
parent 65a7a7121c
commit 97e49204f8
2 changed files with 8 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
applications/luci-radvd/luasrc/model/cbi/radvd.lua
View file

@ -132,13 +132,13 @@ o = s2:option(DummyValue, "interface", translate("Interface"))
o.template = "cbi/network_netinfo" o.template = "cbi/network_netinfo"
o.width = "10%" o.width = "10%"
o = s2:option(DummyValue, "prefix", translate("Prefix")) pfx = s2:option(DummyValue, "prefix", translate("Prefix"))
o.width = "60%" pfx.width = "60%"
function o.cfgvalue(self, section) function pfx.cfgvalue(self, section)
local v = m.uci:get_list("radvd", section, "prefix") local v = m.uci:get_list("radvd", section, self.option)
local l = { } local l = { }
if not v then if not v or #v == 0 or (#v == 1 and #v[1] == 0) then
local net = nm:get_network(m.uci:get("radvd", section, "interface")) local net = nm:get_network(m.uci:get("radvd", section, "interface"))
if net then if net then
local ifc = nm:get_interface(net:ifname()) local ifc = nm:get_interface(net:ifname())
@ -220,24 +220,7 @@ o.width = "10%"
o = s3:option(DummyValue, "prefix", translate("Prefix")) o = s3:option(DummyValue, "prefix", translate("Prefix"))
o.width = "60%" o.width = "60%"
function o.cfgvalue(self, section) o.cfgvalue = pfx.cfgvalue
local v = m.uci:get_list("radvd", section, "prefix")
local l = { }
if v then
for v in ut.imatch(v) do
v = luci.ip.IPv6(v)
if v then
l[#l+1] = v:string()
end
end
end
if #l == 0 then
l[1] = "?"
end
return table.concat(l, ", ")
end
o = s3:option(DummyValue, "AdvRouteLifetime", translate("Lifetime")) o = s3:option(DummyValue, "AdvRouteLifetime", translate("Lifetime"))
function o.cfgvalue(self, section) function o.cfgvalue(self, section)
@ -285,38 +268,7 @@ o.width = "10%"
o = s4:option(DummyValue, "addr", translate("Address")) o = s4:option(DummyValue, "addr", translate("Address"))
o.width = "60%" o.width = "60%"
function o.cfgvalue(self, section) o.cfgvalue = pfx.cfgvalue
local v = m.uci:get_list("radvd", section, "addr")
local l = { }
if not v then
local net = nm:get_network(m.uci:get("radvd", section, "interface"))
if net then
local ifc = nm:get_interface(net:ifname())
if ifc then
local adr
for _, adr in ipairs(ifc:ip6addrs()) do
if not adr:is6linklocal() then
v = adr:network(128):string()
break
end
end
end
end
end
for v in ut.imatch(v) do
v = luci.ip.IPv6(v)
if v then
l[#l+1] = v:network(128):string()
end
end
if #l == 0 then
l[1] = "?"
end
return table.concat(l, ", ")
end
o = s4:option(DummyValue, "AdvRDNSSLifetime", translate("Lifetime")) o = s4:option(DummyValue, "AdvRDNSSLifetime", translate("Lifetime"))
function o.cfgvalue(self, section) function o.cfgvalue(self, section)

2
applications/luci-radvd/luasrc/model/cbi/radvd/rdnss.lua
View file

@ -82,7 +82,7 @@ o.datatype = "ip6addr"
o.placeholder = translate("default") o.placeholder = translate("default")
function o.cfgvalue(self, section) function o.cfgvalue(self, section)
local l = { } local l = { }
local v = m.uci:get_list("radvd", section, "prefix") local v = m.uci:get_list("radvd", section, "addr")
for v in utl.imatch(v) do for v in utl.imatch(v) do
l[#l+1] = v l[#l+1] = v
end end