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_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")
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_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 then s:tab("tunnel", translate("Tunnel 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"
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
p:value("none", translate("none"))
if not ( has_pppd and has_pppoe and has_pppoa and has_3g and has_pptp ) then
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"))
dns.optional = true
dns.cast = "string"
dns.datatype = "ipaddr"
-dns:depends("peerdns", "")
+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.optional = true
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
mac = s:taboption("physical", Value, "macaddr", translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
dns.datatype = "ip4addr"
-m2 = Map("dhcp", "", "")
-function m2.on_parse()
- local has_section = false
+--
+-- Display DNS settings if dnsmasq is available
+--
- m2.uci:foreach("dhcp", "dhcp", function(s)
- if s.interface == arg[1] then
- has_section = true
- return false
- end
- end)
+if has_dnsmasq then
+ m2 = Map("dhcp", "", "")
+ function m2.on_parse()
+ 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)
+
+ if not has_section then
+ m2.uci:section("dhcp", "dhcp", nil, { interface = arg[1], ignore = "1" })
+ m2.uci:save("dhcp")
+ 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"))
+ 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
+ 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
+ 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
-s:taboption("advanced", Flag, "force", translate("Force"),
- translate("Force DHCP on this network even if another server is detected."))
+ 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."))
+ -- 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 = 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"
+ 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."))
+ 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", "")
+ for i, n in ipairs(s.children) do
+ if n ~= ignore then
+ n:depends("ignore", "")
+ end
end
end
projects / project / luci.git / blobdiff