diff options
| author | Josh Cepek | 2014-08-18 05:51:01 -0500 |
|---|---|---|
| committer | Gert Doering | 2016-05-18 08:25:42 +0200 |
| commit | 0d8a4ffa2293dda8139189725a5c49fbe0eb500b (patch) | |
| tree | 48b6e7717b89e49e38ddb4f256ecb718c3df0383 /src/openvpn/multi.c | |
| parent | 970312f185012341cc5bcc9492ab3e1413c7b3c7 (diff) | |
| download | openvpn-0d8a4ffa2293dda8139189725a5c49fbe0eb500b.zip openvpn-0d8a4ffa2293dda8139189725a5c49fbe0eb500b.tar.gz | |
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 <josh.cepek@usa.net>
Acked-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <53F1DA95.7020701@usa.net>
URL: http://article.gmane.org/gmane.network.openvpn.devel/8990
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/multi.c')
| -rw-r--r-- | src/openvpn/multi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 6e6d457..4c43fcc 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -1431,10 +1431,10 @@ multi_select_virtual_addr (struct multi_context *m, struct multi_instance *mi) if ( mi->context.options.ifconfig_ipv6_pool_defined ) { mi->context.c2.push_ifconfig_ipv6_local = remote_ipv6; - mi->context.c2.push_ifconfig_ipv6_remote = + 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.c2.push_ifconfig_ipv6_netbits = + mi->context.options.ifconfig_ipv6_netbits; mi->context.c2.push_ifconfig_ipv6_defined = true; } } |