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.
]]--
local fs = require "nixio.fs"
+local ut = require "luci.util"
+local pt = require "luci.tools.proto"
local nw = require "luci.model.network"
local fw = require "luci.model.firewall"
arg[1] = arg[1] or ""
-local has_3g = fs.access("/usr/bin/gcom")
-local has_pptp = fs.access("/usr/sbin/pptp")
-local has_pppd = fs.access("/usr/sbin/pppd")
-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_dnsmasq = fs.access("/etc/config/dhcp")
+local has_firewall = fs.access("/etc/config/firewall")
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
+
nw.init(m.uci)
fw.init(m.uci)
-s = m:section(NamedSection, arg[1], "interface", translate("Common Configuration"))
-s.addremove = false
-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
-s:tab("physical", translate("Physical Settings"))
-s:tab("firewall", translate("Firewall Settings"))
+local net = nw:get_network(arg[1])
+
+local function backup_ifnames(is_bridge)
+ if not net:is_floating() and not m:get(net:name(), "_orig_ifname") then
+ local ifcs = net:get_interfaces() or { net:get_interface() }
+ if ifcs then
+ local _, ifn
+ local ifns = { }
+ for _, ifn in ipairs(ifcs) do
+ ifns[#ifns+1] = ifn:name()
+ end
+ if #ifns > 0 then
+ m:set(net:name(), "_orig_ifname", table.concat(ifns, " "))
+ m:set(net:name(), "_orig_bridge", tostring(net:is_bridge()))
+ end
+ end
+ end
+end
---[[
-back = s:taboption("general", DummyValue, "_overview", translate("Overview"))
-back.value = ""
-back.titleref = luci.dispatcher.build_url("admin", "network", "network")
-]]
-p = s:taboption("general", ListValue, "proto", translate("Protocol"))
-p.override_scheme = true
-p.default = "static"
-p:value("static", translate("static"))
-p:value("dhcp", "DHCP")
-if has_pppd then p:value("ppp", "PPP") end
-if has_pppoe then p:value("pppoe", "PPPoE") end
-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
-p:value("none", translate("none"))
-
-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")
+-- 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
-br = s:taboption("physical", Flag, "type", translate("Bridge interfaces"), translate("creates a bridge over specified interface(s)"))
-br.enabled = "bridge"
-br.rmempty = true
-
-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.rmempty = true
-
-ifname_single = s:taboption("physical", Value, "ifname_single", translate("Interface"))
-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", "")
-
-function ifname_single.cfgvalue(self, s)
- return self.map.uci:get("network", s, "ifname")
-end
+-- protocol switch was requested, rebuild interface config and reload page
+if m:formvalue("cbid.network.%s._switch" % net:name()) then
+ -- get new protocol
+ local ptype = m:formvalue("cbid.network.%s.proto" % net:name()) or "-"
+ local proto = nw:get_protocol(ptype, net:name())
+ if proto then
+ -- backup default
+ backup_ifnames()
+
+ -- if current proto is not floating and target proto is not floating,
+ -- then attempt to retain the ifnames
+ --error(net:proto() .. " > " .. proto:proto())
+ if not net:is_floating() and not proto:is_floating() then
+ -- if old proto is a bridge and new proto not, then clip the
+ -- interface list to the first ifname only
+ if net:is_bridge() and proto:is_virtual() then
+ local _, ifn
+ local first = true
+ for _, ifn in ipairs(net:get_interfaces() or { net:get_interface() }) do
+ if first then
+ first = false
+ else
+ net:del_interface(ifn)
+ end
+ end
+ m:del(net:name(), "type")
+ end
+
+ -- if the current proto is floating, the target proto not floating,
+ -- then attempt to restore ifnames from backup
+ elseif net:is_floating() and not proto:is_floating() then
+ -- if we have backup data, then re-add all orphaned interfaces
+ -- from it and restore the bridge choice
+ local br = (m:get(net:name(), "_orig_bridge") == "true")
+ local ifn
+ local ifns = { }
+ for ifn in ut.imatch(m:get(net:name(), "_orig_ifname")) do
+ ifn = nw:get_interface(ifn)
+ if ifn and not ifn:get_network() then
+ proto:add_interface(ifn)
+ if not br then
+ break
+ end
+ end
+ end
+ if br then
+ m:set(net:name(), "type", "bridge")
+ end
+
+ -- in all other cases clear the ifnames
+ else
+ local _, ifc
+ for _, ifc in ipairs(net:get_interfaces() or { net:get_interface() }) do
+ net:del_interface(ifc)
+ end
+ m:del(net:name(), "type")
+ end
-function ifname_single.write(self, s, val)
- local n = nw:get_network(s)
- if n then
- local i
- for _, i in ipairs(n:get_interfaces()) do
- n:del_interface(i)
+ -- clear options
+ local k, v
+ for k, v in pairs(m:get(net:name())) do
+ if k:sub(1,1) ~= "." and
+ k ~= "type" and
+ k ~= "ifname" and
+ k ~= "_orig_ifname" and
+ k ~= "_orig_bridge"
+ then
+ m:del(net:name(), k)
+ end
end
- n:add_interface(val)
+
+ -- set proto
+ m:set(net:name(), "proto", proto:proto())
+ m.uci:save("network")
+ m.uci:save("wireless")
+
+ -- reload page
+ luci.http.redirect(luci.dispatcher.build_url("admin/network/network", arg[1]))
+ return
end
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
-ifname_multi = s:taboption("physical", MultiValue, "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.cfgvalue = ifname_single.cfgvalue
-ifname_multi.write = ifname_single.write
+local ifc = net:get_interface()
+s = m:section(NamedSection, arg[1], "interface", translate("Common Configuration"))
+s.addremove = false
-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
+s:tab("general", translate("General Setup"))
+s:tab("advanced", translate("Advanced Settings"))
+s:tab("physical", translate("Physical Settings"))
+
+if has_firewall then
+ s:tab("firewall", translate("Firewall Settings"))
end
-local fwd_to, fwd_from
+st = s:taboption("general", DummyValue, "__status", translate("Status"))
-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."))
+local function set_status()
+ -- if current network is empty, print a warning
+ if not net:is_floating() and net:is_empty() then
+ st.template = "cbi/dvalue"
+ st.network = nil
+ st.value = translate("There is no device assigned yet, please attach a network device in the \"Physical Settings\" tab")
+ else
+ st.template = "admin_network/iface_status"
+ st.network = arg[1]
+ st.value = nil
+ end
+end
-fwzone.template = "cbi/firewall_zonelist"
-fwzone.network = arg[1]
-fwzone.rmempty = false
+m.on_init = set_status
+m.on_after_save = set_status
-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)
+p = s:taboption("general", ListValue, "proto", translate("Protocol"))
+p.default = net:proto()
- 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 zone then
- fw:del_network(section)
- zone:add_network(section)
+if not net:is_installed() then
+ p_install = s:taboption("general", Button, "_install")
+ p_install.title = translate("Protocol support is not installed")
+ p_install.inputtitle = translate("Install package %q" % net:opkg_package())
+ p_install.inputstyle = "apply"
+ p_install:depends("proto", net:proto())
+
+ function p_install.write()
+ return luci.http.redirect(
+ luci.dispatcher.build_url("admin/system/packages") ..
+ "?submit=1&install=%s" % net:opkg_package()
+ )
end
end
-ipaddr = s:taboption("general", Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
-ipaddr.rmempty = true
-ipaddr:depends("proto", "static")
+p_switch = s:taboption("general", Button, "_switch")
+p_switch.title = translate("Really switch protocol?")
+p_switch.inputtitle = translate("Switch protocol")
+p_switch.inputstyle = "apply"
-nm = s:taboption("general", Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
-nm.rmempty = true
-nm:depends("proto", "static")
-nm:value("255.255.255.0")
-nm:value("255.255.0.0")
-nm:value("255.0.0.0")
+local _, pr
+for _, pr in ipairs(nw:get_protocols()) do
+ p:value(pr:proto(), pr:get_i18n())
+ if pr:proto() ~= net:proto() then
+ p_switch:depends("proto", pr:proto())
+ end
+end
-gw = s:taboption("general", Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"))
-gw:depends("proto", "static")
-gw.rmempty = true
-bcast = s:taboption("general", Value, "bcast", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"))
-bcast:depends("proto", "static")
+auto = s:taboption("advanced", Flag, "auto", translate("Bring up on boot"))
+auto.default = (net:proto() == "none") and auto.disabled or auto.enabled
-if has_ipv6 then
- ip6addr = s: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"))
- ip6addr:depends("proto", "static")
- ip6gw = s:taboption("ipv6", Value, "ip6gw", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"))
- ip6gw:depends("proto", "static")
-end
+if not net:is_virtual() then
+ br = s:taboption("physical", Flag, "type", translate("Bridge interfaces"), translate("creates a bridge over specified interface(s)"))
+ br.enabled = "bridge"
+ br.rmempty = true
+ br:depends("proto", "static")
+ br:depends("proto", "dhcp")
+ br:depends("proto", "none")
-dns = s:taboption("general", Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"),
- translate("You can specify multiple DNS servers separated by space here. Servers entered here will override " ..
- "automatically assigned ones."))
+ 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", "bridge")
+ stp.rmempty = true
+end
-dns:depends("peerdns", "")
-mtu = s:taboption("physical", Value, "mtu", "MTU")
-mtu.isinteger = true
+if not net:is_floating() then
+ ifname_single = s:taboption("physical", Value, "ifname_single", translate("Interface"))
+ ifname_single.template = "cbi/network_ifacelist"
+ ifname_single.widget = "radio"
+ ifname_single.nobridges = true
+ ifname_single.rmempty = false
+ ifname_single.network = arg[1]
+ ifname_single:depends("type", "")
-mac = s:taboption("physical", Value, "macaddr", translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
+ function ifname_single.cfgvalue(self, s)
+ -- let the template figure out the related ifaces through the network model
+ return nil
+ end
+ function ifname_single.write(self, s, val)
+ local i
+ local new_ifs = { }
+ local old_ifs = { }
-srv = s:taboption("general", Value, "server", translate("<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"))
-srv:depends("proto", "pptp")
-srv.rmempty = true
+ for _, i in ipairs(net:get_interfaces() or { net:get_interface() }) do
+ old_ifs[#old_ifs+1] = i:name()
+ end
-if has_3g then
- service = s:taboption("general", ListValue, "service", translate("Service type"))
- service:value("", translate("-- Please choose --"))
- service:value("umts", "UMTS/GPRS")
- service:value("cdma", "CDMA")
- service:value("evdo", "EV-DO")
- service:depends("proto", "3g")
- service.rmempty = true
+ for i in ut.imatch(val) do
+ new_ifs[#new_ifs+1] = i
- apn = s:taboption("general", Value, "apn", translate("Access point (APN)"))
- apn:depends("proto", "3g")
+ -- if this is not a bridge, only assign first interface
+ if self.option == "ifname_single" then
+ break
+ end
+ end
- pincode = s:taboption("general", Value, "pincode",
- translate("PIN code"),
- translate("Make sure that you provide the correct pin code here or you might lock your sim card!")
- )
- pincode:depends("proto", "3g")
+ table.sort(old_ifs)
+ table.sort(new_ifs)
+
+ for i = 1, math.max(#old_ifs, #new_ifs) do
+ if old_ifs[i] ~= new_ifs[i] then
+ backup_ifnames()
+ for i = 1, #old_ifs do
+ net:del_interface(old_ifs[i])
+ end
+ for i = 1, #new_ifs do
+ net:add_interface(new_ifs[i])
+ end
+ break
+ end
+ end
+ end
end
-if has_pppd or has_pppoe or has_pppoa or has_3g or has_pptp then
- user = s:taboption("general", Value, "username", translate("Username"))
- user.rmempty = true
- user:depends("proto", "pptp")
- user:depends("proto", "pppoe")
- user:depends("proto", "pppoa")
- user:depends("proto", "ppp")
- user:depends("proto", "3g")
-
- pass = s:taboption("general", Value, "password", translate("Password"))
- pass.rmempty = true
- pass.password = true
- pass:depends("proto", "pptp")
- pass:depends("proto", "pppoe")
- pass:depends("proto", "pppoa")
- pass:depends("proto", "ppp")
- pass:depends("proto", "3g")
-
- ka = s:taboption("ppp", Value, "keepalive",
- translate("Keep-Alive"),
- translate("Number of failed connection tests to initiate automatic reconnect")
- )
- ka:depends("proto", "pptp")
- ka:depends("proto", "pppoe")
- ka:depends("proto", "pppoa")
- ka:depends("proto", "ppp")
- ka:depends("proto", "3g")
-
- demand = s:taboption("ppp", Value, "demand",
- translate("Automatic Disconnect"),
- translate("Time (in seconds) after which an unused connection will be closed")
- )
- demand:depends("proto", "pptp")
- demand:depends("proto", "pppoe")
- demand:depends("proto", "pppoa")
- demand:depends("proto", "ppp")
- demand:depends("proto", "3g")
-end
-if has_pppoa then
- encaps = s:taboption("atm", ListValue, "encaps", translate("PPPoA Encapsulation"))
- encaps:depends("proto", "pppoa")
- encaps:value("vc", "VC-Mux")
- encaps:value("llc", "LLC")
+if not net:is_virtual() then
+ ifname_multi = s:taboption("physical", Value, "ifname_multi", translate("Interface"))
+ ifname_multi.template = "cbi/network_ifacelist"
+ ifname_multi.nobridges = true
+ ifname_multi.rmempty = false
+ ifname_multi.network = arg[1]
+ ifname_multi.widget = "checkbox"
+ ifname_multi:depends("type", "bridge")
+ ifname_multi.cfgvalue = ifname_single.cfgvalue
+ ifname_multi.write = ifname_single.write
+end
- atmdev = s:taboption("atm", Value, "atmdev", translate("ATM device number"))
- atmdev:depends("proto", "pppoa")
- atmdev.default = "0"
- vci = s:taboption("atm", Value, "vci", translate("ATM Virtual Channel Identifier (VCI)"))
- vci:depends("proto", "pppoa")
- vci.default = "35"
+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."))
- vpi = s:taboption("atm", Value, "vpi", translate("ATM Virtual Path Identifier (VPI)"))
- vpi:depends("proto", "pppoa")
- vpi.default = "8"
-end
+ fwzone.template = "cbi/firewall_zonelist"
+ fwzone.network = arg[1]
+ fwzone.rmempty = false
-if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then
- device = s:taboption("general", Value, "device",
- translate("Modem device"),
- translate("The device node of your modem, e.g. /dev/ttyUSB0")
- )
- device:depends("proto", "ppp")
- device:depends("proto", "3g")
-
- defaultroute = s:taboption("ppp", Flag, "defaultroute",
- translate("Replace default route"),
- translate("Let pppd replace the current default route to use the PPP interface after successful connect")
- )
- defaultroute:depends("proto", "ppp")
- defaultroute:depends("proto", "pppoa")
- defaultroute:depends("proto", "pppoe")
- defaultroute:depends("proto", "pptp")
- defaultroute:depends("proto", "3g")
- defaultroute.rmempty = false
- function defaultroute.cfgvalue(...)
- return ( AbstractValue.cfgvalue(...) or '1' )
+ function fwzone.cfgvalue(self, section)
+ self.iface = section
+ local z = fw:get_zone_by_network(section)
+ return z and z:name()
end
- peerdns = s:taboption("ppp", Flag, "peerdns",
- translate("Use peer DNS"),
- translate("Configure the local DNS server to use the name servers adverticed by the PPP peer")
- )
- peerdns:depends("proto", "ppp")
- peerdns:depends("proto", "pppoa")
- peerdns:depends("proto", "pppoe")
- peerdns:depends("proto", "pptp")
- peerdns:depends("proto", "3g")
- peerdns.rmempty = false
- function peerdns.cfgvalue(...)
- return ( AbstractValue.cfgvalue(...) or '1' )
- end
+ function fwzone.write(self, section, value)
+ local zone = fw:get_zone(value)
- if has_ipv6 then
- ipv6 = s:taboption("ppp", Flag, "ipv6", translate("Enable IPv6 on PPP link") )
- ipv6:depends("proto", "ppp")
- ipv6:depends("proto", "pppoa")
- ipv6:depends("proto", "pppoe")
- ipv6:depends("proto", "pptp")
- ipv6:depends("proto", "3g")
- 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
+ fw:del_network(section)
+ end
+ end
- connect = s:taboption("ppp", Value, "connect",
- translate("Connect script"),
- translate("Let pppd run this script after establishing the PPP link")
- )
- connect:depends("proto", "ppp")
- connect:depends("proto", "pppoe")
- connect:depends("proto", "pppoa")
- connect:depends("proto", "pptp")
- connect:depends("proto", "3g")
-
- disconnect = s:taboption("ppp", Value, "disconnect",
- translate("Disconnect script"),
- translate("Let pppd run this script before tearing down the PPP link")
- )
- disconnect:depends("proto", "ppp")
- disconnect:depends("proto", "pppoe")
- disconnect:depends("proto", "pppoa")
- disconnect:depends("proto", "pptp")
- disconnect:depends("proto", "3g")
-
- pppd_options = s:taboption("ppp", Value, "pppd_options",
- translate("Additional pppd options"),
- translate("Specify additional command line arguments for pppd here")
- )
- pppd_options:depends("proto", "ppp")
- pppd_options:depends("proto", "pppoa")
- pppd_options:depends("proto", "pppoe")
- pppd_options:depends("proto", "pptp")
- pppd_options:depends("proto", "3g")
-
- maxwait = s:taboption("ppp", Value, "maxwait",
- translate("Setup wait time"),
- translate("Seconds to wait for the modem to become ready before attempting to connect")
- )
- maxwait:depends("proto", "3g")
+ if zone then
+ fw:del_network(section)
+ zone:add_network(section)
+ end
+ end
end
-s2 = m:section(TypedSection, "alias", translate("IP-Aliases"))
-s2.addremove = true
-s2:depends("interface", arg[1])
-s2.defaults.interface = arg[1]
+function p.write() end
+function p.remove() end
+function p.validate(self, value, section)
+ if value == net:proto() then
+ if not net:is_floating() and net:is_empty() then
+ local ifn = ((br and (br:formvalue(section) == "bridge"))
+ and ifname_multi:formvalue(section)
+ or ifname_single:formvalue(section))
+
+ for ifn in ut.imatch(ifn) do
+ return value
+ end
+ return nil, translate("The selected protocol needs a device assigned")
+ end
+ end
+ return value
+end
-s2:tab("general", translate("General Setup"))
-s2.defaults.proto = "static"
-s2:taboption("general", Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address")).rmempty = true
+local form, ferr = loadfile(
+ ut.libpath() .. "/model/cbi/admin_network/proto_%s.lua" % net:proto()
+)
-nm = s2:taboption("general", Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
-nm.rmempty = true
-nm:value("255.255.255.0")
-nm:value("255.255.0.0")
-nm:value("255.0.0.0")
+if not form then
+ s:taboption("general", DummyValue, "_error",
+ translate("Missing protocol extension for proto %q" % net:proto())
+ ).value = ferr
+else
+ setfenv(form, getfenv(1))(m, s, net)
+end
-s2:taboption("general", Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway")).rmempty = true
-if has_ipv6 then
- s2:tab("ipv6", translate("IPv6 Setup"))
- 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"))
- s2:taboption("ipv6", Value, "ip6gw", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"))
+local _, field
+for _, field in ipairs(s.children) do
+ if field ~= st and field ~= p and field ~= p_install and field ~= p_switch then
+ if next(field.deps) then
+ local _, dep
+ for _, dep in ipairs(field.deps) do
+ dep.deps.proto = net:proto()
+ end
+ else
+ field:depends("proto", net:proto())
+ end
+ end
end
-s2:tab("advanced", translate("Advanced Settings"))
-s2:taboption("advanced", Value, "bcast", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"))
-s2:taboption("advanced", Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"))
+--
+-- Display DNS settings if dnsmasq is available
+--
+
+if has_dnsmasq and net:proto() == "static" then
+ m2 = Map("dhcp", "", "")
-m2 = Map("dhcp", "", "")
-function m2.on_parse()
local has_section = false
m2.uci:foreach("dhcp", "dhcp", function(s)
end)
if not has_section then
- m2.uci:section("dhcp", "dhcp", nil, { interface = arg[1], ignore = "1" })
- m2.uci:save("dhcp")
- 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 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."))
+ s = m2:section(TypedSection, "dhcp", translate("DHCP Server"))
+ s.anonymous = true
+ s.cfgsections = function() return { "_enable" } end
-ignore.rmempty = false
+ x = s:option(Button, "_enable")
+ x.title = translate("No DHCP Server configured for this interface")
+ x.inputtitle = translate("Setup DHCP Server")
+ x.inputstyle = "apply"
-local start = s:taboption("general", Value, "start", translate("Start"),
- translate("Lowest leased address as offset from the network address."))
-start.rmempty = true
-start.default = "100"
+ else
-local limit = s:taboption("general", Value, "limit", translate("Limit"),
- translate("Maximum number of leased addresses."))
-limit.rmempty = true
-limit.default = "150"
+ 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 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
-
-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."))
-
-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."))
+ function s.filter(self, section)
+ return m2.uci:get("dhcp", section, "interface") == arg[1]
+ end
-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."))
+ 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 = "or(uinteger,ip4addr)"
+ 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
-for i, n in ipairs(s.children) do
- if n ~= ignore then
- n:depends("ignore", "")
end
end
+
return m, m2
projects / project / luci.git / blobdiff