From cf906790a88cc4489fd4677aa6b9c5f6a7146488 Mon Sep 17 00:00:00 2001 From: James Yonan Date: Tue, 19 Apr 2011 10:28:06 +0000 Subject: Revert r7092 and r7151, i.e. remove --enable-osxipconfig configure option. ipconfig on Mac has certain behavior that makes it unsuitable for use by OpenVPN to configure tun/tap interface. Version 2.1.3u git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7191 e7ae566f-a301-0410-adde-c780ea21d3b5 --- tun.c | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'tun.c') diff --git a/tun.c b/tun.c index f2dec25..f1b132c 100644 --- a/tun.c +++ b/tun.c @@ -786,34 +786,6 @@ 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); - { - int i; - const int n = 15; - for (i = 1; i <= n; ++i) /* OSX 10.5 needs retry */ - { - if (openvpn_execve_check (&argv, es, (i == n) ? S_FATAL : 0, "Mac OS X ipconfig failed")) - break; - msg (M_INFO, "Retry #%d", i); - openvpn_sleep(1); - } - } - tt->did_ifconfig = true; -#else /* * Darwin (i.e. Mac OS X) seems to exhibit similar behaviour to OpenBSD... */ @@ -863,7 +835,6 @@ do_ifconfig (struct tuntap *tt, 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) -- cgit