LuCI - Lua Configuration Interface
Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2008 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.
$Id$
]]--
-require("luci.tools.webadmin")
+local fs = require "nixio.fs"
+local nw = require "luci.model.network"
+local fw = require "luci.model.firewall"
+
arg[1] = arg[1] or ""
-local has_3g = luci.fs.mtime("/usr/bin/gcom")
-local has_pptp = luci.fs.mtime("/usr/sbin/pptp")
-local has_pppd = luci.fs.mtime("/usr/sbin/pppd")
-local has_pppoe = luci.fs.glob("/usr/lib/pppd/*/rp-pppoe.so")
-local has_pppoa = luci.fs.glob("/usr/lib/pppd/*/pppoatm.so")
+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")
+
+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")
-m = Map("network", translate("interfaces"), translate("a_n_ifaces1"))
+nw.init(m.uci)
+fw.init(m.uci)
s = m:section(NamedSection, arg[1], "interface")
-s.addremove = true
+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
+s:tab("physical", translate("Physical Settings"))
+s:tab("firewall", translate("Firewall Settings"))
-back = s:option(DummyValue, "_overview", translate("overview"))
+--[[
+back = s:taboption("general", DummyValue, "_overview", translate("Overview"))
back.value = ""
back.titleref = luci.dispatcher.build_url("admin", "network", "network")
+]]
-p = s:option(ListValue, "proto", translate("protocol"))
+p = s:taboption("general", ListValue, "proto", translate("Protocol"))
p.override_scheme = true
p.default = "static"
p:value("static", translate("static"))
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("network_interface_prereq")
+ 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
-br = s:option(Flag, "type", translate("a_n_i_bridge"), translate("a_n_i_bridge1"))
+br = s:taboption("physical", Flag, "type", translate("Bridge interfaces"), translate("creates a bridge over specified interface(s)"))
br.enabled = "bridge"
br.rmempty = true
-ifname = s:option(Value, "ifname", translate("interface"))
-ifname.rmempty = true
-for i,d in ipairs(luci.sys.net.devices()) do
- if d ~= "lo" then
- ifname:value(d)
+stp = s:taboption("physical", Flag, "stp", translate("Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"),
+ translate("Enables the Spanning Tree Protocol on this bridge"))
+stp:depends("type", "1")
+stp.rmempty = true
+
+ifname_single = s:taboption("physical", Value, "ifname_single", translate("Interface"))
+ifname_single.template = "cbi/network_ifacelist"
+ifname_single.widget = "radio"
+ifname_single.nobridges = true
+ifname_single.network = arg[1]
+ifname_single.rmempty = true
+ifname_single:depends("type", "")
+
+function ifname_single.cfgvalue(self, s)
+ return self.map.uci:get("network", s, "ifname")
+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)
+ end
+ n:add_interface(val)
end
end
-local zones = luci.tools.webadmin.network_get_zones(arg[1])
-if zones then
- if #zones == 0 then
- m:chain("firewall")
-
- fwzone = s:option(Value, "_fwzone",
- translate("network_interface_fwzone"),
- translate("network_interface_fwzone_desc"))
- fwzone.rmempty = true
- fwzone:value("", "- " .. translate("none") .. " -")
- fwzone:value(arg[1])
- m.uci:load("firewall")
- m.uci:foreach("firewall", "zone",
- function (section)
- fwzone:value(section.name)
- end
- )
-
- function fwzone.write(self, section, value)
- local zone = luci.tools.webadmin.firewall_find_zone(value)
- local stat
-
- if not zone then
- stat = m.uci:section("firewall", "zone", nil, {
- name = value,
- network = section
- })
- else
- local net = m.uci:get("firewall", zone, "network")
- net = (net or value) .. " " .. section
- stat = m.uci:set("firewall", zone, "network", net)
- end
-
- if stat then
- self.render = function() end
- end
+
+ifname_multi = s:taboption("physical", MultiValue, "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.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
+
+
+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 <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
+
+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
- else
- fwzone = s:option(DummyValue, "_fwzone", translate("zone"))
- fwzone.value = table.concat(zones, ", ")
end
- fwzone.titleref = luci.dispatcher.build_url("admin", "network", "firewall", "zones")
- m.uci:unload("firewall")
+
+ if zone then
+ fw:del_network(section)
+ zone:add_network(section)
+ end
end
-ipaddr = s:option(Value, "ipaddr", translate("ipaddress"))
+
+ipaddr = s:taboption("general", Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
ipaddr.rmempty = true
ipaddr:depends("proto", "static")
-nm = s:option(Value, "netmask", translate("netmask"))
+nm = s:taboption("general", Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
nm.rmempty = true
nm:depends("proto", "static")
nm:value("255.255.255.0")
nm:value("255.255.0.0")
nm:value("255.0.0.0")
-gw = s:option(Value, "gateway", translate("gateway"))
+gw = s:taboption("general", Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"))
gw:depends("proto", "static")
gw.rmempty = true
-bcast = s:option(Value, "bcast", translate("broadcast"))
+bcast = s:taboption("general", Value, "bcast", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Broadcast"))
bcast:depends("proto", "static")
-bcast.optional = true
-ip6addr = s:option(Value, "ip6addr", translate("ip6address"), translate("cidr6"))
-ip6addr.optional = true
-ip6addr:depends("proto", "static")
+if has_ipv6 then
+ ip6addr = s: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"))
+ ip6addr:depends("proto", "static")
-ip6gw = s:option(Value, "ip6gw", translate("gateway6"))
-ip6gw:depends("proto", "static")
-ip6gw.optional = true
+ ip6gw = s:taboption("ipv6", Value, "ip6gw", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"))
+ ip6gw:depends("proto", "static")
+end
-dns = s:option(Value, "dns", translate("dnsserver"))
-dns.optional = true
+dns = s:taboption("general", Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"))
+dns:depends("peerdns", "")
-mtu = s:option(Value, "mtu", "MTU")
-mtu.optional = true
+mtu = s:taboption("physical", Value, "mtu", "MTU")
mtu.isinteger = true
-mac = s:option(Value, "macaddr", translate("macaddress"))
-mac.optional = true
+mac = s:taboption("physical", Value, "macaddr", translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
-srv = s:option(Value, "server", translate("network_interface_server"))
+srv = s:taboption("general", Value, "server", translate("<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"))
srv:depends("proto", "pptp")
srv.rmempty = true
if has_3g then
- service = s:option(ListValue, "service", translate("network_interface_service"))
- service:value("", translate("cbi_select"))
+ service = s:taboption("general", ListValue, "service", translate("Service type"))
+ service:value("", translate("-- Please choose --"))
service:value("umts", "UMTS/GPRS")
service:value("cdma", "CDMA")
service:value("evdo", "EV-DO")
service:depends("proto", "3g")
service.rmempty = true
- apn = s:option(Value, "apn", translate("network_interface_apn"))
+ apn = s:taboption("general", Value, "apn", translate("Access point (APN)"))
apn:depends("proto", "3g")
- pincode = s:option(Value, "pincode",
- translate("network_interface_pincode"),
- translate("network_interface_pincode_desc")
+ pincode = s:taboption("general", Value, "pincode",
+ translate("PIN code"),
+ translate("Make sure that you provide the correct pin code here or you might lock your sim card!")
)
pincode:depends("proto", "3g")
end
-if has_pppd or has_pppoe or has_3g or has_pptp then
- user = s:option(Value, "username", translate("username"))
+if has_pppd or has_pppoe or has_pppoa or has_3g or has_pptp then
+ user = s:taboption("general", Value, "username", translate("Username"))
user.rmempty = true
user:depends("proto", "pptp")
user:depends("proto", "pppoe")
+ user:depends("proto", "pppoa")
user:depends("proto", "ppp")
user:depends("proto", "3g")
- pass = s:option(Value, "password", translate("password"))
+ pass = s:taboption("general", Value, "password", translate("Password"))
pass.rmempty = true
pass.password = true
pass:depends("proto", "pptp")
pass:depends("proto", "pppoe")
+ pass:depends("proto", "pppoa")
pass:depends("proto", "ppp")
pass:depends("proto", "3g")
- ka = s:option(Value, "keepalive",
- translate("network_interface_keepalive"),
- translate("network_interface_keepalive_desc")
+ ka = s:taboption("ppp", Value, "keepalive",
+ translate("Keep-Alive"),
+ translate("Number of failed connection tests to initiate automatic reconnect")
)
- ka.optional = true
ka:depends("proto", "pptp")
ka:depends("proto", "pppoe")
+ ka:depends("proto", "pppoa")
ka:depends("proto", "ppp")
ka:depends("proto", "3g")
- demand = s:option(Value, "demand",
- translate("network_interface_demand"),
- translate("network_interface_demand_desc")
+ demand = s:taboption("ppp", Value, "demand",
+ translate("Automatic Disconnect"),
+ translate("Time (in seconds) after which an unused connection will be closed")
)
- demand.optional = true
demand:depends("proto", "pptp")
demand:depends("proto", "pppoe")
+ demand:depends("proto", "pppoa")
demand:depends("proto", "ppp")
demand:depends("proto", "3g")
end
-if has_pppd or has_3g then
- device = s:option(Value, "device",
- translate("network_interface_device"),
- translate("network_interface_device_desc")
+if has_pppoa then
+ encaps = s:taboption("ppp", ListValue, "encaps", translate("PPPoA Encapsulation"))
+ encaps:depends("proto", "pppoa")
+ encaps:value("", translate("-- Please choose --"))
+ encaps:value("vc", "VC")
+ encaps:value("llc", "LLC")
+
+ vpi = s:taboption("ppp", Value, "vpi", "VPI")
+ vpi:depends("proto", "pppoa")
+
+ vci = s:taboption("ppp", Value, "vci", "VCI")
+ vci:depends("proto", "pppoa")
+end
+
+if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then
+ device = s:taboption("general", Value, "device",
+ translate("Modem device"),
+ translate("The device node of your modem, e.g. /dev/ttyUSB0")
)
device:depends("proto", "ppp")
device:depends("proto", "3g")
- defaultroute = s:option(Flag, "defaultroute",
- translate("network_interface_defaultroute"),
- translate("network_interface_defaultroute_desc")
+ defaultroute = s:taboption("ppp", Flag, "defaultroute",
+ translate("Replace default route"),
+ translate("Let pppd replace the current default route to use the PPP interface after successful connect")
)
defaultroute:depends("proto", "ppp")
+ defaultroute:depends("proto", "pppoa")
+ defaultroute:depends("proto", "pppoe")
+ defaultroute:depends("proto", "pptp")
defaultroute:depends("proto", "3g")
+ defaultroute.rmempty = false
+ function defaultroute.cfgvalue(...)
+ return ( AbstractValue.cfgvalue(...) or '1' )
+ end
- peerdns = s:option(Flag, "peerdns",
- translate("network_interface_peerdns"),
- translate("network_interface_peerdns_desc")
+ peerdns = s:taboption("ppp", Flag, "peerdns",
+ translate("Use peer DNS"),
+ translate("Configure the local DNS server to use the name servers adverticed by the PPP peer")
)
peerdns:depends("proto", "ppp")
+ peerdns:depends("proto", "pppoa")
+ peerdns:depends("proto", "pppoe")
+ peerdns:depends("proto", "pptp")
+ peerdns:depends("proto", "3g")
+ peerdns.rmempty = false
+ function peerdns.cfgvalue(...)
+ return ( AbstractValue.cfgvalue(...) or '1' )
+ end
- ipv6 = s:option(Flag, "ipv6", translate("network_interface_ipv6") )
- ipv6:depends("proto", "ppp")
- --ipv6:depends("proto", "3g")
+ if has_ipv6 then
+ ipv6 = s:taboption("ppp", Flag, "ipv6", translate("Enable IPv6 on PPP link") )
+ ipv6:depends("proto", "ppp")
+ ipv6:depends("proto", "pppoa")
+ ipv6:depends("proto", "pppoe")
+ ipv6:depends("proto", "pptp")
+ ipv6:depends("proto", "3g")
+ end
- connect = s:option(Value, "connect",
- translate("network_interface_connect"),
- translate("network_interface_connect_desc")
+ connect = s:taboption("ppp", Value, "connect",
+ translate("Connect script"),
+ translate("Let pppd run this script after establishing the PPP link")
)
- connect.optional = true
connect:depends("proto", "ppp")
+ connect:depends("proto", "pppoe")
+ connect:depends("proto", "pppoa")
+ connect:depends("proto", "pptp")
connect:depends("proto", "3g")
- disconnect = s:option(Value, "disconnect",
- translate("network_interface_disconnect"),
- translate("network_interface_disconnect_desc")
+ disconnect = s:taboption("ppp", Value, "disconnect",
+ translate("Disconnect script"),
+ translate("Let pppd run this script before tearing down the PPP link")
)
- disconnect.optional = true
disconnect:depends("proto", "ppp")
+ disconnect:depends("proto", "pppoe")
+ disconnect:depends("proto", "pppoa")
+ disconnect:depends("proto", "pptp")
disconnect:depends("proto", "3g")
- pppd_options = s:option(Value, "pppd_options",
- translate("network_interface_pppd_options"),
- translate("network_interface_pppd_options_desc")
+ pppd_options = s:taboption("ppp", Value, "pppd_options",
+ translate("Additional pppd options"),
+ translate("Specify additional command line arguments for pppd here")
)
- pppd_options.optional = true
pppd_options:depends("proto", "ppp")
+ pppd_options:depends("proto", "pppoa")
+ pppd_options:depends("proto", "pppoe")
+ pppd_options:depends("proto", "pptp")
pppd_options:depends("proto", "3g")
- maxwait = s:option(Value, "maxwait",
- translate("network_interface_maxwait"),
- translate("network_interface_maxwait_desc")
+ maxwait = s:taboption("ppp", Value, "maxwait",
+ translate("Setup wait time"),
+ translate("Seconds to wait for the modem to become ready before attempting to connect")
)
- maxwait.optional = true
maxwait:depends("proto", "3g")
end
-s2 = m:section(TypedSection, "alias", translate("aliases"))
+s2 = m:section(TypedSection, "alias", translate("Aliases"))
s2.addremove = true
s2:depends("interface", arg[1])
s2.defaults.interface = arg[1]
+s2:tab("general", translate("General Setup"))
s2.defaults.proto = "static"
-ipaddr = s2:option(Value, "ipaddr", translate("ipaddress"))
-ipaddr.rmempty = true
+s2:taboption("general", Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address")).rmempty = true
-nm = s2:option(Value, "netmask", translate("netmask"))
+nm = s2:taboption("general", Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
nm.rmempty = true
nm:value("255.255.255.0")
nm:value("255.255.0.0")
nm:value("255.0.0.0")
-gw = s2:option(Value, "gateway", translate("gateway"))
-gw.rmempty = true
+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"))
-bcast = s2:option(Value, "bcast", translate("broadcast"))
-bcast.optional = true
-
-ip6addr = s2:option(Value, "ip6addr", translate("ip6address"), translate("cidr6"))
-ip6addr.optional = true
-
-ip6gw = s2:option(Value, "ip6gw", translate("gateway6"))
-ip6gw.optional = true
-
-dns = s2:option(Value, "dns", translate("dnsserver"))
-dns.optional = true
+if has_ipv6 then
+ s2:tab("ipv6", translate("IPv6 Setup"))
+ 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"))
+ s2:taboption("ipv6", Value, "ip6gw", translate("<abbr title=\"Internet Protocol Version 6\">IPv6</abbr>-Gateway"))
+end
return m
projects / project / luci.git / blobdiff