aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-12-22 19:50:48 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-12-22 19:50:48 +0000
commit33e81c4841d8a39d901a859eade35df6f00b36b8 (patch)
tree50b2059a041449f0f993ecec43bcb2e749f69822
parentAdded new option --route-method adaptive (Win32) (diff)
downloadopenvpn-33e81c4841d8a39d901a859eade35df6f00b36b8.tar.xz
Man page and usage message changes to reflect
--ip-win32 adaptive and --route-method adaptive. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@859 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to '')
-rw-r--r--openvpn.810
-rw-r--r--options.c3
2 files changed, 10 insertions, 3 deletions
diff --git a/openvpn.8 b/openvpn.8
index 3b14a3e..6a92cac 100644
--- a/openvpn.8
+++ b/openvpn.8
@@ -4347,8 +4347,12 @@ Which method
.B m
to use for adding routes on Windows?
+.B adaptive
+(default) -- Try IP helper API first. If that fails, fall
+back to the route.exe shell command.
+.br
.B ipapi
-(default) -- Use IP helper API.
+-- Use IP helper API.
.br
.B exe
-- Call the route.exe shell command.
@@ -4357,7 +4361,9 @@ to use for adding routes on Windows?
.B --dhcp-option type [parm]
Set extended TAP-Win32 TCP/IP properties, must
be used with
-.B --ip-win32 dynamic.
+.B --ip-win32 dynamic
+or
+.B --ip-win32 adaptive.
This option can be used to set additional TCP/IP properties
on the TAP-Win32 adapter, and is particularly useful for
configuring an OpenVPN client to access a Samba server
diff --git a/options.c b/options.c
index 6614c3e..903cb7d 100644
--- a/options.c
+++ b/options.c
@@ -530,7 +530,8 @@ static const char usage_message[] =
" lease-time: Lease time in seconds.\n"
" Default is one year.\n"
"--route-method : Which method to use for adding routes on Windows?\n"
- " ipapi (default) -- Use IP helper API.\n"
+ " adaptive (default) -- Try ipapi then fall back to exe.\n"
+ " ipapi -- Use IP helper API.\n"
" exe -- Call the route.exe shell command.\n"
"--dhcp-option type [parm] : Set extended TAP-Win32 properties, must\n"
" be used with --ip-win32 dynamic. For options\n"