diff options
| author | James Yonan <james@openvpn.net> | 2011-03-27 09:20:13 +0000 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2011-04-26 22:29:11 +0200 |
| commit | e9f8696f3981fc493501082d996340c9021919c7 (patch) | |
| tree | 5a7678b4ed04d1a0fbbaa1ddac119b378c61757d | |
| parent | Added "auth-token" client directive, which is intended to be (diff) | |
| download | openvpn-e9f8696f3981fc493501082d996340c9021919c7.tar.xz | |
Added ./configure --enable-osxipconfig option for Mac OS X which will
enable the use of ipconfig (instead of ifconfig) for configuring the
IP address and netmask of the tun/tap adapter.
Version 2.1.3p
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7092 e7ae566f-a301-0410-adde-c780ea21d3b5
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | tun.c | 21 | ||||
| -rw-r--r-- | version.m4 | 2 |
3 files changed, 26 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 729ce40..342074f 100644 --- a/configure.ac +++ b/configure.ac @@ -176,6 +176,11 @@ AC_ARG_ENABLE(iproute2, test $enableval = "yes" && AC_DEFINE(CONFIG_FEATURE_IPROUTE, 1, [enable iproute2 support]) ) +AC_ARG_ENABLE(osxipconfig, + [ --enable-osxipconfig Enable support for ipconfig on OS X], + test $enableval = "yes" && AC_DEFINE(DARWIN_USE_IPCONFIG, 1, [Enable support for ipconfig on OS X]) +) + AC_ARG_ENABLE(def-auth, [ --disable-def-auth Disable deferred authentication], [DEF_AUTH="$enableval"], @@ -786,7 +786,24 @@ do_ifconfig (struct tuntap *tt, tt->did_ifconfig = true; #elif defined(TARGET_DARWIN) - +#ifdef DARWIN_USE_IPCONFIG + if (tun) + { + msg (M_FATAL, "Error: tun point-to-point mode not supported on Darwin when DARWIN_USE_IPCONFIG is defined"); + } + else + { + argv_printf (&argv, + "/usr/sbin/ipconfig set %s MANUAL %s %s", + actual, + ifconfig_local, + ifconfig_remote_netmask + ); + } + argv_msg (M_INFO, &argv); + openvpn_execve_check (&argv, es, S_FATAL, "Mac OS X ipconfig failed"); + tt->did_ifconfig = true; +#else /* * Darwin (i.e. Mac OS X) seems to exhibit similar behaviour to OpenBSD... */ @@ -832,9 +849,11 @@ do_ifconfig (struct tuntap *tt, tun_mtu ); } + argv_msg (M_INFO, &argv); openvpn_execve_check (&argv, es, S_FATAL, "Mac OS X ifconfig failed"); tt->did_ifconfig = true; +#endif /* Add a network route for the local tun interface */ if (!tun && tt->topology == TOP_SUBNET) @@ -1,5 +1,5 @@ dnl define the OpenVPN version -define(PRODUCT_VERSION,[2.1.3o]) +define(PRODUCT_VERSION,[2.1.3p]) dnl define the TAP version define(PRODUCT_TAP_ID,[tap0901]) define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9]) |