Attachment #346390 for bug #466908

Lines 308-314 Link Here

(-)openvpn-2.3.0.orig/src/openvpn/misc.h (-1 / +1 lines)
308	#endif	308	#endif
309		309
310	/*	310	/*
311	* /sbin/ip path, may be overridden	311	* /bin/ip path, may be overridden
312	*/	312	*/
313	#ifdef ENABLE_IPROUTE	313	#ifdef ENABLE_IPROUTE
314	extern const char *iproute_path;	314	extern const char *iproute_path;




get_ifconfig_route()
{
    # linux / iproute2? (-> if configure got a path)
    if [ -n "/bin/ip" ]
    then
	echo "-- linux iproute2 --"
	/bin/ip addr show     | grep -v valid_lft
	/bin/ip route show
	/bin/ip -o -6 route show | grep -v ' cache' | sed -e 's/expires [0-9]*sec//'
	return
    fi


Return to bug 466908

Lines 86-97 Link Here

(-)openvpn-2.3.0.orig/tests/t_client.sh (-4 / +4 lines)
86	get_ifconfig_route()	86	get_ifconfig_route()
87	{	87	{
88	# linux / iproute2? (-> if configure got a path)	88	# linux / iproute2? (-> if configure got a path)
89	if [ -n "/sbin/ip" ]	89	if [ -n "/bin/ip" ]
90	then	90	then
91	echo "-- linux iproute2 --"	91	echo "-- linux iproute2 --"
92	/sbin/ip addr show \| grep -v valid_lft	92	/bin/ip addr show \| grep -v valid_lft
93	/sbin/ip route show	93	/bin/ip route show
94	/sbin/ip -o -6 route show \| grep -v ' cache' \| sed -e 's/expires [0-9]*sec//'	94	/bin/ip -o -6 route show \| grep -v ' cache' \| sed -e 's/expires [0-9]*sec//'
95	return	95	return
96	fi	96	fi
97		97