Update support for BSD tun/tap devices, add support for OS X utun interfaces.

[tinc] / doc / tinc.texi

diff --git a/doc/tinc.texi b/doc/tinc.texi
index 53ce4a3..f3bb1d2 100644 (file)
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -307,15 +307,14 @@ If the @file{net/if_tun.h} header file is missing, install it from the source pa
 @subsection Configuration of Darwin (MacOS/X) kernels
 
 Tinc on Darwin relies on a tunnel driver for its data acquisition from the kernel.
 @subsection Configuration of Darwin (MacOS/X) kernels
 
 Tinc on Darwin relies on a tunnel driver for its data acquisition from the kernel.

-Tinc supports either the driver from @uref{http://tuntaposx.sourceforge.net/},
+OS X version 10.6.8 and later have a built-in tun driver called "utun".
+Tinc also supports the driver from @uref{http://tuntaposx.sourceforge.net/},

 which supports both tun and tap style devices,
 which supports both tun and tap style devices,

-and also the driver from from @uref{http://chrisp.de/en/projects/tunnel.html}.
-The former driver is recommended.
-The tunnel driver must be loaded before starting tinc with the following command:

 
 

-@example
-kmodload tunnel
-@end example
+By default, tinc expects the tuntaposx driver to be installed.
+To use the utun driver, set add @code{Device = utunX} to @file{tinc.conf},
+where X is the desired number for the utun interface.
+You can also omit the number, in which case the first free number will be chosen.

 
 
 @c ==================================================================
 
 
 @c ==================================================================


@@ -999,6 +998,12 @@ to start with a four byte header containing the address family,
 followed by an IP header.
 This mode should support both IPv4 and IPv6 packets.
 
 followed by an IP header.
 This mode should support both IPv4 and IPv6 packets.
 

+@cindex utun
+@item utun (OS X)
+Set type to utun.
+This is only supported on OS X version 10.6.8 and higher, but doesn't require the tuntaposx module.
+This mode should support both IPv4 and IPv6 packets.
+

 @item tap (BSD and Linux)
 Set type to tap.
 Tinc will expect packets read from the virtual network device
 @item tap (BSD and Linux)
 Set type to tap.
 Tinc will expect packets read from the virtual network device