Changeset 6808

Timestamp:

01/29/11 05:27:37 (2 years ago)

Author:

jow

Message:

applications/luci-radvd: sync with OpenWrt? trunk changes

Location:

luci/trunk/applications/luci-radvd/luasrc

Files:

• controller/radvd.lua (modified) (1 diff)
• model/cbi/radvd.lua (modified) (8 diffs)
• model/cbi/radvd/interface.lua (modified) (2 diffs)
• model/cbi/radvd/prefix.lua (modified) (2 diffs)
• model/cbi/radvd/rdnss.lua (modified) (2 diffs)
• model/cbi/radvd/route.lua (modified) (2 diffs)

luci/trunk/applications/luci-radvd/luasrc/controller/radvd.lua

@@ -25 +25 @@
     entry({"admin", "network", "radvd", "route"}, cbi("radvd/route"), nil).leaf = true
     entry({"admin", "network", "radvd", "rdnss"}, cbi("radvd/rdnss"), nil).leaf = true
+    entry({"admin", "network", "radvd", "dnssl"}, cbi("radvd/dnssl"), nil).leaf = true
 end

luci/trunk/applications/luci-radvd/luasrc/model/cbi/radvd.lua

@@ -19 +19 @@
 
 local nm = require "luci.model.network".init(m.uci)
+local ut = require "luci.util"
 
 
@@ -70 +71 @@
 
 o = s:option(DummyValue, "UnicastOnly", translate("Multicast"))
