Documented --ip-win32 adaptive.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@768 e7ae566f-a301-0410-adde-c780ea21d3b5

1 files changed, 30 insertions, 1 deletions

diff --git a/openvpn.8 b/openvpn.8
index 6bfe5a3..8f7aaba 100644
--- a/openvpn.8
+++ b/openvpn.8
@@ -4169,7 +4169,7 @@ adapter manually and indicating the IP/netmask which
 OpenVPN expects the adapter to be set to.
 
 .B dynamic [offset] [lease-time] --
-(Default) Automatically set the IP address and netmask by replying to
+Automatically set the IP address and netmask by replying to
 DHCP query messages generated by the kernel.  This mode is
 probably the "cleanest" solution
 for setting the TCP/IP properties since it uses the well-known
@@ -4220,6 +4220,35 @@ that it works okay in practice.  If you use this option,
 it is best to leave the TCP/IP properties for the TAP-Win32
 adapter in their default state, i.e. "Obtain an IP address
 automatically."
+
+.B adaptive --
+(Default) Try
+.B dynamic
+method initially and fail over to
+.B netsh
+if the DHCP negotiation with the TAP-Win32 adapter does
+not succeed in 20 seconds.  Such failures have been known
+to occur when certain third-party firewall packages installed
+on the client machine block the DHCP negotiation used by
+the TAP-Win32 adapter.
+Note that if the
+.B netsh
+failover occurs, the TAP-Win32 adapter
+TCP/IP properties will be reset from DHCP to static, and this
+will cause future OpenVPN startups using the
+.B adaptive
+mode to use
+.B netsh
+immediately, rather than trying
+.B dynamic
+first.  To "unstick" the
+.B adaptive
+mode from using
+.B netsh,
+run OpenVPN at least once using the
+.B dynamic
+mode to restore the TAP-Win32 adapter TCP/IP properties
+to a DHCP configuration.
 .\"*********************************************************
 .TP
 .B --route-method m