From a1b9e4c1ac4ea1ebccf485ba2eaeb9745ef88cae Mon Sep 17 00:00:00 2001 From: Selva Nair Date: Fri, 2 Dec 2016 14:42:09 -0500 Subject: [PATCH] Correctly state the default dhcp server address in man page Also correct the default ifconfig-pool end in docs and comments Signed-off-by: Selva Nair Acked-by: Gert Doering Message-Id: <1480707729-19578-1-git-send-email-selva.nair@gmail.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg13387.html Signed-off-by: Gert Doering (cherry picked from commit 251cc8f2042cc0cb8281230f7fb33f2cdec5b809) --- doc/openvpn.8 | 10 +++++----- src/openvpn/helper.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/openvpn.8 b/doc/openvpn.8 index 3c0cd4156..214073387 100644 --- a/doc/openvpn.8 +++ b/doc/openvpn.8 @@ -2754,10 +2754,10 @@ expands as follows: if dev tap OR (dev tun AND topology == subnet): ifconfig 10.8.0.1 255.255.255.0 if !nopool: - ifconfig-pool 10.8.0.2 10.8.0.254 255.255.255.0 - push "route-gateway 10.8.0.1" - if route-gateway unset: - route-gateway 10.8.0.2 + ifconfig\-pool 10.8.0.2 10.8.0.253 255.255.255.0 + push "route\-gateway 10.8.0.1" + if route\-gateway unset: + route\-gateway 10.8.0.2 .in -4 .ft @@ -5362,7 +5362,7 @@ virtual DHCP server address. In .B \-\-dev tun mode, OpenVPN will cause the DHCP server to masquerade as if it were coming from the remote endpoint. The optional offset parameter is -an integer which is > \-256 and < 256 and which defaults to 0. +an integer which is > \-256 and < 256 and which defaults to -1. If offset is positive, the DHCP server will masquerade as the IP address at network address + offset. If offset is negative, the DHCP server will masquerade as the IP diff --git a/src/openvpn/helper.c b/src/openvpn/helper.c index 62f88eccc..30892171c 100644 --- a/src/openvpn/helper.c +++ b/src/openvpn/helper.c @@ -230,7 +230,7 @@ helper_client_server (struct options *o) * if tap OR (tun AND topology == subnet): * ifconfig 10.8.0.1 255.255.255.0 * if !nopool: - * ifconfig-pool 10.8.0.2 10.8.0.254 255.255.255.0 + * ifconfig-pool 10.8.0.2 10.8.0.253 255.255.255.0 * push "route-gateway 10.8.0.1" * if route-gateway unset: * route-gateway 10.8.0.2 -- 2.47.2