luci-0.10: merge r7229 and r7230
[oweals/luci.git] / modules / admin-full / luasrc / model / cbi / admin_network / ifaces.lua
index 4dccbc22a3567ab28f9c2c52a376e3d7b419ccd6..3debf58baffa184f3678231825cbf6474e7e0f15 100644 (file)
@@ -2,7 +2,7 @@
 LuCI - Lua Configuration Interface
 
 Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@subsignal.org>
+Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,11 +14,16 @@ $Id$
 ]]--
 
 local fs = require "nixio.fs"
+local ut = require "luci.util"
 local nw = require "luci.model.network"
 local fw = require "luci.model.firewall"
 
 arg[1] = arg[1] or ""
 
+local has_dnsmasq  = fs.access("/etc/config/dhcp")
+local has_firewall = fs.access("/etc/config/firewall")
+local has_radvd    = fs.access("/etc/config/radvd")
+
 local has_3g     = fs.access("/usr/bin/gcom")
 local has_pptp   = fs.access("/usr/sbin/pptp")
 local has_pppd   = fs.access("/usr/sbin/pppd")
@@ -26,18 +31,34 @@ local has_pppoe  = fs.glob("/usr/lib/pppd/*/rp-pppoe.so")()
 local has_pppoa  = fs.glob("/usr/lib/pppd/*/pppoatm.so")()
 local has_ipv6   = fs.access("/proc/net/ipv6_route")
 local has_6in4   = fs.access("/lib/network/6in4.sh")
+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>)."))
-m:chain("firewall")
 m:chain("wireless")
 
+if has_firewall then
+       m:chain("firewall")
+end
+
+if has_radvd then
+       m:chain("radvd")
+end
+
 nw.init(m.uci)
 fw.init(m.uci)
 
---function m.on_commit(map)
---     nw.init(map.uci)
---     fw.init(map.uci)
---end
+
+local net = nw:get_network(arg[1])
+
+-- redirect to overview page if network does not exist anymore (e.g. after a revert)
+if not net then
+       luci.http.redirect(luci.dispatcher.build_url("admin/network/network"))
+       return
+end
+
+local ifc = net:get_interfaces()[1]
 
 s = m:section(NamedSection, arg[1], "interface", translate("Common Configuration"))
 s.addremove = false
@@ -46,9 +67,11 @@ s:tab("general", translate("General Setup"))
 if has_ipv6  then s:tab("ipv6", translate("IPv6 Setup")) end
 if has_pppd  then s:tab("ppp", translate("PPP Settings")) end
 if has_pppoa then s:tab("atm", translate("ATM Settings")) end
-if has_6in4  then s:tab("tunnel", translate("Tunnel Settings")) end
+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"))
-s:tab("firewall", translate("Firewall Settings"))
+if has_firewall then s:tab("firewall", translate("Firewall Settings")) end
 
 st = s:taboption("general", DummyValue, "__status", translate("Status"))
 st.template = "admin_network/iface_status"
@@ -71,6 +94,9 @@ if has_pppoa then p:value("pppoa", "PPPoA")   end
 if has_3g    then p:value("3g",    "UMTS/3G") end
 if has_pptp  then p:value("pptp",  "PPTP")    end
 if has_6in4  then p:value("6in4",  "6in4")    end
+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"))
 
 if not ( has_pppd and has_pppoe and has_pppoa and has_3g and has_pptp ) then
@@ -86,7 +112,7 @@ br:depends("proto", "none")
 
 stp = s:taboption("physical", Flag, "stp", translate("Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"),
        translate("Enables the Spanning Tree Protocol on this bridge"))
-stp:depends("type", "1")
+stp:depends("type", "bridge")
 stp.rmempty = true
 
 ifname_single = s:taboption("physical", Value, "ifname_single", translate("Interface"))
@@ -99,6 +125,7 @@ ifname_single:depends({ type = "", proto = "static" })
 ifname_single:depends({ type = "", proto = "dhcp"   })
 ifname_single:depends({ type = "", proto = "pppoe"  })
 ifname_single:depends({ type = "", proto = "pppoa"  })
