X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fcore%2Fluasrc%2Fmodel%2Fnetwork.lua;h=56f1751f8195732409936a50571e0259f53123bd;hb=33fba71fc94b84c33b1e600da9b195eac49b2e31;hp=d06216433511895f3739a06c5c087f6939d8e6c7;hpb=699391a559dd91d5e0fc3feb28a7fc1edfc90cfb;p=project%2Fluci.git

diff --git a/libs/core/luasrc/model/network.lua b/libs/core/luasrc/model/network.lua
index d06216433..56f1751f8 100644
--- a/libs/core/luasrc/model/network.lua
+++ b/libs/core/luasrc/model/network.lua
@@ -20,8 +20,7 @@ limitations under the License.
 local type, next, pairs, ipairs, loadfile, table
 	= type, next, pairs, ipairs, loadfile, table
 
-local tonumber, tostring, math, i18n
-	= tonumber, tostring, math, luci.i18n
+local tonumber, tostring, math = tonumber, tostring, math
 
 local require = require
 
@@ -33,12 +32,13 @@ local sys = require "luci.sys"
 local utl = require "luci.util"
 local dsp = require "luci.dispatcher"
 local uci = require "luci.model.uci"
+local lng = require "luci.i18n"
 
 module "luci.model.network"
 
 
 IFACE_PATTERNS_VIRTUAL  = { }
-IFACE_PATTERNS_IGNORE   = { "^wmaster%d", "^wifi%d", "^hwsim%d", "^imq%d", "^ifb%d", "^mon%.wlan%d", "^sit%d", "^lo$" }
+IFACE_PATTERNS_IGNORE   = { "^wmaster%d", "^wifi%d", "^hwsim%d", "^imq%d", "^ifb%d", "^mon%.wlan%d", "^sit%d", "^gre%d", "^lo$" }
 IFACE_PATTERNS_WIRELESS = { "^wlan%d", "^wl%d", "^ath%d", "^%w+%.network%d" }
 
 
@@ -384,7 +384,17 @@ function del_network(self, n)
 
 		_uci_real:foreach("wireless", "wifi-iface",
 			function(s)
-				if s.network == n then
+				local net
+				local rest = { }
+				for net in utl.imatch(s.network) do
+					if net ~= n then
+						rest[#rest+1] = net
+					end
+				end
+				if #rest > 0 then
+					_uci_real:set("wireless", s['.name'], "network",
+					              table.concat(rest, " "))
+				else
 					_uci_real:delete("wireless", s['.name'], "network")
 				end
 			end)
@@ -421,8 +431,18 @@ function rename_network(self, old, new)
 
 			_uci_real:foreach("wireless", "wifi-iface",
 				function(s)
-					if s.network == old then
-						_uci_real:set("wireless", s['.name'], "network", new)
+					local net
+					local list = { }
+					for net in utl.imatch(s.network) do
+						if net == old then
+							list[#list+1] = new
+						else
+							list[#list+1] = net
+						end
+					end
+					if #list > 0 then
+						_uci_real:set("wireless", s['.name'], "network",
+						              table.concat(list, " "))
 					end
 				end)
 
@@ -585,6 +605,70 @@ function del_wifinet(self, net)
 	return false
 end
 
+function get_status_by_route(self, addr, mask)
+	local _, object
+	for _, object in ipairs(_ubus:objects()) do
+		local net = object:match("^network%.interface%.(.+)")
+		if net then
+			local s = _ubus:call(object, "status", {})
+			if s and s.route then
+				local rt
+				for _, rt in ipairs(s.route) do
+					if rt.target == addr and rt.mask == mask then
+						return net, s
+					end
+				end
+			end
+		end
+	end
+end
+
+function get_status_by_address(self, addr)
+	local _, object
+	for _, object in ipairs(_ubus:objects()) do
+		local net = object:match("^network%.interface%.(.+)")
+		if net then
+			local s = _ubus:call(object, "status", {})
+			if s and s['ipv4-address'] then
+				local a
+				for _, a in ipairs(s['ipv4-address']) do
+					if a.address == addr then
+						return net, s
+					end
+				end
+			end
+			if s and s['ipv6-address'] then
+				local a
+				for _, a in ipairs(s['ipv6-address']) do
+					if a.address == addr then
+						return net, s
+					end
+				end
+			end
+		end
+	end
+end
+
+function get_wannet(self)
+	local net = self:get_status_by_route("0.0.0.0", 0)
+	return net and network(net)
+end
+
+function get_wandev(self)
+	local _, stat = self:get_status_by_route("0.0.0.0", 0)
+	return stat and interface(stat.l3_device or stat.device)
+end
+
+function get_wan6net(self)
+	local net = self:get_status_by_route("::", 0)
+	return net and network(net)
+end
+
+function get_wan6dev(self)
+	local _, stat = self:get_status_by_route("::", 0)
+	return stat and interface(stat.l3_device or stat.device)
+end
+
 
 function network(name, proto)
 	if name then
@@ -640,9 +724,12 @@ function protocol.ifname(self)
 					num[s.device] = num[s.device]
 						and num[s.device] + 1 or 1
 
-					if s.network == self.sid then
-						ifname = "%s.network%d" %{ s.device, num[s.device] }
-						return false
+					local net
+					for net in utl.imatch(s.network) do
+						if net == self.sid then
+							ifname = "%s.network%d" %{ s.device, num[s.device] }
+							return false
+						end
 					end
 				end
 			end)
@@ -657,13 +744,13 @@ end
 function protocol.get_i18n(self)
 	local p = self:proto()
 	if p == "none" then
-		return i18n.translate("Unmanaged")
+		return lng.translate("Unmanaged")
 	elseif p == "static" then
-		return i18n.translate("Static address")
+		return lng.translate("Static address")
 	elseif p == "dhcp" then
-		return i18n.translate("DHCP client")
+		return lng.translate("DHCP client")
 	else
-		return i18n.translate("Unknown")
+		return lng.translate("Unknown")
 	end
 end
 
@@ -782,9 +869,12 @@ function protocol.is_empty(self)
 
 		_uci_real:foreach("wireless", "wifi-iface",
 			function(s)
-				if s.network == self.sid then
-					rv = false
-					return false
+				local n
+				for n in utl.imatch(s.network) do
+					if n == self.sid then
+						rv = false
+						return false
+					end
 				end
 			end)
 
@@ -838,9 +928,13 @@ function protocol.get_interface(self)
 			function(s)
 				if s.device then
 					num[s.device] = num[s.device] and num[s.device] + 1 or 1
-					if s.network == self.sid then
-						ifn = "%s.network%d" %{ s.device, num[s.device] }
-						return false
+
+					local net
+					for net in utl.imatch(s.network) do
+						if net == self.sid then
+							ifn = "%s.network%d" %{ s.device, num[s.device] }
+							return false
+						end
 					end
 				end
 			end)
@@ -869,9 +963,13 @@ function protocol.get_interfaces(self)
 			function(s)
 				if s.device then
 					num[s.device] = num[s.device] and num[s.device] + 1 or 1
-					if s.network == self.sid then
-						ifn = "%s.network%d" %{ s.device, num[s.device] }
-						wfs[ifn] = interface(ifn, self)
+
+					local net
+					for net in utl.imatch(s.network) do
+						if net == self.sid then
+							ifn = "%s.network%d" %{ s.device, num[s.device] }
+							wfs[ifn] = interface(ifn, self)
+						end
 					end
 				end
 			end)
