From 92428805b2836bbd1e0aeb3dc85f16f5ee0dd8ae Mon Sep 17 00:00:00 2001
From: Ycarus <ycarus@zugaina.org>
Date: Tue, 10 Jul 2018 16:19:18 +0200
Subject: [PATCH] Add IPv6 tunnel check

---
 .../luasrc/controller/openmptcprouter.lua                | 9 ++++++++-
 .../luasrc/view/openmptcprouter/wanstatus.htm            | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index f8cf1cffa..c3b2ccc2c 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -457,14 +457,21 @@ function interfaces_status()
 				peer = ut.trim(sys.exec("ip -4 r list dev " .. tun_dev .. " | grep kernel | awk '/proto kernel/ {print $1}' | grep -v / | tr -d '\n'"))
 			end
 			if peer ~= "" then
-				local tunnel_ping_test = ut.trim(sys.exec("ping -W 1 -c 1 " .. peer .. " | grep '100% packet loss'"))
+				local tunnel_ping_test = ut.trim(sys.exec("ping -W 1 -c 1 " .. peer .. " -I " .. tun_dev .. " | grep '100% packet loss'"))
 				if tunnel_ping_test == "" then
 					mArray.openmptcprouter["tun_state"] = 'UP'
 				else
 					mArray.openmptcprouter["tun_state"] = 'DOWN'
 				end
+				local tunnel_ping6_test = ut.trim(sys.exec("ping6 -W 1 -c 1 fe80::a00:1 -I 6in4-omr6in4 | grep '100% packet loss'"))
+				if tunnel_ping6_test == "" then
+					mArray.openmptcprouter["tun6_state"] = 'UP'
+				else
+					mArray.openmptcprouter["tun6_state"] = 'DOWN'
+				end
 			else
 				mArray.openmptcprouter["tun_state"] = 'DOWN'
+				mArray.openmptcprouter["tun6_state"] = 'DOWN'
 			end
 		end
 	end
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
index c98838fd2..e6f9a386e 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
@@ -142,6 +142,10 @@
 					{
 						statusMessage += 'VPN tunnel DOWN<br/>';
 					}
+					if (mArray.openmptcprouter.tun6_state == "DOWN")
+					{
+						statusMessage += 'VPN IPv6 tunnel DOWN<br/>';
+					}
 					if (statusMessage !== "")
 					{
 						statusMessageClass = "warning";