arg[1] = arg[1] or ""
+local has_dnsmasq = fs.access("/etc/config/dhcp")
+local has_firewall = fs.access("/etc/config/firewall")
+
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_6to4 = fs.access("/lib/network/6to4.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
+
nw.init(m.uci)
fw.init(m.uci)
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
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"
ifname_multi.write = ifname_single.write
-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"))
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, "b
roadcast", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"))
bcast.optional = true
bcast.datatype = "ip4addr"
bcast:depends("proto", "static")
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"))
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 = "radio"
+ 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
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"),
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") )
dns.datatype = "ip4addr"
-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.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
+--
+-- Display DNS settings if dnsmasq is available
+--
-s:taboption("advanced", Flag, "force", translate("Force"),
- translate("Force DHCP on this network even if another server is detected."))
+if has_dnsmasq then
+ m2 = Map("dhcp", "", "")
+ function m2.on_parse()
+ local has_section = false
--- XXX: is this actually useful?
---s:taboption("advanced", Value, "name", translate("Name"),
--- translate("Define a name for this network."))
+ m2.uci:foreach("dhcp", "dhcp", function(s)
+ if s.interface == arg[1] then
+ has_section = true
+ return false
+ end
+ end)
-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."))
+ if not has_section then
+ m2.uci:section("dhcp", "dhcp", nil, { interface = arg[1], ignore = "1" })
+ m2.uci:save("dhcp")
+ end
+ end
-mask.optional = true
-mask.datatype = "ip4addr"
+ 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", 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."))
+ function s.filter(self, section)
+ return m2.uci:get("dhcp", section, "interface") == arg[1]
+ end
-for i, n in ipairs(s.children) do
- if n ~= ignore then
- n:depends("ignore", "")
+ 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", "")
+ end
end
end
projects / project / luci.git / blobdiff