Changeset 7115

Timestamp:

06/10/11 15:15:10 (2 years ago)

Author:

jow

Message:

modules/admin-full: add AHCP client support

Files:

• luci/trunk/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua (modified) (5 diffs)

luci/trunk/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua

@@ -34 +34 @@
 local has_6to4   = fs.access("/lib/network/6to4.sh")
 local has_relay  = fs.access("/lib/network/relay.sh")
+local has_ahcp   = fs.access("/lib/network/ahcp.sh")
 
 m = Map("network", translate("Interfaces") .. " - " .. arg[1]:upper(), translate("On this page you can configure the network interfaces. You can bridge several interfaces by ticking the \"bridge interfaces\" field and enter the names of several network interfaces separated by spaces. You can also use <abbr title=\"Virtual Local Area Network\">VLAN</abbr> notation <samp>INTERFACE.VLANNR</samp> (<abbr title=\"for example\">e.g.</abbr>: <samp>eth0.1</samp>)."))
@@ -69 +70 @@
 if has_6in4 or has_6to4 then s:tab("tunnel", translate("Tunnel Settings")) end
 if has_relay then s:tab("relay", translate("Relay Settings")) end
+if has_ahcp then s:tab("ahcp", translate("AHCP Settings")) end
 s:tab("physical", translate("Physical Settings"))
 if has_firewall then s:tab("firewall", translate("Firewall Settings")) end
@@ -95 +97 @@
 if has_6to4  then p:value("6to4",  "6to4")    end
 if has_relay then p:value("relay", "Relay")   end
+if has_ahcp  then p:value("ahcp",  "AHCP")    end
 p:value("none", translate("none"))
 
@@ -123 +126 @@
 ifname_single:depends({ type = "", proto = "pppoe"  })
 ifname_single:depends({ type = "", proto = "pppoa"  })
+ifname_single:depends({ type = "", proto = "ahcp"   })
 ifname_single:depends({ type = "", proto = "none"   })
 
@@ -542 +546 @@
 end
 
+if has_ahcp then
+    mca = s:taboption("ahcp", Value, "multicast_address", translate("Multicast address"))
+    mca.optional    = true
+    mca.placeholder = "ff02::cca6:c0f9:e182:5359"
+    mca.datatype    = "ip6addr"
+    mca:depends("proto", "ahcp")
+
+    port = s:taboption("ahcp", Value, "port", translate("Port"))
+    port.optional    = true
+    port.placeholder = 5359
+    port.datatype    = "port"
+    port:depends("proto", "ahcp")
+
+    fam = s:taboption("ahcp", ListValue, "_family", translate("Protocol family"))
+    fam:value("", translate("IPv4 and IPv6"))
+    fam:value("ipv4", translate("IPv4 only"))
+    fam:value("ipv6", translate("IPv6 only"))
+    fam:depends("proto", "ahcp")
+
+    function fam.cfgvalue(self, section)
+        local v4 = m.uci:get_bool("network", section, "ipv4_only")
+        local v6 = m.uci:get_bool("network", section, "ipv6_only")
+        if v4 then
+            return "ipv4"
+        elseif v6 then
+            return "ipv6"
+        end
+        return ""
+    end
+
+    function fam.write(self, section, value)
+        if value == "ipv4" then
+            m.uci:set("network", section, "ipv4_only", "true")
+            m.uci:delete("network", section, "ipv6_only")
+        elseif value == "ipv6" then
+            m.uci:set("network", section, "ipv6_only", "true")
+            m.uci:delete("network", section, "ipv4_only")
+        end
+    end
+
+    function fam.remove(self, section)
+        m.uci:delete("network", section, "ipv4_only")
+        m.uci:delete("network", section, "ipv6_only")
+    end
+
+    nodns = s:taboption("ahcp", Flag, "no_dns", translate("Disable DNS setup"))
+    nodns.optional = true
+    nodns.enabled  = "true"
+    nodns.disabled = "false"
+    nodns.default  = nodns.disabled
+    nodns:depends("proto", "ahcp")
+
+    ltime = s:taboption("ahcp", Value, "lease_time", translate("Lease validity time"))
+    ltime.optional    = true
+    ltime.placeholder = 3666
+    ltime.datatype    = "uinteger"
+    ltime:depends("proto", "ahcp")
+end
 
 if net:proto() ~= "relay" then