From b8c4684f01701742eceb9dc6bfc4e2564278f6fd Mon Sep 17 00:00:00 2001 From: Josh Cepek Date: Mon, 18 Aug 2014 05:51:01 -0500 Subject: [PATCH] Push an IPv6 CIDR mask used by the server, not the pool's size Correctly handle CIDR masks when pushing clients addressing from an IPv6 pool. This change ignores the incorrectly used `bits` argument to the --ifconfig-ipv6-pool option. The code to save any provided CIDR mask after the pool IP is left in; this may someday become useful when we move to allow IPv6 pools without relying on an IPv4 pool assignment. Signed-off-by: Josh Cepek Acked-by: Arne Schwabe Acked-by: Gert Doering Message-Id: <53F1DA95.7020701@usa.net> URL: http://article.gmane.org/gmane.network.openvpn.devel/8990 Signed-off-by: Gert Doering (cherry picked from commit c4ed931a70502a351ff1089aa1bfb8001586f788) --- doc/openvpn.8 | 5 +---- src/openvpn/multi.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/doc/openvpn.8 b/doc/openvpn.8 index 1cad9bed4..ba932c148 100644 --- a/doc/openvpn.8 +++ b/doc/openvpn.8 @@ -5622,10 +5622,7 @@ Is only accepted if ``\-\-mode server'' or ``\-\-server'' is set. Specify an IPv6 address pool for dynamic assignment to clients. The pool starts at .B ipv6addr -and increments by +1 for every new client (linear mode). The -.B /bits -setting controls the size of the pool. Due to implementation details, -the pool size must be between /64 and /112. +and matches the offset determined from the start of the IPv4 pool. .TP .B \-\-ifconfig\-ipv6\-push ipv6addr/bits ipv6remote for ccd/ per-client static IPv6 interface configuration, see diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 577c5d398..541f8f56e 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -1354,7 +1354,7 @@ multi_select_virtual_addr (struct multi_context *m, struct multi_instance *mi) mi->context.c2.push_ifconfig_ipv6_remote = mi->context.c1.tuntap->local_ipv6; mi->context.c2.push_ifconfig_ipv6_netbits = - mi->context.options.ifconfig_ipv6_pool_netbits; + mi->context.options.ifconfig_ipv6_netbits; mi->context.c2.push_ifconfig_ipv6_defined = true; } } -- 2.47.2