diff options
| author | Gert Doering <gert@greenie.muc.de> | 2012-02-03 17:11:03 +0100 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2012-02-04 13:16:06 +0100 |
| commit | c55e9562d64f381ba46b83a02503f6239e23d3ef (patch) | |
| tree | 4c14cd06ec90e414a69ef7fa6cc3de2fdea20b30 /helper.c | |
| parent | 6ba68180b89e0290855f70832243fc9b4370e4d2 (diff) | |
| download | openvpn-c55e9562d64f381ba46b83a02503f6239e23d3ef.tar.gz openvpn-c55e9562d64f381ba46b83a02503f6239e23d3ef.tar.xz openvpn-c55e9562d64f381ba46b83a02503f6239e23d3ef.zip | |
Implement IPv6 interface config with non-/64 prefix lengths.
Add "ifconfig_ipv6_netbits_parm" parameter to init_tun(), use that to
initialize tt->netbits_ipv6 (previously: always /64). Actual interface
setup code already used tt->netbits_ipv6, so no changes needed there.
Remove restrictions on "/netbits" value for --server-ipv6 config option
(can now be /64.../112, previously had to be exactly /64). Supporting
even smaller networks could cause problems with ipv6-pool handling and
are only allowed for explicit "ifconfig-ipv6", not for "server-ipv6".
Add /netbits to pushed "ifconfig-ipv6" values on server side (client
side always accepted this, but ignored it so far, so this does not
break compatibility).
Tested on Linux/ifconfig, Linux/iproute2 and FreeBSD 7.4
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'helper.c')
| -rw-r--r-- | helper.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -184,12 +184,14 @@ helper_client_server (struct options *o) print_in6_addr( add_in6_addr( o->server_network_ipv6, 1), 0, &o->gc ); o->ifconfig_ipv6_remote = print_in6_addr( add_in6_addr( o->server_network_ipv6, 2), 0, &o->gc ); + o->ifconfig_ipv6_netbits = o->server_netbits_ipv6; + + /* pool starts at "base address + 0x1000" - leave enough room */ + ASSERT( o->server_netbits_ipv6 <= 112 ); /* want 16 bits */ - /* pool starts at "base address + 0x10000" */ - ASSERT( o->server_netbits_ipv6 < 96 ); /* want 32 bits */ o->ifconfig_ipv6_pool_defined = true; o->ifconfig_ipv6_pool_base = - add_in6_addr( o->server_network_ipv6, 0x10000 ); + add_in6_addr( o->server_network_ipv6, 0x1000 ); o->ifconfig_ipv6_pool_netbits = o->server_netbits_ipv6; o->tun_ipv6 = true; |