diff options
author | Arne Schwabe <arne@rfc2549.org> | 2013-06-21 12:48:28 +0200 |
---|---|---|
committer | Gert Doering <gert@greenie.muc.de> | 2013-07-03 20:48:35 +0200 |
commit | bdfd4ee4c0e3bcd46222b8425cea87a4c83bb37c (patch) | |
tree | 6141d1f0442d18a9573005984fd9c98405ea60a3 /configure.ac | |
parent | fd20880aaa3e085d6fb56f873a3de2d9ac2cf971 (diff) | |
download | openvpn-bdfd4ee4c0e3bcd46222b8425cea87a4c83bb37c.tar.gz openvpn-bdfd4ee4c0e3bcd46222b8425cea87a4c83bb37c.tar.xz openvpn-bdfd4ee4c0e3bcd46222b8425cea87a4c83bb37c.zip |
Add support of utun devices under Mac OS X
Mac OS X 10.7+ natively supports tun devices (called utun). The "standard"
utun.ko driver is sometimes problematic (e.g. VmWare Fusion 5 and tun.ko
do not work together).
When OpenVPN is compiled with utun support it will if no dev-node is given
first try to use utun and if that is not available will try the
traditional tun devices
v2: Fixed tap support, get device name via ioctl, add manage
v3.1: Fix compiling without if/utun.h, fix manage errors
v4/v5: Don't try open to dynamically open utun0 -255 when early utun
initialization fails, fix fallback to tun, give fatal error message when
utun fails but no tun fallback should be done
v6: add commit message change log, replace strstr with strncmp, move
v7: Throw error if a user does the strange combination of --dev tun
--dev-type tap and --dev-node utun
A lot good input on earlier patches by Jonathan K. Bullard
<jkbullard@gmail.com>
Parts of the patches are inspired from Peter Sagerson's
<psagers@ignorare.net> utun patch
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Tested-by: Jonathan K. Bullard <jkbullard@gmail.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1371811708-8528-1-git-send-email-arne@rfc2549.org>
URL: http://article.gmane.org/gmane.network.openvpn.devel/7739
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit fbc04bedbcce02fc625357b7475ddbc7164cabbf)
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 7b35e50..5994991 100644 --- a/configure.ac +++ b/configure.ac @@ -454,7 +454,7 @@ SOCKET_INCLUDES=" " AC_CHECK_HEADERS( - [net/if.h netinet/ip.h netinet/if_ether.h resolv.h sys/un.h], + [net/if.h netinet/ip.h netinet/if_ether.h resolv.h sys/un.h net/if_utun.h sys/kern_control.h], , , [[${SOCKET_INCLUDES}]] |