@@ -991,7 +1089,7 @@ end
 function interface.get_i18n(self)
 	if self.wif then
 		return "%s: %s %q" %{
-			i18n.translate("Wireless Network"),
+			lng.translate("Wireless Network"),
 			self.wif:active_mode(),
 			self.wif:active_ssid() or self.wif:active_bssid()
 		}
@@ -1003,17 +1101,17 @@ end
 function interface.get_type_i18n(self)
 	local x = self:type()
 	if x == "wifi" then
-		return i18n.translate("Wireless Adapter")
+		return lng.translate("Wireless Adapter")
 	elseif x == "bridge" then
-		return i18n.translate("Bridge")
+		return lng.translate("Bridge")
 	elseif x == "switch" then
-		return i18n.translate("Ethernet Switch")
+		return lng.translate("Ethernet Switch")
 	elseif x == "vlan" then
-		return i18n.translate("VLAN Interface")
+		return lng.translate("VLAN Interface")
 	elseif x == "tunnel" then
-		return i18n.translate("Tunnel Interface")
+		return lng.translate("Tunnel Interface")
 	else
-		return i18n.translate("Ethernet Adapter")
+		return lng.translate("Ethernet Adapter")
 	end
 end
 
@@ -1324,7 +1422,7 @@ function wifinet.active_mode(self)
 end
 
 function wifinet.active_mode_i18n(self)
-	return i18n.translate(self:active_mode())
+	return lng.translate(self:active_mode())
 end
 
 function wifinet.active_ssid(self)
@@ -1413,15 +1511,15 @@ end
 
 function wifinet.shortname(self)
 	return "%s %q" %{
-		i18n.translate(self:active_mode()),
+		lng.translate(self:active_mode()),
 		self:active_ssid() or self:active_bssid()
 	}
 end
 
 function wifinet.get_i18n(self)
 	return "%s: %s %q (%s)" %{
-		i18n.translate("Wireless Network"),
-		i18n.translate(self:active_mode()),
+		lng.translate("Wireless Network"),
+		lng.translate(self:active_mode()),
 		self:active_ssid() or self:active_bssid(),
 		self:ifname()
 	}