X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_network%2Fifaces.lua;h=4efcf2e54c4c71a8ba5df8bced140ac7a7de72ac;hp=4dccbc22a3567ab28f9c2c52a376e3d7b419ccd6;hb=2530590e50ec8c0fddc9f9ce03c0b65b5476a8bd;hpb=185eacba4bcfde2cad64a574e47e6e3b8cd7a75b;ds=sidebyside
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 4dccbc22a..4efcf2e54 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
@@ -14,11 +14,15 @@ $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_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")
@@ -26,18 +30,28 @@ 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")
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
+
nw.init(m.uci)
fw.init(m.uci)
---function m.on_commit(map)
--- nw.init(map.uci)
--- fw.init(map.uci)
---end
+
+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
+
+local ifc = net:get_interfaces()[1]
s = m:section(NamedSection, arg[1], "interface", translate("Common Configuration"))
s.addremove = false
@@ -46,9 +60,9 @@ 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
-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"
@@ -71,6 +85,7 @@ 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
p:value("none", translate("none"))
if not ( has_pppd and has_pppoe and has_pppoa and has_3g and has_pptp ) then
@@ -86,7 +101,7 @@ 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"))
@@ -113,7 +128,7 @@ function ifname_single.write(self, s, val)
n:del_interface(i)
end
- for i in val:gmatch("%S+") do
+ for i in ut.imatch(val) do
n:add_interface(i)
-- if this is not a bridge, only assign first interface
@@ -124,57 +139,48 @@ function ifname_single.write(self, s, val)
end
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
-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
+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.template = "cbi/firewall_zonelist"
+ fwzone.network = arg[1]
+ fwzone.rmempty = false
-local fwd_to, fwd_from
-
-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."))
+ function fwzone.cfgvalue(self, section)
+ self.iface = section
+ local z = fw:get_zone_by_network(section)
+ return z and z:name()
+ end
-fwzone.template = "cbi/firewall_zonelist"
-fwzone.network = arg[1]
-fwzone.rmempty = false
+ function fwzone.write(self, section, value)
+ local zone = fw:get_zone(value)
-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)
+ 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"))
@@ -220,11 +226,16 @@ dns = s:taboption("general", DynamicList, "dns", translate("PPTP-Server"))
srv:depends("proto", "pptp")
@@ -236,18 +247,46 @@ if has_6in4 then
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("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"))
@@ -474,89 +513,95 @@ dns.optional = true
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
+
+ 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")
+ 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 DHCP 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 (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.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 DHCP 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 (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.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("IPv4-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("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"
+ 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."))
+ 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", "")
+ for i, n in ipairs(s.children) do
+ if n ~= ignore then
+ n:depends("ignore", "")
+ end
end
end