From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 18 Jul 2012 11:25:37 +0000 (+0000)
Subject: luci-0.10: merge r8886
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d9f43242dfac3358f834c90ebf83ad18b4848874;p=oweals%2Fluci.git

luci-0.10: merge r8886
---

diff --git a/libs/sys/luasrc/sys.lua b/libs/sys/luasrc/sys.lua
index 6e06d0c72..985d70e32 100644
--- a/libs/sys/luasrc/sys.lua
+++ b/libs/sys/luasrc/sys.lua
@@ -451,35 +451,42 @@ function net.routes6(callback)
 				"([a-f0-9]+) +([^%s]+)"
 			)
 
-			src_ip = luci.ip.Hex(
-				src_ip, tonumber(src_prefix, 16), luci.ip.FAMILY_INET6, false
-			)
-
-			dst_ip = luci.ip.Hex(
-				dst_ip, tonumber(dst_prefix, 16), luci.ip.FAMILY_INET6, false
-			)
-
-			nexthop = luci.ip.Hex( nexthop, 128, luci.ip.FAMILY_INET6, false )
-
-			local rt = {
-				source   = src_ip,
-				dest     = dst_ip,
-				nexthop  = nexthop,
-				metric   = tonumber(metric, 16),
-				refcount = tonumber(refcnt, 16),
-				usecount = tonumber(usecnt, 16),
-				flags    = tonumber(flags, 16),
-				device   = dev,
-
-				-- lua number is too small for storing the metric
-				-- add a metric_raw field with the original content
-				metric_raw = metric
-			}
+			if dst_ip and dst_prefix and
+			   src_ip and src_prefix and
+			   nexthop and metric and
+			   refcnt and usecnt and
+			   flags and dev
+			then
+				src_ip = luci.ip.Hex(
+					src_ip, tonumber(src_prefix, 16), luci.ip.FAMILY_INET6, false
+				)
+
+				dst_ip = luci.ip.Hex(
+					dst_ip, tonumber(dst_prefix, 16), luci.ip.FAMILY_INET6, false
+				)
+
+				nexthop = luci.ip.Hex( nexthop, 128, luci.ip.FAMILY_INET6, false )
+
+				local rt = {
+					source   = src_ip,
+					dest     = dst_ip,
+					nexthop  = nexthop,
+					metric   = tonumber(metric, 16),
+					refcount = tonumber(refcnt, 16),
+					usecount = tonumber(usecnt, 16),
+					flags    = tonumber(flags, 16),
+					device   = dev,
+
+					-- lua number is too small for storing the metric
+					-- add a metric_raw field with the original content
+					metric_raw = metric
+				}
 
-			if callback then
-				callback(rt)
-			else
-				routes[#routes+1] = rt
+				if callback then
+					callback(rt)
+				else
+					routes[#routes+1] = rt
+				end
 			end
 		end