X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_network%2Fifaces.lua;h=3aef9d71f88267b6b151b969611be556dcfaee59;hb=bc8eaf6875fb195484b0a86e71ea92dc63b82ded;hp=7a442b0d9a44b93f7fd300d14e7b1ae23e0ba0bc;hpb=9a6b4312493d750fe89c5b253f357e7399448c89;p=project%2Fluci.git diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua index 7a442b0d9..3aef9d71f 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua @@ -2,7 +2,7 @@ LuCI - Lua Configuration Interface Copyright 2008 Steven Barth -Copyright 2008 Jo-Philipp Wich +Copyright 2008-2011 Jo-Philipp Wich Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,33 +14,82 @@ $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_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_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") +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 VLAN notation INTERFACE.VLANNR (e.g.: eth0.1).")) -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) + +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 + +-- 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")) 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_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 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" +st.network = arg[1] --[[ back = s:taboption("general", DummyValue, "_overview", translate("Overview")) @@ -58,19 +107,29 @@ 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 +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 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 +br:depends("proto", "static") +br:depends("proto", "dhcp") +br:depends("proto", "none") stp = s:taboption("physical", Flag, "stp", translate("Enable STP"), 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")) @@ -78,11 +137,16 @@ 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", "") +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) - 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) @@ -92,105 +156,202 @@ function ifname_single.write(self, s, val) for _, i in ipairs(n:get_interfaces()) do n:del_interface(i) end - n:add_interface(val) + + for i in ut.imatch(val) do + n:add_interface(i) + + -- if this is not a bridge, only assign first interface + if self.option == "ifname_single" then + break + end + end end end +function ifname_single.remove(self, s) + self:write(s, "") +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 +ifname_multi.remove = ifname_single.remove -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 unspecified to remove the interface from the associated zone or fill out the create 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 unspecified to remove the interface from the associated zone or fill out the create 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("IPv4-Address")) -ipaddr.rmempty = true +ipaddr.optional = true +ipaddr.datatype = "ip4addr" ipaddr:depends("proto", "static") nm = s:taboption("general", Value, "netmask", translate("IPv4-Netmask")) -nm.rmempty = true +nm.optional = true +nm.datatype = "ip4addr" nm:depends("proto", "static") nm:value("255.255.255.0") nm:value("255.255.0.0") nm:value("255.0.0.0") gw = s:taboption("general", Value, "gateway", translate("IPv4-Gateway")) +gw.optional = true +gw.datatype = "ip4addr" gw:depends("proto", "static") -gw.rmempty = true -bcast = s:taboption("general", Value, "bcast", translate("IPv4-Broadcast")) +bcast = s:taboption("general", Value, "broadcast", translate("IPv4-Broadcast")) +bcast.optional = true +bcast.datatype = "ip4addr" bcast:depends("proto", "static") if has_ipv6 then ip6addr = s:taboption("ipv6", Value, "ip6addr", translate("IPv6-Address"), translate("CIDR-Notation: address/prefix")) + ip6addr.optional = true + ip6addr.datatype = "ip6addr" ip6addr:depends("proto", "static") + ip6addr:depends("proto", "6in4") ip6gw = s:taboption("ipv6", Value, "ip6gw", translate("IPv6-Gateway")) + 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", Value, "dns", translate("DNS-Server"), - translate("You can specify multiple DNS servers separated by space here. Servers entered here will override " .. +dns = s:taboption("general", DynamicList, "dns", translate("DNS-Server"), + translate("You can specify multiple DNS servers here, press enter to add a new entry. Servers entered here will override " .. "automatically assigned ones.")) -dns:depends("peerdns", "") +dns.optional = true +dns.cast = "string" +dns.datatype = "ipaddr" +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.isinteger = true - -mac = s:taboption("physical", Value, "macaddr", translate("MAC-Address")) - +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("PPTP-Server")) srv:depends("proto", "pptp") -srv.rmempty = true +srv.optional = false +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("MAC-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")) @@ -211,7 +372,14 @@ if has_3g then pincode:depends("proto", "3g") end -if has_pppd or has_pppoe or has_pppoa or has_3g or has_pptp then +if has_6in4 then + tunid = s:taboption("general", Value, "tunnelid", translate("HE.net Tunnel ID")) + tunid.optional = true + tunid.datatype = "uinteger" + tunid:depends("proto", "6in4") +end + +if has_pppd or has_pppoe or has_pppoa or has_3g or has_pptp or has_6in4 then user = s:taboption("general", Value, "username", translate("Username")) user.rmempty = true user:depends("proto", "pptp") @@ -219,6 +387,7 @@ if has_pppd or has_pppoe or has_pppoa or has_3g or has_pptp then user:depends("proto", "pppoa") user:depends("proto", "ppp") user:depends("proto", "3g") + user:depends("proto", "6in4") pass = s:taboption("general", Value, "password", translate("Password")) pass.rmempty = true @@ -228,7 +397,10 @@ if has_pppd or has_pppoe or has_pppoa or has_3g or has_pptp then pass:depends("proto", "pppoa") pass:depends("proto", "ppp") pass:depends("proto", "3g") + pass:depends("proto", "6in4") +end +if has_pppd or has_pppoe or has_pppoa or has_3g or has_pptp then ka = s:taboption("ppp", Value, "keepalive", translate("Keep-Alive"), translate("Number of failed connection tests to initiate automatic reconnect") @@ -243,6 +415,8 @@ if has_pppd or has_pppoe or has_pppoa or has_3g or has_pptp then translate("Automatic Disconnect"), translate("Time (in seconds) after which an unused connection will be closed") ) + demand.optional = true + demand.datatype = "uinteger" demand:depends("proto", "pptp") demand:depends("proto", "pppoe") demand:depends("proto", "pppoa") @@ -251,17 +425,25 @@ if has_pppd or has_pppoe or has_pppoa or has_3g or has_pptp then end if has_pppoa then - encaps = s:taboption("ppp", ListValue, "encaps", translate("PPPoA Encapsulation")) + encaps = s:taboption("atm", ListValue, "encaps", translate("PPPoA Encapsulation")) encaps:depends("proto", "pppoa") - encaps:value("", translate("-- Please choose --")) - encaps:value("vc", "VC") + encaps:value("vc", "VC-Mux") encaps:value("llc", "LLC") - vpi = s:taboption("ppp", Value, "vpi", "VPI") - vpi:depends("proto", "pppoa") + atmdev = s:taboption("atm", Value, "atmdev", translate("ATM device number")) + atmdev:depends("proto", "pppoa") + atmdev.default = "0" + atmdev.datatype = "uinteger" - vci = s:taboption("ppp", Value, "vci", "VCI") + vci = s:taboption("atm", Value, "vci", translate("ATM Virtual Channel Identifier (VCI)")) vci:depends("proto", "pppoa") + vci.default = "35" + vci.datatype = "uinteger" + + vpi = s:taboption("atm", Value, "vpi", translate("ATM Virtual Path Identifier (VPI)")) + vpi:depends("proto", "pppoa") + vpi.default = "8" + vpi.datatype = "uinteger" end if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then @@ -281,10 +463,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"), @@ -295,10 +474,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") ) @@ -344,115 +520,254 @@ if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then translate("Seconds to wait for the modem to become ready before attempting to connect") ) maxwait:depends("proto", "3g") + maxwait.default = "0" + maxwait.optional = true + maxwait.datatype = "uinteger" end -s2 = m:section(TypedSection, "alias", translate("IP-Aliases")) -s2.addremove = true - -s2:depends("interface", arg[1]) -s2.defaults.interface = arg[1] +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 -s2:tab("general", translate("General Setup")) -s2.defaults.proto = "static" + 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 -s2:taboption("general", Value, "ipaddr", translate("IPv4-Address")).rmempty = true +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 -nm = s2:taboption("general", Value, "netmask", translate("IPv4-Netmask")) -nm.rmempty = true -nm:value("255.255.255.0") -nm:value("255.255.0.0") -nm:value("255.0.0.0") + 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 -s2:taboption("general", Value, "gateway", translate("IPv4-Gateway")).rmempty = true + function fam.remove(self, section) + m.uci:delete("network", section, "ipv4_only") + m.uci:delete("network", section, "ipv6_only") + end -if has_ipv6 then - s2:tab("ipv6", translate("IPv6 Setup")) - s2:taboption("ipv6", Value, "ip6addr", translate("IPv6-Address"), translate("CIDR-Notation: address/prefix")) - s2:taboption("ipv6", Value, "ip6gw", translate("IPv6-Gateway")) + 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 -s2:tab("advanced", translate("Advanced Settings")) -s2:taboption("advanced", Value, "bcast", translate("IPv4-Broadcast")) -s2:taboption("advanced", Value, "dns", translate("DNS-Server")) +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] -m2 = Map("dhcp", "", "") -function m2.on_parse() - local has_section = false + s2:tab("general", translate("General Setup")) + s2.defaults.proto = "static" - m2.uci:foreach("dhcp", "dhcp", function(s) - if s.interface == arg[1] then - has_section = true - return false - end - end) + ip = s2:taboption("general", Value, "ipaddr", translate("IPv4-Address")) + ip.optional = true + ip.datatype = "ip4addr" - if not has_section then - m2.uci:section("dhcp", "dhcp", nil, { interface = arg[1], ignore = "1" }) - m2.uci:save("dhcp") + nm = s2:taboption("general", Value, "netmask", translate("IPv4-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("IPv4-Gateway")) + gw.optional = true + gw.datatype = "ip4addr" + + if has_ipv6 then + s2:tab("ipv6", translate("IPv6 Setup")) + + ip6 = s2:taboption("ipv6", Value, "ip6addr", translate("IPv6-Address"), translate("CIDR-Notation: address/prefix")) + ip6.optional = true + ip6.datatype = "ip6addr" + + gw6 = s2:taboption("ipv6", Value, "ip6gw", translate("IPv6-Gateway")) + gw6.optional = true + gw6.datatype = "ip6addr" end -end -s = m2:section(TypedSection, "dhcp", translate("DHCP Server")) -s.addremove = false -s:tab("general", translate("General Setup")) -s:tab("advanced", translate("Advanced Settings")) + s2:tab("advanced", translate("Advanced Settings")) + + bcast = s2:taboption("advanced", Value, "bcast", translate("IPv4-Broadcast")) + bcast.optional = true + bcast.datatype = "ip4addr" -function s.filter(self, section) - return m2.uci:get("dhcp", section, "interface") == arg[1] + dns = s2:taboption("advanced", Value, "dns", translate("DNS-Server")) + dns.optional = true + dns.datatype = "ip4addr" end -local ignore = s:taboption("general", Flag, "ignore", - translate("Ignore interface"), - translate("Disable DHCP for " .. - "this interface.")) -ignore.rmempty = false +-- +-- Display DNS settings if dnsmasq is available +-- -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" +if has_dnsmasq and net:proto() == "static" then + m2 = Map("dhcp", "", "") -local limit = s:taboption("general", Value, "limit", translate("Limit"), - translate("Maximum number of leased addresses.")) -limit.rmempty = true -limit.default = "150" + 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 ltime = s:taboption("general", Value, "leasetime", translate("Leasetime"), - translate("Expiry time of leased addresses, minimum is 2 Minutes (2m).")) -ltime.rmempty = true -ltime.default = "12h" + if not has_section then -local dd = s:taboption("advanced", Flag, "dynamicdhcp", - translate("Dynamic DHCP"), - translate("Dynamically allocate DHCP addresses for clients. If disabled, only " .. - "clients having static leases will be served.")) + s = m2:section(TypedSection, "dhcp", translate("DHCP Server")) + s.anonymous = true + s.cfgsections = function() return { "_enable" } end -dd.rmempty = false -function dd.cfgvalue(self, section) - return Flag.cfgvalue(self, section) or "1" -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" -s:taboption("advanced", Flag, "force", translate("Force"), - translate("Force DHCP on this network even if another server is detected.")) + else --- XXX: is this actually useful? ---s:taboption("advanced", Value, "name", translate("Name"), --- translate("Define a name for this network.")) + 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")) -s:taboption("advanced", Value, "netmask", - translate("IPv4-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 \"6,192.168.2.1," .. - "192.168.2.2\" which advertises different DNS servers to clients.")) + local ignore = s:taboption("general", Flag, "ignore", + translate("Ignore interface"), + translate("Disable DHCP 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 (2m).")) + ltime.rmempty = true + ltime.default = "12h" + + local dd = s:taboption("advanced", Flag, "dynamicdhcp", + translate("Dynamic DHCP"), + 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("IPv4-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 \"6,192.168.2.1," .. + "192.168.2.2\" 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