--- badi/public_scripts/switchgate/switchgate	2010/08/18 10:40:25	1.6
+++ badi/public_scripts/switchgate/switchgate	2017/03/28 21:44:24	1.8
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-# switchhgate 0.0.3
-# (c) 2005 under GPL by Adrian Zaugg
+# switchhgate 0.0.5
+# (c) 2005-2010 under GPL by Adrian Zaugg
 
 # switchgate pings a set of hosts to determine the state of the internet connectivity. If
 # the connection is down, it can change the default gateway to an alternative gateway.
@@ -18,7 +18,7 @@ DHCP_TMP_DIR=/tmp/switchgate
 
 # eMail address to send alert messages, if not operating on the
 # standard default gateway
-ALERT_EMAIL="adi@ente.limmat.ch, hauswartung@dasdreieck.ch"
+ALERT_EMAIL="adi@ente.limmat.ch"
 
 # Host set to ping. A file containing IP addresses, each on a single line.
 # Do not include any local hosts, list only hosts located behind your gateways.
@@ -28,7 +28,7 @@ HOSTSET_FILE="$CONFIG_PATH/hostset"
 GATEWAYS_FILE="$CONFIG_PATH/gateways"
 
 # path to fping
-PING=/usr/sbin/fping
+PING=/usr/bin/fping
 
 # answer of fping to reachable hosts
 ALIVE_ANSWER="is alive"
@@ -59,15 +59,15 @@ function readgwlist {
 		fi
 
 		allgates=`grep -ve "^[ 	]*[\#]\+.*$" "$GATEWAYS_FILE" | xargs`
+		alldhcpgates=""
 		for gate in $allgates; do
-			if [[ $(echo "$gate" | grep -c -e "^[:space:]*dhcp\..*$") -eq 1 && \
-			      -f "$CONFIG_PATH/$gate" ]]; then
+			if [[ $(echo "$gate" | grep -c -e "^[[:space:]]*dhcp\..*$") -eq 1 && \
+			      -f "$DHCP_TMP_DIR/$gate" ]]; then
 				# Read dhcp supplied gate for a specific interface
-				alldhcpgates=`grep -e "^[^\#].*$" "$CONFIG_PATH/$gate" | xargs`
-			elif [[ $(echo "$gate" | grep -c -e "^[:space:]*dhcp[:space:]*$") -eq 1 ]]; then
+				alldhcpgates="$alldhcpgates `grep -e "^[^\#].*$" "$DHCP_TMP_DIR/$gate" | xargs`"
+			elif [[ $(echo "$gate" | grep -c -e "^[[:space:]]*dhcp[[:space:]]*$") -eq 1 ]]; then
 				# Read all dhcp files
-				alldhcpgates=""
-				for dhcpfile in $(echo -n $(ls -1 $DHCP_TMP_DIR/dhcp* 2>/dev/null)); do 
+				for dhcpfile in $(echo -n $(ls -1 $DHCP_TMP_DIR/dhcp* 2>/dev/null)); do
 					alldhcpgates="$alldhcpgates `grep -e "^[^\#].*$" "$dhcpfile" | xargs`"
 				done
 			else
@@ -370,9 +370,15 @@ elif [ "$CURRENTGW_ID" != 0 ]; then
 	fi
 fi
 
-if [ "$DEBUG" = "low" ]; then
-   echo
-   echo "Current Default Gateway: $CURRENTGW ($CURRENTGW_ID)"
-   echo
+if [ "$DEBUG" = "low" -o "$DEBUG" = "choke" ]; then
+	if [ -n "$UP" ]; then
+	   echo
+	   echo "Current Default Gateway: $CURRENTGW ($CURRENTGW_ID)"
+	   echo
+	else
+	   echo
+	   echo "No connection."
+	   echo
+	fi
 fi
 exit 0