summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/inc/vpn.inc2
-rwxr-xr-xusr/local/bin/ping_hosts.sh6
2 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index f6557b5..c40c472 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -214,7 +214,7 @@ function vpn_ipsec_configure($ipchg = false)
$family = "inet";
}
if (is_ipaddr($srcip))
- $ipsecpinghosts[] = "{$srcip}|{$dstip}|3|{$family}|\n";
+ $ipsecpinghosts[] = "{$srcip}|{$dstip}|3|||||{$family}|\n";
}
}
diff --git a/usr/local/bin/ping_hosts.sh b/usr/local/bin/ping_hosts.sh
index 19a6161..c0de5a1 100755
--- a/usr/local/bin/ping_hosts.sh
+++ b/usr/local/bin/ping_hosts.sh
@@ -68,10 +68,10 @@ for TOPING in $PINGHOSTS ; do
THRESHOLD=`echo $TOPING | cut -d"|" -f6`
WANTHRESHOLD=`echo $TOPING | cut -d"|" -f7`
AF=`echo $TOPING | cut -d"|" -f8`
- if [ "$AF" == "inet" ]; then
- PINGCMD=ping
- else
+ if [ "$AF" == "inet6" ]; then
PINGCMD=ping6
+ else
+ PINGCMD=ping
fi
echo Processing $DSTIP
# Look for a service being down
OpenPOWER on IntegriCloud