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_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")
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")
nw.init(m.uci)
fw.init(m.uci)
-s = m:section(NamedSection, arg[1], "interface")
+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
s:tab("physical", translate("Physical Settings"))
s:tab("firewall", translate("Firewall Settings"))
ip6gw:depends("proto", "static")
end
-dns = s:taboption("general", Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"))
+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."))
+
dns:depends("peerdns", "")
mtu = s:taboption("physical", Value, "mtu", "MTU")
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"
- 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"
+
+ vpi = s:taboption("atm", Value, "vpi", translate("ATM Virtual Path Identifier (VPI)"))
+ vpi:depends("proto", "pppoa")
+ vpi.default = "8"
end
if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then
maxwait:depends("proto", "3g")
end
-s2 = m:section(TypedSection, "alias", translate("Aliases"))
+s2 = m:section(TypedSection, "alias", translate("IP-Aliases"))
s2.addremove = true
s2:depends("interface", arg[1])
s2.defaults.interface = arg[1]
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
nm:value("255.0.0.0")
s2:taboption("general", Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway")).rmempty = true
-s2:taboption("general", Value, "bcast", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"))
-s2:taboption("general", Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"))
if has_ipv6 then
s2:tab("ipv6", translate("IPv6 Setup"))
s2:taboption("ipv6", Value, "ip6gw", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"))
end
-return m
+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"))
+
+
+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)
+
+ 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."))
+
+ignore.rmempty = false
+
+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"
+
+local limit = s:taboption("general", Value, "limit", translate("Limit"),
+ translate("Maximum number of leased addresses."))
+limit.rmempty = true
+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
+
+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."))
+
+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
+
+return m, m2
projects / project / luci.git / blobdiff