-function o.cfgvalue(...)
-    local v = Value.cfgvalue(...)
-    return v == "1" and translate("no") or translate("yes")
+function o.cfgvalue(self, section)
+    local v  = Value.cfgvalue(self, section)
+    local v2 = m.uci:get("radvd", section, "client")
+    return (v == "1" or (v2 and #v2 > 0)) and translate("no") or translate("yes")
 end
 
@@ -134 +136 @@
 o.width = "60%"
 function o.cfgvalue(self, section)
-    local v = Value.cfgvalue(self, section)
+    local v = m.uci:get_list("radvd", section, "prefix")
+    local l = { }
+
     if not v then
         local net = nm:get_network(m.uci:get("radvd", section, "interface"))
@@ -150 +154 @@
             end
         end
-    else
+    end
+
+    for v in ut.imatch(v) do
         v = luci.ip.IPv6(v)
-        v = v and v:string()
-    end
-
-    return v or "?"
+        if v then
+            l[#l+1] = v:string()
+        end
+    end
+
+    if #l == 0 then
+        l[1] = "?"
+    end
+
+    return table.concat(l, ", ")
 end
 
@@ -211 +223 @@
 o.width = "60%"
 function o.cfgvalue(self, section)
-    local v = Value.cfgvalue(self, section)
+    local v = m.uci:get_list("radvd", section, "prefix")
+    local l = { }
     if v then
-        v = luci.ip.IPv6(v)
-        v = v and v:string()
-    end
-    return v or "?"
+        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
 
@@ -266 +288 @@
 o.width = "60%"
 function o.cfgvalue(self, section)
-    local v = Value.cfgvalue(self, section)
+    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"))
@@ -282 +305 @@
             end
         end
-    else
+    end
+
+    for v in ut.imatch(v) do
         v = luci.ip.IPv6(v)
-        v = v and v:network(128):string()
-    end
-
-    return v or "?"
-end
-
-o = s4:option(DummyValue, "AdvRDNSSOpen", translate("Open"))
-function o.cfgvalue(self, section)
-    local v = Value.cfgvalue(self, section)
-    return v == "1" and translate("yes") or translate("no")
+        if v then
+            l[#l+1] = v:network(128):string()
+        end
+    end
+
+    if #l == 0 then
+        l[1] = "?"
+    end
+
+    return table.concat(l, ", ")
 end
 
@@ -303 +328 @@
 
 
+--
+-- DNSSL
+--
+
+s4 = m:section(TypedSection, "dnssl", translate("DNSSL"))
+s4.template = "cbi/tblsection"
+s4.extedit  = luci.dispatcher.build_url("admin/network/radvd/dnssl/%s")
+s4.addremove = true
+s4.anonymous = true
+
+function s.create(...)
+    local id = TypedSection.create(...)
+    luci.http.redirect(s4.extedit % id)
+end
+
+
+o = s4:option(Flag, "ignore", translate("Enable"))
+o.rmempty = false
+o.width   = "30px"
+function o.cfgvalue(...)
+    local v = Flag.cfgvalue(...)
+    return v == "1" and "0" or "1"
+end
+function o.write(self, section, value)
+    Flag.write(self, section, value == "1" and "0" or "1")
+end
+
+o = s4:option(DummyValue, "interface", translate("Interface"))
+o.template = "cbi/network_netinfo"
+o.width    = "10%"
+
+o = s4:option(DummyValue, "suffix", translate("Suffix"))
+o.width = "60%"
+function o.cfgvalue(self, section)
+    local v = m.uci:get_list("radvd", section, "suffix")
+    local l = { }
+
+    for v in ut.imatch(v) do
+        l[#l+1] = v
+    end
+
+    if #l == 0 then
+        l[1] = "?"
+    end
+
+    return table.concat(l, ", ")
+end
+
+o = s4:option(DummyValue, "AdvDNSSLLifetime", translate("Lifetime"))
+function o.cfgvalue(self, section)
+    local v = Value.cfgvalue(self, section) or "1200"
+    return translate(v)
+end
+
+
 return m

luci/trunk/applications/luci-radvd/luasrc/model/cbi/radvd/interface.lua

@@ -14 +14 @@
 
 local sid = arg[1]
+local utl = require "luci.util"
 
 m = Map("radvd", translatef("Radvd - Interface %q", "?"),
@@ -85 +86 @@
 
 
+o = s:taboption("general", DynamicList, "client", translate("Clients"),
+    translate("Restrict communication to specified clients, leave empty to use multicast"))
+
+o.rmempty     = true
+o.datatype    = "ip6addr"
+o.placeholder = "any"
+function o.cfgvalue(...)
+    local v = Value.cfgvalue(...)
+    local l = { }
+    for v in utl.imatch(v) do
+        l[#l+1] = v
+    end
+    return l
+end
+
+
 o = s:taboption("general", Flag, "AdvSendAdvert", translate("Enable advertisements"),
     translate("Enables router advertisements and solicitations"))

luci/trunk/applications/luci-radvd/luasrc/model/cbi/radvd/prefix.lua

@@ -14 +14 @@
 
 local sid = arg[1]
+local utl = require "luci.util"
 
 m = Map("radvd", translatef("Radvd - Prefix"),
@@ -76 +77 @@
 
 
-o = s:taboption("general", Value, "prefix", translate("Prefix"),
-    translate("Advertised IPv6 prefix. If empty, the current interface prefix is used"))
+o = s:taboption("general", DynamicList, "prefix", translate("Prefixes"),
+    translate("Advertised IPv6 prefixes. If empty, the current interface prefix is used"))
 
-o.optional = true
-o.datatype = "ip6addr"
+o.optional    = true
+o.datatype    = "ip6addr"
+o.placeholder = translate("default")
+function o.cfgvalue(self, section)
+    local l = { }
+    local v = m.uci:get_list("radvd", section, "prefix")
+    for v in utl.imatch(v) do
+        l[#l+1] = v
+    end
+    return l
+end
 
 

luci/trunk/applications/luci-radvd/luasrc/model/cbi/radvd/rdnss.lua

@@ -14 +14 @@
 
 local sid = arg[1]
+local utl = require "luci.util"
 
 m = Map("radvd", translatef("Radvd - RDNSS"),
@@ -73 +74 @@
 
 
-o = s:option(Value, "addr", translate("Address"),
+o = s:option(DynamicList, "addr", translate("Addresses"),
     translate("Advertised IPv6 RDNSS. If empty, the current IPv6 address of the interface is used"))
 
-o.optional = false
-o.rmempty  = true
-o.datatype = "ip6addr"
-
-
-o = s:option(Flag, "AdvRDNSSOpen", translate("Open"),
-    translate("Indicates whether that RDNSS continues to be available to hosts even if they moved to a different subnet "))
+o.optional    = false
+o.rmempty     = true
+o.datatype    = "ip6addr"
+o.placeholder = translate("default")
+function o.cfgvalue(self, section)
+    local l = { }
+    local v = m.uci:get_list("radvd", section, "prefix")
+    for v in utl.imatch(v) do
+        l[#l+1] = v
+    end
+    return l
+end
 
 

luci/trunk/applications/luci-radvd/luasrc/model/cbi/radvd/route.lua

@@ -14 +14 @@
 
 local sid = arg[1]
+local utl = require "luci.util"
 
 m = Map("radvd", translatef("Radvd - Route"),
@@ -73 +74 @@
 
 
-o = s:option(Value, "prefix", translate("Prefix"),
-    translate("Advertised IPv6 prefix"))
+o = s:option(DynamicList, "prefix", translate("Prefixes"),
+    translate("Advertised IPv6 prefixes"))
 
-o.rmempty = false
-o.datatype = "ip6addr"
+o.rmempty     = false
+o.datatype    = "ip6addr"
+o.placeholder = translate("default")
+function o.cfgvalue(self, section)
+    local l = { }
+    local v = m.uci:get_list("radvd", section, "prefix")
+    for v in utl.imatch(v) do
+        l[#l+1] = v
+    end
+    return l
+end