LuCI - Lua Configuration Interface
Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@subsignal.org>
+Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
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_radvd = fs.access("/etc/config/radvd")
local has_3g = fs.access("/usr/bin/gcom")
local has_pptp = fs.access("/usr/sbin/pptp")
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 <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("wireless")
return
end
-local ifc = net:get_interfaces()[1]
+-- 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_interface()
s = m:section(NamedSection, arg[1], "interface", translate("Common Configuration"))
s.addremove = false
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"))
if has_firewall then s:tab("firewall", translate("Firewall Settings")) 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
ifname_single.template = "cbi/network_ifacelist"
ifname_single.widget = "radio"
ifname_single.nobridges = true
+ifname_single.rmempty = false
ifname_single.network = arg[1]
-ifname_single.rmempty = true
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)
local n = nw:get_network(s)
if n then
local i
- for _, i in ipairs(n:get_interfaces()) do
- n:del_interface(i)
+ local new_ifs = { }
+ local old_ifs = { }
+
+ for _, i in ipairs(n:get_interfaces() or { n:get_interface() }) do
+ old_ifs[#old_ifs+1] = i:name()
end
for i in ut.imatch(val) do
- n:add_interface(i)
+ new_ifs[#new_ifs+1] = i
-- if this is not a bridge, only assign first interface
if self.option == "ifname_single" then
break
end
end
+
+ table.sort(old_ifs)
+ table.sort(new_ifs)
+
+ for i = 1, math.max(#old_ifs, #new_ifs) do
+ if old_ifs[i] ~= new_ifs[i] then
+ for i = 1, #old_ifs do
+ n:del_interface(old_ifs[i])
+ end
+ for i = 1, #new_ifs do
+ n:add_interface(new_ifs[i])
+ end
+ break
+ end
+ end
end
end
+
ifname_multi = s:taboption("physical", Value, "ifname_multi", translate("Interface"))
ifname_multi.template = "cbi/network_ifacelist"
ifname_multi.nobridges = true
+ifname_multi.rmempty = false
ifname_multi.network = arg[1]
ifname_multi.widget = "checkbox"
ifname_multi:depends("type", "bridge")
gw.optional = true
gw.datatype = "ip4addr"
gw:depends("proto", "static")
+gw:depends("proto", "dhcp")
bcast = s:taboption("general", Value, "broadcast", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"))
bcast.optional = true
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", DynamicList, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"),
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("<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"))
srv:depends("proto", "pptp")
end
end
+if has_relay then
+ rnet = s:taboption("general", DynamicList, "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("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
mac:depends("proto", "none")
mac:depends("proto", "static")
mac:depends("proto", "dhcp")
-mac.placeholder = ifc and ifc:mac():upper()
+mac.placeholder = ifc and ifc:mac()
if has_3g then
service = s:taboption("general", ListValue, "service", translate("Service type"))
maxwait.datatype = "uinteger"
end
-s2 = m:section(TypedSection, "alias", translate("IP-Aliases"))
-s2.addremove = true
+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:depends("interface", arg[1])
-s2.defaults.interface = arg[1]
+ 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")
+
+ tableid = s:taboption("relay", Value, "table", translate("Routing table ID"))
+ tableid.optional = true
+ tableid.placeholder = 16800
+ tableid.datatype = "uinteger"
+ tableid:depends("proto", "relay")
+end
-s2:tab("general", translate("General Setup"))
-s2.defaults.proto = "static"
+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
-ip = s2:taboption("general", Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
-ip.optional = true
-ip.datatype = "ip4addr"
+ 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
-nm = s2:taboption("general", Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-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")
+ function fam.remove(self, section)
+ m.uci:delete("network", section, "ipv4_only")
+ m.uci:delete("network", section, "ipv6_only")
+ end
-gw = s2:taboption("general", Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"))
-gw.optional = true
-gw.datatype = "ip4addr"
+ 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
-if has_ipv6 then
- s2:tab("ipv6", translate("IPv6 Setup"))
+if net:proto() ~= "relay" then
+ s2 = m:section(TypedSection, "alias", translate("IP-Aliases"))
+ s2.addremove = true
- ip6 = s2:taboption("ipv6", Value, "ip6addr", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"), translate("<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"))
- ip6.optional = true
- ip6.datatype = "ip6addr"
+ s2:depends("interface", arg[1])
+ s2.defaults.interface = arg[1]
- gw6 = s2:taboption("ipv6", Value, "ip6gw", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"))
- gw6.optional = true
- gw6.datatype = "ip6addr"
-end
+ s2:tab("general", translate("General Setup"))
+ s2.defaults.proto = "static"
-s2:tab("advanced", translate("Advanced Settings"))
+ ip = s2:taboption("general", Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
+ ip.optional = true
+ ip.datatype = "ip4addr"
-bcast = s2:taboption("advanced", Value, "bcast", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"))
-bcast.optional = true
-bcast.datatype = "ip4addr"
+ nm = s2:taboption("general", Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-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")
-dns = s2:taboption("advanced", Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"))
-dns.optional = true
-dns.datatype = "ip4addr"
+ gw = s2:taboption("general", Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"))
+ gw.optional = true
+ gw.datatype = "ip4addr"
+
+ if has_ipv6 then
+ s2:tab("ipv6", translate("IPv6 Setup"))
+
+ ip6 = s2:taboption("ipv6", Value, "ip6addr", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Address"), translate("<abbr title=\"Classless Inter-Domain Routing\">CIDR</abbr>-Notation: address/prefix"))
+ ip6.optional = true
+ ip6.datatype = "ip6addr"
+
+ gw6 = s2:taboption("ipv6", Value, "ip6gw", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"))
+ gw6.optional = true
+ gw6.datatype = "ip6addr"
+ end
+
+ s2:tab("advanced", translate("Advanced Settings"))
+
+ bcast = s2:taboption("advanced", Value, "bcast", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"))
+ bcast.optional = true
+ bcast.datatype = "ip4addr"
+
+ dns = s2:taboption("advanced", Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"))
+ dns.optional = true
+ dns.datatype = "ip4addr"
+end
--
-- Display DNS settings if dnsmasq is available
--
-if has_dnsmasq then
+if has_dnsmasq and net:proto() == "static" 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)
+ 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
+ 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"))
+ if not has_section then
- function s.filter(self, section)
- return m2.uci:get("dhcp", section, "interface") == arg[1]
- end
+ s = m2:section(TypedSection, "dhcp", translate("DHCP Server"))
+ s.anonymous = true
+ s.cfgsections = function() return { "_enable" } 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.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", "")
+ x = s:option(Button, "_enable")
+ x.title = translate("No DHCP Server configured for this interface")
+ x.inputtitle = translate("Setup DHCP Server")
+ x.inputstyle = "apply"
+
+ else
+
+ 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."))
+
+ 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
end
projects / project / luci.git / blobdiff