modules/admin-full: finally sort out dhcp setup issues in interface settings
[project/luci.git] / modules / admin-full / luasrc / model / cbi / admin_network / ifaces.lua
index 798b388..3aef9d7 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.
@@ -58,6 +58,20 @@ if not net then
        return
 end
 
+-- dhcp setup was requested, create section and reload page
+if m:formvalue("cbid.dhcp._enable._enable") then
+       m.uci:section("dhcp", "dhcp", nil, {
+               interface = arg[1],
+               start     = "100",
+               limit     = "150",
+               leasetime = "12h"
+       })
+
+       m.uci:save("dhcp")
+       luci.http.redirect(luci.dispatcher.build_url("admin/network/network", arg[1]))
+       return
+end
+
 local ifc = net:get_interfaces()[1]
 
 s = m:section(NamedSection, arg[1], "interface", translate("Common Configuration"))
@@ -103,6 +117,9 @@ if not ( has_pppd and has_pppoe and has_pppoa and has_3g and has_pptp ) then
        p.description = translate("You need to install \"comgt\" for UMTS/GPRS, \"ppp-mod-pppoe\" for PPPoE, \"ppp-mod-pppoa\" for PPPoA or \"pptp\" for PPtP support")
 end
 
+auto = s:taboption("physical", Flag, "auto", translate("Bring up on boot"))                                                                                            
+auto.default = (m.uci:get("network", arg[1], "proto") == "none") and auto.disabled or auto.enabled
+
 br = s:taboption("physical", Flag, "type", translate("Bridge interfaces"), translate("creates a bridge over specified interface(s)"))
 br.enabled = "bridge"
 br.rmempty = true
@@ -120,7 +137,6 @@ ifname_single.template = "cbi/network_ifacelist"
 ifname_single.widget = "radio"
 ifname_single.nobridges = true
 ifname_single.network = arg[1]
-ifname_single.rmempty = true
 ifname_single:depends({ type = "", proto = "static" })
 ifname_single:depends({ type = "", proto = "dhcp"   })
 ifname_single:depends({ type = "", proto = "pppoe"  })
@@ -129,7 +145,8 @@ ifname_single:depends({ type = "", proto = "ahcp"   })
 ifname_single:depends({ type = "", proto = "none"   })
 
 function ifname_single.cfgvalue(self, s)
-       return self.map.uci:get("network", s, "ifname")
+       -- let the template figure out the related ifaces through the network model
+       return nil
 end
 
 function ifname_single.write(self, s, val)
@@ -151,6 +168,11 @@ function ifname_single.write(self, s, val)
        end
 end
 
+function ifname_single.remove(self, s)
+       self:write(s, "")
+end
+
+
 ifname_multi = s:taboption("physical", Value, "ifname_multi", translate("Interface"))
 ifname_multi.template = "cbi/network_ifacelist"
 ifname_multi.nobridges = true
@@ -159,6 +181,7 @@ ifname_multi.widget = "checkbox"
 ifname_multi:depends("type", "bridge")
 ifname_multi.cfgvalue = ifname_single.cfgvalue
 ifname_multi.write = ifname_single.write
+ifname_multi.remove = ifname_single.remove
 
 
 if has_firewall then
@@ -659,85 +682,92 @@ end
 
 if has_dnsmasq and net:proto() == "static" then
        m2 = Map("dhcp", "", "")
-       function m2.on_parse()
-               local has_section = false
 
-               m2.uci:foreach("dhcp", "dhcp", function(s)
-                       if s.interface == arg[1] then
-                               has_section = true
-                               return false
-                       end
-               end)
+       local has_section = false
 
-               if not has_section then
-                       m2.uci:section("dhcp", "dhcp", nil, { interface = arg[1], ignore = "1" })
-                       m2.uci:save("dhcp")
+       m2.uci:foreach("dhcp", "dhcp", function(s)
+               if s.interface == arg[1] then
+                       has_section = true
+                       return false
                end
-       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"))
+       if not has_section then
 
-       function s.filter(self, section)
-               return m2.uci:get("dhcp", section, "interface") == arg[1]
-       end
+               s = m2:section(TypedSection, "dhcp", translate("DHCP Server"))
+               s.anonymous   = true
+               s.cfgsections = function() return { "_enable" } end
+
+               x = s:option(Button, "_enable")
+               x.title      = translate("No DHCP Server configured for this interface")
+               x.inputtitle = translate("Setup DHCP Server")
+               x.inputstyle = "apply"
+
+       else
+
+               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"))
 
-       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.default = dd.enabled
-
-       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."))
-
-       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"
-
-       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", "")
+               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."))
+
+               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."))
+
+               -- 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.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."))
+
+               for i, n in ipairs(s.children) do
+                       if n ~= ignore then
+                               n:depends("ignore", "")
+                       end
+               end
+
        end
 end