From bd1376e986bf8c6bb54741ab75b92d99b48c8339 Mon Sep 17 00:00:00 2001
From: Katze Miau <miaukatzemiau@priveasy.de>
Date: Tue, 20 Dec 2011 19:37:16 +0000
Subject: test if interface is up during /sbin/test_connectivity

Check if the interface is running before trying to ping. This reduces
the execution time of test_connectivity in common non-gateway
deployments.

diff --git a/files/common/sbin/test_connectivity b/files/common/sbin/test_connectivity
index 9173cca..a8fe810 100755
--- a/files/common/sbin/test_connectivity
+++ b/files/common/sbin/test_connectivity
@@ -3,6 +3,10 @@
 TestHosts="4.2.2.4 8.8.8.8"
 PingTrials=2
 
+iftest () {
+    ifconfig $1 2>/dev/null | grep -q RUNNING
+}
+
 pingtest () {
     # TODO: replace with something parallel
     for i in $(seq 1 $PingTrials); do
@@ -17,10 +21,10 @@ pingtest () {
 
 case "$1" in
     internet)
-	pingtest eth1 $TestHosts
+	iftest eth1 && pingtest eth1 $TestHosts
 	;;
     vpn)
-	pingtest tun0 $TestHosts
+	iftest tun0 && pingtest tun0 $TestHosts
 	;;
     *)
 	echo "Usage:
-- 
cgit v0.10.1