+ifname_single:depends({ type = "", proto = "ahcp"   })
 ifname_single:depends({ type = "", proto = "none"   })
 
 function ifname_single.cfgvalue(self, s)
@@ -113,7 +140,7 @@ function ifname_single.write(self, s, val)
                        n:del_interface(i)
                end
 
-               for i in val:gmatch("%S+") do
+               for i in ut.imatch(val) do
                        n:add_interface(i)
 
                        -- if this is not a bridge, only assign first interface
@@ -124,57 +151,48 @@ function ifname_single.write(self, s, val)
        end
 end
 
-
-ifname_multi = s:taboption("physical", MultiValue, "ifname_multi", translate("Interface"))
+ifname_multi = s:taboption("physical", Value, "ifname_multi", translate("Interface"))
 ifname_multi.template = "cbi/network_ifacelist"
 ifname_multi.nobridges = true
 ifname_multi.network = arg[1]
 ifname_multi.widget = "checkbox"
-ifname_multi:depends("type", "1")
+ifname_multi:depends("type", "bridge")
 ifname_multi.cfgvalue = ifname_single.cfgvalue
 ifname_multi.write = ifname_single.write
 
 
-for _, d in ipairs(nw:get_interfaces()) do
-       if not d:is_bridge() then
-               ifname_single:value(d:name())
-               ifname_multi:value(d:name())
-       end
-end
-
-
-local fwd_to, fwd_from
+if has_firewall then
+       fwzone = s:taboption("firewall", Value, "_fwzone",
+               translate("Create / Assign firewall-zone"),
+               translate("Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."))
 
-fwzone = s:taboption("firewall", Value, "_fwzone",
-       translate("Create / Assign firewall-zone"),
-       translate("Choose the firewall zone you want to assign to this interface. Select <em>unspecified</em> to remove the interface from the associated zone or fill out the <em>create</em> field to define a new zone and attach the interface to it."))
+       fwzone.template = "cbi/firewall_zonelist"
+       fwzone.network = arg[1]
+       fwzone.rmempty = false
 
-fwzone.template = "cbi/firewall_zonelist"
-fwzone.network = arg[1]
-fwzone.rmempty = false
+       function fwzone.cfgvalue(self, section)
+               self.iface = section
+               local z = fw:get_zone_by_network(section)
+               return z and z:name()
+       end
 
-function fwzone.cfgvalue(self, section)
-       self.iface = section
-       local z = fw:get_zone_by_network(section)
-       return z and z:name()
-end
+       function fwzone.write(self, section, value)
+               local zone = fw:get_zone(value)
 
-function fwzone.write(self, section, value)
-       local zone = fw:get_zone(value)
+               if not zone and value == '-' then
+                       value = m:formvalue(self:cbid(section) .. ".newzone")
+                       if value and #value > 0 then
+                               zone = fw:add_zone(value)
+                       else
+                               fw:del_network(section)
+                       end
+               end
 
-       if not zone and value == '-' then
-               value = m:formvalue(self:cbid(section) .. ".newzone")
-               if value and #value > 0 then
-                       zone = fw:add_zone(value)
-               else
+               if zone then
                        fw:del_network(section)
+                       zone:add_network(section)
                end
        end
