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=a832f39f4dc1d72ab1b6077104fa7f2177f87da4;hp=6d1fb4f391bb1bc271aa9facff2edf04ad078b05;hb=5a70b00f60389eae965c34507cdf01659b076c95;hpb=e42779fcabec3995b87a50e233e95a2f3f7bc466

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 6d1fb4f39..a832f39f4 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua
@@ -19,10 +19,15 @@ m = Map("network", translate("interfaces"), translate("a_n_ifaces1"))
 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"
 
@@ -39,40 +44,48 @@ for i,d in ipairs(luci.sys.net.devices()) do
 end
 
 local zones = luci.tools.webadmin.network_get_zones(arg[1])
-if zones and #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])
-	luci.model.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 = luci.model.uci.section("firewall", "zone", nil, {
-				name = value,
-				network = section
-			})
-		else
-			local net = luci.model.uci.get("firewall", zone, "network")
-			net = (net or value) .. " " .. section
-			stat = luci.model.uci.set("firewall", zone, "network", net)
-		end
-		
-		if stat then
-			self.render = function() end
+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"))
@@ -122,11 +135,13 @@ user = s:option(Value, "username", translate("username"))
 user.rmempty = true
 user:depends("proto", "pptp")
 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", "pppoe")
+pass:depends("proto", "ppp")
 
 ka = s:option(Value, "keepalive",
  translate("network_interface_keepalive"),
@@ -135,16 +150,59 @@ ka = s:option(Value, "keepalive",
 ka.rmempty = true
 ka:depends("proto", "pptp")
 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", "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.optional = true
+connect:depends("proto", "ppp")
 
+disconnect = s:option(Value, "disconnect",
+ translate("network_interface_disconnect"),
+ translate("network_interface_disconnect_desc")
+)
+disconnect.optional = 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.optional = true
+pppd_options:depends("proto", "ppp")
 
 
 s2 = m:section(TypedSection, "alias", translate("aliases"))