Add documentation for macOS vmnet devices

diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in
index 31c0bea8e7e117d484c77ad262483fc8c068513b..75f5f403b91227215d99c5023b9dae500fda0a4a 100644 (file)
--- a/doc/tinc.conf.5.in
+++ b/doc/tinc.conf.5.in
@@ -273,8 +273,12 @@ followed by an IP header.
 This mode should support both IPv4 and IPv6 packets.
 .It utun Pq 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.
+.It vmnet Pq OS X
+Set type to vmnet.
+Like with tap, Tinc will expect packets read from the virtual network device
+to start with an Ethernet header.
+Use VmnetAddr and VmnetNetmask settings to configure the device address/network
 .It tap Pq BSD and Linux
 Set type to tap.
 Tinc will expect packets read from the virtual network device

diff --git a/doc/tinc.texi b/doc/tinc.texi
index 81283e4a7cac4d73b420e116cdf91dd7d0240524..7fe8e503d3095e392a7e722ac56ec8e5a724fa13 100644 (file)
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -308,10 +308,16 @@ Tinc also supports the driver from @uref{http://tuntaposx.sourceforge.net/},
 which supports both tun and tap style devices,
 
 By default, tinc expects the tuntaposx driver to be installed.
-To use the utun driver, set add @samp{Device = utunX} to @file{tinc.conf},
+To use the utun driver, add @samp{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.
 
+On OS X version 14 and above tinc supports the build-in "vmnet" driver.
+Use this driver if you need to run Tinc in "switch" mode on more recent Macs.
+To use the vmnet driver add @samp{DeviceType = vmnet} to @file{tinc.conf}.
+"vmnet" devices have a fixed network configuration and cannot be configured with the
+@file{tinc-up} script. Use @samp{VmnetAddr = X.X.X.X} and @samp{VmnetNetmask = X.X.X.X}
+to configure the host side of a vmnet device.
 
 @c ==================================================================
 @node       Configuration of Windows