X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_network%2Fifaces.lua;h=f9c141a71247545fe9f385cf1559d0f2e4dd80ec;hb=76fe25932830df72b8c957c809202cf6dc75b4ff;hp=9065636836e77a536d02decb85bfaaadaf8d9a0d;hpb=07fdaa87dbac0582960cded4e9aa981d4a141782;p=project%2Fluci.git

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 906563683..f9c141a71 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
@@ -12,17 +12,22 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
+require("luci.tools.webadmin")
 arg[1] = arg[1] or ""
-
 m = Map("network", translate("interfaces"), translate("a_n_ifaces1"))
 
-s = m:section(NamedSection, arg[1], "interface", translate("interfaces"))
+s = m:section(NamedSection, arg[1], "interface")
 s.addremove = true
 
+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:value("static", translate("static"))
 p:value("dhcp", "DHCP")
 p:value("pppoe", "PPPoE")
+p:value("ppp", "PPP")
 p:value("pptp", "PPTP")
 p.default = "static"
 
@@ -38,6 +43,50 @@ for i,d in ipairs(luci.sys.net.devices()) do
 	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
+		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")
+end
 
 ipaddr = s:option(Value, "ipaddr", translate("ipaddress"))
 ipaddr.rmempty = true
@@ -77,31 +126,83 @@ mtu.isinteger = true
 mac = s:option(Value, "macaddr", translate("macaddress"))
 mac.optional = true
 
+
+srv = s:option(Value, "server", translate("network_interface_server"))
+srv:depends("proto", "pptp")
+srv.rmempty = true
+
 user = s:option(Value, "username", translate("username"))
 user.rmempty = true
 user:depends("proto", "pptp")
-user:depends("proto", "ppoe")
+user:depends("proto", "pppoe")
+user:depends("proto", "ppp")
 
 pass = s:option(Value, "password", translate("password"))
 pass.rmempty = true
 pass:depends("proto", "pptp")
-pass:depends("proto", "ppoe")
+pass:depends("proto", "pppoe")
+pass:depends("proto", "ppp")
 
-ka = s:option(Value, "keepalive")
+ka = s:option(Value, "keepalive",
+ translate("network_interface_keepalive"),
+ translate("network_interface_keepalive_desc")
+)
 ka.rmempty = true
 ka:depends("proto", "pptp")
-ka:depends("proto", "ppoe")
+ka:depends("proto", "pppoe")
+ka:depends("proto", "ppp")
 
-demand = s:option(Value, "demand")
+demand = s:option(Value, "demand",
+ translate("network_interface_demand"),
+ translate("network_interface_demand_desc")
+)
 demand.rmempty = true
 demand:depends("proto", "pptp")
-demand:depends("proto", "ppoe")
-
-srv = s:option(Value, "server")
-srv:depends("proto", "pptp")
-srv.rmempty = true
-
-
+demand:depends("proto", "pppoe")
+demand:depends("proto", "ppp")
+
+device = s:option(Value, "device",
+ translate("network_interface_device"),
+ translate("network_interface_device_desc")
+)
+device.rmempty = true
+device:depends("proto", "ppp")
+
+defaultroute = s:option(Flag, "defaultroute",
+ translate("network_interface_defaultroute"),
+ translate("network_interface_defaultroute_desc")
+)
+defaultroute:depends("proto", "ppp")
+
+peerdns = s:option(Flag, "peerdns",
+ translate("network_interface_peerdns"),
+ translate("network_interface_peerdns_desc")
+)
+peerdns:depends("proto", "ppp")
+
+ipv6 = s:option(Flag, "ipv6", translate("network_interface_ipv6") )
+ipv6:depends("proto", "ppp")
+
+connect = s:option(Value, "connect",
+ translate("network_interface_connect"),
+ translate("network_interface_connect_desc")
+)
+connect.rmempty = true
+connect:depends("proto", "ppp")
+
+disconnect = s:option(Value, "disconnect",
+ translate("network_interface_disconnect"),
+ translate("network_interface_disconnect_desc")
+)
+disconnect.rmempty = true
+disconnect:depends("proto", "ppp")
+
+pppd_options = s:option(Value, "pppd_options",
+ translate("network_interface_pppd_options"),
+ translate("network_interface_pppd_options_desc")
+)
+pppd_options.rmempty = true
+pppd_options:depends("proto", "ppp")
 
 
 s2 = m:section(TypedSection, "alias", translate("aliases"))