|
|
@@ -1,56 +0,0 @@
|
|
|
---- openvpn-2.3.10.orig/tests/t_client.sh 2016-01-04 13:18:21.000000000 +0100
|
|
|
-+++ openvpn-2.3.10/tests/t_client.sh 2016-02-07 15:19:08.000000000 +0100
|
|
|
-@@ -1,4 +1,4 @@
|
|
|
--#!/bin/sh
|
|
|
-+#!/bin/bash
|
|
|
- #
|
|
|
- # run OpenVPN client against ``test reference'' server
|
|
|
- # - check that ping, http, ... via tunnel works
|
|
|
-@@ -86,12 +86,12 @@ fail()
|
|
|
- get_ifconfig_route()
|
|
|
- {
|
|
|
- # linux / iproute2? (-> if configure got a path)
|
|
|
-- if [ -n "/usr/sbin/ip" ]
|
|
|
-+ if [ -n "/bin/ip" ]
|
|
|
- then
|
|
|
- echo "-- linux iproute2 --"
|
|
|
-- /usr/sbin/ip addr show | grep -v valid_lft
|
|
|
-- /usr/sbin/ip route show
|
|
|
-- /usr/sbin/ip -o -6 route show | grep -v ' cache' | sed -E -e 's/ expires [0-9]*sec//' -e 's/ (mtu|hoplimit|cwnd|ssthresh) [0-9]+//g' -e 's/ (rtt|rttvar) [0-9]+ms//g'
|
|
|
-+ /bin/ip addr show | grep -v valid_lft
|
|
|
-+ /bin/ip route show
|
|
|
-+ /bin/ip -o -6 route show | grep -v ' cache' | sed -E -e 's/ expires [0-9]*sec//' -e 's/ (mtu|hoplimit|cwnd|ssthresh) [0-9]+//g' -e 's/ (rtt|rttvar) [0-9]+ms//g'
|
|
|
- return
|
|
|
- fi
|
|
|
-
|
|
|
-@@ -99,26 +99,26 @@ get_ifconfig_route()
|
|
|
- case `uname -s` in
|
|
|
- Linux)
|
|
|
- echo "-- linux / ifconfig --"
|
|
|
-- LANG=C /usr/sbin/ifconfig -a |egrep "( addr:|encap:)"
|
|
|
-+ LANG=C /sbin/ifconfig -a |egrep "( addr:|encap:)"
|
|
|
- LANG=C netstat -rn -4 -6
|
|
|
- return
|
|
|
- ;;
|
|
|
- FreeBSD|NetBSD|Darwin)
|
|
|
- echo "-- FreeBSD/NetBSD/Darwin [MacOS X] --"
|
|
|
-- /usr/sbin/ifconfig -a | egrep "(flags=|inet)"
|
|
|
-+ /sbin/ifconfig -a | egrep "(flags=|inet)"
|
|
|
- netstat -rn | awk '$3 !~ /^UHL/ { print $1,$2,$3,$NF }'
|
|
|
- return
|
|
|
- ;;
|
|
|
- OpenBSD)
|
|
|
- echo "-- OpenBSD --"
|
|
|
-- /usr/sbin/ifconfig -a | egrep "(flags=|inet)" | \
|
|
|
-+ /sbin/ifconfig -a | egrep "(flags=|inet)" | \
|
|
|
- sed -e 's/pltime [0-9]*//' -e 's/vltime [0-9]*//'
|
|
|
- netstat -rn | awk '$3 !~ /^UHL/ { print $1,$2,$3,$NF }'
|
|
|
- return
|
|
|
- ;;
|
|
|
- SunOS)
|
|
|
- echo "-- Solaris --"
|
|
|
-- /usr/sbin/ifconfig -a | egrep "(flags=|inet)"
|
|
|
-+ /sbin/ifconfig -a | egrep "(flags=|inet)"
|
|
|
- netstat -rn | awk '$3 !~ /^UHL/ { print $1,$2,$3,$6 }'
|
|
|
- return
|
|
|
- ;;
|