$Id$
]]--
+
require("luci.tools.webadmin")
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")
+
m = Map("network", translate("interfaces"), translate("a_n_ifaces1"))
s = m:section(NamedSection, arg[1], "interface")
s.addremove = true
-back = s:option(DummyValue, translate("overview"))
+back = s:option(DummyValue, "_overview", translate("overview"))
back.value = ""
back.titleref = luci.dispatcher.build_url("admin", "network", "network")
p = s:option(ListValue, "proto", translate("protocol"))
+p.override_scheme = true
+p.default = "static"
p:value("static", translate("static"))
p:value("dhcp", "DHCP")
-p:value("pppoe", "PPPoE")
-p:value("pptp", "PPTP")
-p.default = "static"
+if has_pppd then p:value("ppp", "PPP") end
+if has_pppoe then p:value("pppoe", "PPPoE") end
+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
+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")
+end
br = s:option(Flag, "type", translate("a_n_i_bridge"), translate("a_n_i_bridge1"))
br.enabled = "bridge"
br.rmempty = true
+stp = s:option(Flag, "stp", translate("a_n_i_stp"),
+ translate("a_n_i_stp1", "Enables the Spanning Tree Protocol on this bridge"))
+stp:depends("type", "bridge")
+stp.rmempty = true
+
ifname = s:option(Value, "ifname", translate("interface"))
ifname.rmempty = true
for i,d in ipairs(luci.sys.net.devices()) do
end
local zones = luci.tools.webadmin.network_get_zones(arg[1])
-if zones then
+if zones then
if #zones == 0 then
m:chain("firewall")
-
- fwzone = s:option(Value, "_fwzone",
+
+ fwzone = s:option(Value, "_fwzone",
translate("network_interface_fwzone"),
translate("network_interface_fwzone_desc"))
fwzone.rmempty = true
fwzone:value(section.name)
end
)
-
- function fwzone.write(self, section, value)
+
+ 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,
net = (net or value) .. " " .. section
stat = m.uci:set("firewall", zone, "network", net)
end
-
+
if stat then
self.render = function() end
end
ip6gw.optional = true
dns = s:option(Value, "dns", translate("dnsserver"))
-dns:depends("proto", "static")
dns.optional = true
mtu = s:option(Value, "mtu", "MTU")
srv:depends("proto", "pptp")
srv.rmempty = true
-user = s:option(Value, "username", translate("username"))
-user.rmempty = true
-user:depends("proto", "pptp")
-user:depends("proto", "pppoe")
-
-pass = s:option(Value, "password", translate("password"))
-pass.rmempty = true
-pass:depends("proto", "pptp")
-pass:depends("proto", "pppoe")
+if has_3g then
+ service = s:option(ListValue, "service", translate("network_interface_service"))
+ service:value("", translate("cbi_select"))
+ 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:depends("proto", "3g")
+
+ pincode = s:option(Value, "pincode",
+ translate("network_interface_pincode"),
+ translate("network_interface_pincode_desc")
+ )
+ pincode:depends("proto", "3g")
+end
-ka = s:option(Value, "keepalive",
- translate("network_interface_keepalive"),
- translate("network_interface_keepalive_desc")
-)
-ka.rmempty = true
-ka:depends("proto", "pptp")
-ka:depends("proto", "pppoe")
+if has_pppd or has_pppoe or has_pppoa or has_3g or has_pptp then
+ user = s:option(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.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.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.optional = true
+ demand:depends("proto", "pptp")
+ demand:depends("proto", "pppoe")
+ demand:depends("proto", "pppoa")
+ demand:depends("proto", "ppp")
+ demand:depends("proto", "3g")
+end
-demand = s:option(Value, "demand",
- translate("network_interface_demand"),
- translate("network_interface_demand_desc")
-)
-demand.rmempty = true
-demand:depends("proto", "pptp")
-demand:depends("proto", "pppoe")
+if has_pppoa then
+ encaps = s:option(ListValue, "encaps", translate("network_interface_encaps"))
+ encaps.optional = false
+ encaps:depends("proto", "pppoa")
+ encaps:value("", translate("cbi_select"))
+ encaps:value("vc", "VC")
+ encaps:value("llc", "LLC")
+
+ vpi = s:option(Value, "vpi", "VPI")
+ vpi.optional = false
+ vpi:depends("proto", "pppoa")
+
+ vci = s:option(Value, "vci", "VCI")
+ vci.optional = false
+ vci:depends("proto", "pppoa")
+end
+if has_pptp or has_pppd or has_pppoe or has_pppoa or has_3g then
+ device = s:option(Value, "device",
+ translate("network_interface_device"),
+ translate("network_interface_device_desc")
+ )
+ device:depends("proto", "ppp")
+ device:depends("proto", "3g")
+
+ defaultroute = s:option(Flag, "defaultroute",
+ translate("network_interface_defaultroute"),
+ translate("network_interface_defaultroute_desc")
+ )
+ 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: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", "pppoa")
+ ipv6:depends("proto", "pppoe")
+ ipv6:depends("proto", "pptp")
+ ipv6:depends("proto", "3g")
+
+ connect = s:option(Value, "connect",
+ translate("network_interface_connect"),
+ translate("network_interface_connect_desc")
+ )
+ 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.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.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.optional = true
+ maxwait:depends("proto", "3g")
+end
s2 = m:section(TypedSection, "alias", translate("aliases"))
s2.addremove = true
projects / project / luci.git / blobdiff