-
-       if zone then
-               fw:del_network(section)
-               zone:add_network(section)
-       end
 end
 
 ipaddr = s:taboption("general", Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
@@ -195,7 +213,7 @@ gw.optional = true
 gw.datatype = "ip4addr"
 gw:depends("proto", "static")
 
-bcast = s:taboption("general", Value, "bcast", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"))
+bcast = s:taboption("general", Value, "broadcast", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"))
 bcast.optional = true
 bcast.datatype = "ip4addr"
 bcast:depends("proto", "static")
@@ -211,6 +229,19 @@ if has_ipv6 then
        ip6gw.optional = true
        ip6gw.datatype = "ip6addr"
        ip6gw:depends("proto", "static")
+
+
+       ra = s:taboption("ipv6", Flag, "accept_ra", translate("Accept Router Advertisements"))
+       ra.default = m.uci:get("network", arg[1], "proto") == "dhcp" and ra.enabled or ra.disabled
+       ra:depends("proto", "static")
+       ra:depends("proto", "dhcp")
+       ra:depends("proto", "none")
+
+       rs = s:taboption("ipv6", Flag, "send_rs", translate("Send Router Solicitiations"))
+       rs.default = m.uci:get("network", arg[1], "proto") ~= "dhcp" and rs.enabled or rs.disabled
+       rs:depends("proto", "static")
+       rs:depends("proto", "dhcp")
+       rs:depends("proto", "none")
 end
 
 dns = s:taboption("general", DynamicList, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"),
@@ -220,34 +251,84 @@ dns = s:taboption("general", DynamicList, "dns", translate("<abbr title=\"Domain
 dns.optional = true
 dns.cast = "string"
 dns.datatype = "ipaddr"
-dns:depends("peerdns", "")
+dns:depends({ peerdns = "", proto = "static" })
+dns:depends({ peerdns = "", proto = "dhcp"   })
+dns:depends({ peerdns = "", proto = "pppoe"  })
+dns:depends({ peerdns = "", proto = "pppoa"  })
+dns:depends({ peerdns = "", proto = "none"   })
 
 mtu = s:taboption("physical", Value, "mtu", "MTU")
 mtu.optional = true
 mtu.datatype = "uinteger"
+mtu.placeholder = 1500
+mtu:depends("proto", "static")
+mtu:depends("proto", "dhcp")
+mtu:depends("proto", "pppoe")
+mtu:depends("proto", "pppoa")
+mtu:depends("proto", "6in4")
+mtu:depends("proto", "6to4")
+mtu:depends("proto", "none")
 
 srv = s:taboption("general", Value, "server", translate("<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"))
 srv:depends("proto", "pptp")
 srv.optional = false
-srv.datatype = "ip4addr"
+srv.datatype = "host"
 
 if has_6in4 then
        peer = s:taboption("general", Value, "peeraddr", translate("Server IPv4-Address"))
        peer.optional = false
        peer.datatype = "ip4addr"
        peer:depends("proto", "6in4")
+end
 
+if has_6in4 or has_6to4 then
        ttl = s:taboption("physical", Value, "ttl", translate("TTL"))
        ttl.default = "64"
        ttl.optional = true
        ttl.datatype = "uinteger"
        ttl:depends("proto", "6in4")
+       ttl:depends("proto", "6to4")
+end
+
+if has_6to4 then
+       advi = s:taboption("general", Value, "adv_interface", translate("Advertise IPv6 on network"))
+       advi.widget = "checkbox"
+       advi.exclude = arg[1]
+       advi.default = "lan"
+       advi.template = "cbi/network_netlist"
+       advi.nocreate = true
+       advi.nobridges = true
+       advi:depends("proto", "6to4")
+
+       advn = s:taboption("general", Value, "adv_subnet", translate("Advertised network ID"), translate("Allowed range is 1 to FFFF"))
+       advn.default = "1"
+       advn:depends("proto", "6to4")
+
+       function advn.write(self, section, value)
+               value = tonumber(value, 16) or 1
+
+               if value > 65535 then value = 65535
+               elseif value < 1 then value = 1 end
+
+               Value.write(self, section, "%X" % value)
+       end
+end
+
+if has_relay then
+       rnet = s:taboption("general", Value, "network", translate("Relay between networks"))
+       rnet.widget = "checkbox"
+       rnet.exclude = arg[1]
+       rnet.template = "cbi/network_netlist"
+       rnet.nocreate = true
+       rnet.nobridges = true
+       rnet:depends("proto", "relay")
 end
 
 mac = s:taboption("physical", Value, "macaddr", translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
 mac:depends("proto", "none")
 mac:depends("proto", "static")
 mac:depends("proto", "dhcp")
+mac.placeholder = ifc and ifc:mac():upper()
 
 if has_3g then
        service = s:taboption("general", ListValue, "service", translate("Service type"))
@@ -359,10 +440,7 @@ if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then
        defaultroute:depends("proto", "pppoe")
        defaultroute:depends("proto", "pptp")
        defaultroute:depends("proto", "3g")
-       defaultroute.rmempty = false
-       function defaultroute.cfgvalue(...)
-               return ( AbstractValue.cfgvalue(...) or '1' )
-       end
+       defaultroute.default = defaultroute.enabled
 
        peerdns = s:taboption("ppp", Flag, "peerdns",
         translate("Use peer DNS"),
@@ -373,10 +451,7 @@ if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then
        peerdns:depends("proto", "pppoe")
        peerdns:depends("proto", "pptp")
        peerdns:depends("proto", "3g")
-       peerdns.rmempty = false
-       function peerdns.cfgvalue(...)
-               return ( AbstractValue.cfgvalue(...) or '1' )
-       end
+       peerdns.default = peerdns.enabled
 
        if has_ipv6 then
                ipv6 = s:taboption("ppp", Flag, "ipv6", translate("Enable IPv6 on PPP link") )
@@ -427,136 +502,261 @@ if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then
        maxwait.datatype = "uinteger"
 end
 
-s2 = m:section(TypedSection, "alias", translate("IP-Aliases"))
-s2.addremove = true
+if has_relay then
+       fb = s:taboption("relay", Flag, "forward_bcast", translate("Forward broadcasts"))
+       fb.default = fb.enabled
+       fb:depends("proto", "relay")
+
+       fd = s:taboption("relay", Flag, "forward_dhcp", translate("Forward DHCP"))
+       fd.default = fd.enabled
+       fd:depends("proto", "relay")
+
+       gw = s:taboption("relay", Value, "relay_gateway", translate("Override Gateway"))
+       gw.optional    = true
+       gw.placeholder = "0.0.0.0"
+       gw.datatype    = "ip4addr"
+       gw:depends("proto", "relay")
+       function gw.cfgvalue(self, section)
+               return m.uci:get("network", section, "gateway")
+       end
+       function gw.write(self, section, value)
+               return m.uci:set("network", section, "gateway", value)
+       end
+       function gw.delete(self, section)
+               return m.uci:delete("network", section, "gateway")
+       end
+
+       expiry = s:taboption("relay", Value, "expiry", translate("Host expiry timeout"))
+       expiry.optional    = true
+       expiry.placeholder = 30
+       expiry.datatype    = "uinteger"
+       expiry:depends("proto", "relay")
+
+       retry = s:taboption("relay", Value, "retry", translate("ARP ping retries"))
+       retry.optional     = true
+       retry.placeholder  = 5
+       retry.datatype     = "uinteger"
+       retry:depends("proto", "relay")
+
+       table = s:taboption("relay", Value, "table", translate("Routing table ID"))
+       table.optional     = true
+       table.placeholder  = 16800
+       table.datatype     = "uinteger"
+       table:depends("proto", "relay")
+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
+       s2 = m:section(TypedSection, "alias", translate("IP-Aliases"))
+       s2.addremove = true
 
-s2:depends("interface", arg[1])
-s2.defaults.interface = arg[1]
+       s2:depends("interface", arg[1])
+       s2.defaults.interface = arg[1]
 
-s2:tab("general", translate("General Setup"))
-s2.defaults.proto = "static"
+       s2:tab("general", translate("General Setup"))
+       s2.defaults.proto = "static"
 
-ip = s2:taboption("general", Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
-ip.optional = true
-ip.datatype = "ip4addr"
+       ip = s2:taboption("general", Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
+       ip.optional = true
+       ip.datatype = "ip4addr"
 
-nm = s2:taboption("general", Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
-nm.optional = true
-nm.datatype = "ip4addr"
-nm:value("255.255.255.0")
-nm:value("255.255.0.0")
-nm:value("255.0.0.0")
+       nm = s2:taboption("general", Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
+       nm.optional = true
+       nm.datatype = "ip4addr"
+       nm:value("255.255.255.0")
+       nm:value("255.255.0.0")
+       nm:value("255.0.0.0")
 
-gw = s2:taboption("general", Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"))
-gw.optional = true
-gw.datatype = "ip4addr"
+       gw = s2:taboption("general", Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"))
+       gw.optional = true
+       gw.datatype = "ip4addr"
 
-if has_ipv6 then
-       s2:tab("ipv6", translate("IPv6 Setup"))
+       if has_ipv6 then
+               s2:tab("ipv6", translate("IPv6 Setup"))
 
-       ip6 = s2:taboption("ipv6", Value, "ip6addr", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"), translate("<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"))
-       ip6.optional = true
-       ip6.datatype = "ip6addr"
+               ip6 = s2:taboption("ipv6", Value, "ip6addr", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"), translate("<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"))
+               ip6.optional = true
+               ip6.datatype = "ip6addr"
 
-       gw6 = s2:taboption("ipv6", Value, "ip6gw", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"))
-       gw6.optional = true
-       gw6.datatype = "ip6addr"
+               gw6 = s2:taboption("ipv6", Value, "ip6gw", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"))
+               gw6.optional = true
+               gw6.datatype = "ip6addr"
+       end
+
+       s2:tab("advanced", translate("Advanced Settings"))
+
+       bcast = s2:taboption("advanced", Value, "bcast", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"))
+       bcast.optional = true
+       bcast.datatype = "ip4addr"
+
+       dns = s2:taboption("advanced", Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"))
+       dns.optional = true
+       dns.datatype = "ip4addr"
 end
 
-s2:tab("advanced", translate("Advanced Settings"))
 
-bcast = s2:taboption("advanced", Value, "bcast", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"))
-bcast.optional = true
-bcast.datatype = "ip4addr"
+--
+-- Display DNS settings if dnsmasq is available
+--
 
-dns = s2:taboption("advanced", Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"))
-dns.optional = true
-dns.datatype = "ip4addr"
+if has_dnsmasq and net:proto() == "static" then
+       m2 = Map("dhcp", "", "")
+       
+       local section_id = "-"
 
+       function m2.on_parse()
+               m2.uci:foreach("dhcp", "dhcp", function(s)
+                       if s.interface == arg[1] then
+                               section_id = s['.name']
+                               return false
+                       end
+               end)
+       end
 
-m2 = Map("dhcp", "", "")
-function m2.on_parse()
-       local has_section = false
+       s = m2:section(TypedSection, "dhcp", translate("DHCP Server"))
+       s.addremove = false
+       s.anonymous = true
+       s:tab("general",  translate("General Setup"))
+       s:tab("advanced", translate("Advanced Settings"))
 
-       m2.uci:foreach("dhcp", "dhcp", function(s)
-               if s.interface == arg[1] then
-                       has_section = true
-                       return false
-               end
-       end)
+       function s.cfgsections(self)
+               return { section_id }
+       end
 
-       if not has_section then
-               m2.uci:section("dhcp", "dhcp", nil, { interface = arg[1], ignore = "1" })
-               m2.uci:save("dhcp")
+       local ignore = s:taboption("general", Flag, "ignore",
+               translate("Ignore interface"),
+               translate("Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for " ..
+                       "this interface."))
+
+       ignore.rmempty = false
+
+       function ignore.cfgvalue(self, section)
+               return (section == "-") and self.enabled or Flag.cfgvalue(self, section)
        end
-end
 
-s = m2:section(TypedSection, "dhcp", translate("DHCP Server"))
-s.addremove = false
-s.anonymous = true
-s:tab("general",  translate("General Setup"))
-s:tab("advanced", translate("Advanced Settings"))
+       function ignore.write(self, section, value)
+               section_id = m2.uci:section("dhcp", "dhcp", nil, {
+                       ignore    = value,
+                       interface = arg[1]
+               })
+       end 
 
-function s.filter(self, section)
-       return m2.uci:get("dhcp", section, "interface") == arg[1]
-end
 
-local ignore = s:taboption("general", Flag, "ignore",
-       translate("Ignore interface"),
-       translate("Disable <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> for " ..
-               "this interface."))
-
-ignore.rmempty = false
-
-local start = s:taboption("general", Value, "start", translate("Start"),
-       translate("Lowest leased address as offset from the network address."))
-start.optional = true
-start.datatype = "uinteger"
-start.default = "100"
-
-local limit = s:taboption("general", Value, "limit", translate("Limit"),
-       translate("Maximum number of leased addresses."))
-limit.optional = true
-limit.datatype = "uinteger"
-limit.default = "150"
-
-local ltime = s:taboption("general", Value, "leasetime", translate("Leasetime"),
-       translate("Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."))
-ltime.rmempty = true
-ltime.default = "12h"
-
-local dd = s:taboption("advanced", Flag, "dynamicdhcp",
-       translate("Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"),
-       translate("Dynamically allocate DHCP addresses for clients. If disabled, only " ..
-               "clients having static leases will be served."))
-
-dd.rmempty = false
-function dd.cfgvalue(self, section)
-       return Flag.cfgvalue(self, section) or "1"
-end
+       local start = s:taboption("general", Value, "start", translate("Start"),
+               translate("Lowest leased address as offset from the network address."))
+       start.optional = true
+       start.datatype = "uinteger"
+       start.default = "100"
+
+       local limit = s:taboption("general", Value, "limit", translate("Limit"),
+               translate("Maximum number of leased addresses."))
+       limit.optional = true
+       limit.datatype = "uinteger"
+       limit.default = "150"
+
+       local ltime = s:taboption("general", Value, "leasetime", translate("Leasetime"),
+               translate("Expiry time of leased addresses, minimum is 2 Minutes (<code>2m</code>)."))
+       ltime.rmempty = true
+       ltime.default = "12h"
+
+       local dd = s:taboption("advanced", Flag, "dynamicdhcp",
+               translate("Dynamic <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr>"),
+               translate("Dynamically allocate DHCP addresses for clients. If disabled, only " ..
+                       "clients having static leases will be served."))
+       dd.default = dd.enabled
+
+       s:taboption("advanced", Flag, "force", translate("Force"),
+               translate("Force DHCP on this network even if another server is detected."))
 
-s:taboption("advanced", Flag, "force", translate("Force"),
-       translate("Force DHCP on this network even if another server is detected."))
+       -- XXX: is this actually useful?
+       --s:taboption("advanced", Value, "name", translate("Name"),
+       --      translate("Define a name for this network."))
 
--- XXX: is this actually useful?
---s:taboption("advanced", Value, "name", translate("Name"),
---     translate("Define a name for this network."))
+       mask = s:taboption("advanced", Value, "netmask",
+               translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"),
+               translate("Override the netmask sent to clients. Normally it is calculated " ..
+                       "from the subnet that is served."))
 
-mask = s:taboption("advanced", Value, "netmask",
-       translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"),
-       translate("Override the netmask sent to clients. Normally it is calculated " ..
-               "from the subnet that is served."))
+       mask.optional = true
+       mask.datatype = "ip4addr"
 
-mask.optional = true
-mask.datatype = "ip4addr"
+       s:taboption("advanced", DynamicList, "dhcp_option", translate("DHCP-Options"),
+               translate("Define additional DHCP options, for example \"<code>6,192.168.2.1," ..
+                       "192.168.2.2</code>\" which advertises different DNS servers to clients."))
 
-s:taboption("advanced", DynamicList, "dhcp_option", translate("DHCP-Options"),
-       translate("Define additional DHCP options, for example \"<code>6,192.168.2.1," ..
-               "192.168.2.2</code>\" which advertises different DNS servers to clients."))
 
-for i, n in ipairs(s.children) do
-       if n ~= ignore then
-               n:depends("ignore", "")
+       local function write_opt(self, section, value)
+               return getmetatable(self).__index.write(self, section_id, value)
+       end
+
+       local function remove_opt(self, section, value)
+               return getmetatable(self).__index.remove(self, section_id, value)
+       end
+
+       for i, n in ipairs(s.children) do
+               if n ~= ignore then
+                       n:depends("ignore", "")
+                       n.write  = write_opt
+                       n.remove = remove_opt
+               end
        end
 end