Incorporate the Debian typo fixes where appropriate and make show_opt default message clearer
PATCH 1/1 Incorporate the Debian typo fixes where appropriate and make show_opt default message clearer
Debian also incorrectly changes that the default for route parameters can be specified by using "nil" instead of "default. The confusion is probably coming from show_opt printing "nil" instead of "default". Change show_opt to show "default (not set)" instead of "nil"
Original author: Alberto Gonzalez Iniesta <[email protected]...>
--- doc/openvpn.8 | 8 ++++---- src/openvpn/occ.c | 2 +- src/openvpn/route.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)
doc/openvpn.8 +4 -4
@@ -21,13 +21,13 @@ .\" 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA .\" .\" Manual page for openvpn -.\ +.\" .\" SH section heading .\" SS subsection heading .\" LP paragraph .\" IP indented paragraph .\" TP hanging label -.\ +.\" .\" .nf -- no formatting .\" .fi -- resume formatting .\" .ft 3 -- boldface
@@ -4226,7 +4226,7 @@ is 15 seconds. This option is only relevant in UDP mode, i.e. when either .B \-\-proto udp -is specifed, or no +is specified, or no .B \-\-proto option is specified.
@@ -5487,7 +5487,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 0. 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
src/openvpn/occ.c +1 -1
@@ -379,7 +379,7 @@ process_received_occ_msg (struct context *c) && c->c2.max_send_size_local > TUN_MTU_MIN && (c->c2.max_recv_size_remote < c->c2.max_send_size_local || c->c2.max_recv_size_local < c->c2.max_send_size_remote)) -msg (M_INFO ,"NOTE: This connection is unable to accomodate a UDP packet size of %d. Consider using --fragment or --mssfix options as a workaround." , +msg (M_INFO ,"NOTE: This connection is unable to accommodate a UDP packet size of %d. Consider using --fragment or --mssfix options as a workaround." , c->c2.max_send_size_local); }event_timeout_clear (&c->c2.occ_mtu_load_test_interval);
src/openvpn/route.c +1 -1
@@ -1171,7 +1171,7 @@ static const char * show_opt (const char *option) {if (!option) -return "nil" ; +return "default (not set)" ;else return option; }
Signature · 1 line
2.7.4 (Apple Git-66)
doc/openvpn.8 virtual DHCP server address. In · line 5491
Quoted 7 lines · Arne Schwabe
doc/openvpn.8 +1
-1@@ -5487,7 +5487,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 0.
Not a fault of this patch, but may be its time to make this info right. Currently the default offset in --dev tun mode is not 0, but -1. Thus the ip (broadcast - 1) is removed from the pool. Unlike what the man page and comments in helper.c implies.
I think its better to bring the source in line with the docs as suggested in this patch: http://article.gmane.org/gmane.network.openvpn.devel/10687
Selva
ACK.
Your patch has been applied to the following branches
commit c42fcbfe708f4c97da063642cf8874f0d4d1a645 (master) commit 1f12d8dd8a4d4efbbbf9ba9b57ee1250593268ba (release/2.3)
Author: Arne Schwabe Date: Thu Jul 14 13:25:19 2016 +0200
Incorporate the Debian typo fixes where appropriate and make show_opt default message clearer
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: http://www.mail-archive.com/search?l=mid&[email protected]...
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering