aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--route.c2
-rwxr-xr-xt_cltsrv.sh13
-rw-r--r--tun.c14
3 files changed, 25 insertions, 4 deletions
diff --git a/route.c b/route.c
index 5ca48bc..0b9a78e 100644
--- a/route.c
+++ b/route.c
@@ -936,6 +936,8 @@ delete_route (const struct route *r, const struct tuntap *tt, unsigned int flags
network,
netmask);
#endif /*CONFIG_FEATURE_IPROUTE*/
+ if (r->metric_defined)
+ buf_printf (&buf, " metric %d", r->metric);
msg (D_ROUTE, "%s", BSTR (&buf));
system_check (BSTR (&buf), es, 0, "ERROR: Linux route delete command failed");
diff --git a/t_cltsrv.sh b/t_cltsrv.sh
index 65c12ab..b72d1ee 100755
--- a/t_cltsrv.sh
+++ b/t_cltsrv.sh
@@ -1,7 +1,7 @@
#! /bin/sh
#
# t_cltsrv.sh - script to test OpenVPN's crypto loopback
-# Copyright (C) 2005 Matthias Andree
+# Copyright (C) 2005,2006 Matthias Andree
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -19,7 +19,6 @@
# 02110-1301, USA.
set -e
-echo "the following test will run about two minutes..." >&2
trap "rm -f log.$$ log.$$.signal ; trap 0 ; exit 77" 1 2 15
trap "rm -f log.$$ log.$$.signal ; exit 1" 0 3
addopts=
@@ -27,11 +26,19 @@ case `uname -s` in
FreeBSD)
# FreeBSD jails map the outgoing IP to the jail IP - we need to
# allow the real IP unless we want the test to run forever.
- if test `sysctl -n security.jail.jailed` != 0 ; then
+ if test "`sysctl 2>/dev/null -n security.jail.jailed`" = 1 \
+ || ps -ostate= -p $$ | grep -q J; then
addopts="--float"
+ if test "x`ifconfig | grep inet`" = x ; then
+ echo "###"
+ echo "### To run the test in a FreeBSD jail, you MUST add an IP alias for the jail's IP."
+ echo "###"
+ exit 1
+ fi
fi
;;
esac
+echo "the following test will take about two minutes..." >&2
set +e
(
./openvpn --cd "${srcdir}" ${addopts} --down 'echo "srv:${signal}" >&3 ; : #' --tls-exit --ping-exit 180 --config sample-config-files/loopback-server &
diff --git a/tun.c b/tun.c
index 26d7cef..971b2ce 100644
--- a/tun.c
+++ b/tun.c
@@ -720,7 +720,19 @@ do_ifconfig (struct tuntap *tt,
tun_mtu
);
else
- no_tap_ifconfig ();
+ /*
+ * NetBSD has distinct tun and tap devices
+ * so we don't need the "link0" extra parameter to specify we want to do
+ * tunneling at the ethernet level
+ */
+ openvpn_snprintf (command_line, sizeof (command_line),
+ IFCONFIG_PATH " %s %s netmask %s mtu %d broadcast %s",
+ actual,
+ ifconfig_local,
+ ifconfig_remote_netmask,
+ tun_mtu,
+ ifconfig_broadcast
+ );
msg (M_INFO, "%s", command_line);
system_check (command_line, es, S_FATAL, "NetBSD ifconfig failed");
tt->did_ifconfig = true;