Hi, On Fri, Nov 20, 2015 at 06:23:58PM +0100, Heiko Hund wrote: > Add missing environment variables for IPv6 virtual addresses: > > * ifconfig_pool_local_ipv6 > * ifconfig_pool_remote_ipv6 > * ifconfig_pool_ipv6_netbits > > Signed-off-by: Heiko Hund <heiko.h...@sophos.com>
Semi-ACK. I'm not exactly sure, but your patch refused to apply for me -
git am or git apply both give less than helpful refusal messages:
error: patch failed: src/openvpn/multi.c:1432
error: src/openvpn/multi.c: patch does not apply
error: patch failed: src/openvpn/socket.c:2443
error: src/openvpn/socket.c: patch does not apply
error: patch failed: src/openvpn/socket.h:410
error: src/openvpn/socket.h: patch does not apply
while plain old patch against master suggests that your patch might be
against release/2.3+local patches
patching file src/openvpn/multi.c
Hunk #1 succeeded at 1504 with fuzz 1 (offset 72 lines).
patching file src/openvpn/socket.c
Hunk #1 succeeded at 2608 with fuzz 2 (offset 165 lines).
patching file src/openvpn/socket.h
Hunk #1 succeeded at 402 with fuzz 2 (offset -8 lines).
could you rebase to master and re-send, please?
While at it:
> +{
> + if (!IN6_IS_ADDR_UNSPECIFIED (addr) || !(flags & SA_SET_IF_NONZERO))
> + {
> + struct openvpn_sockaddr si;
> + CLEAR (si);
> + si.addr.in6.sin6_family = AF_INET6;
> + memcpy (&si.addr.in6.sin6_addr, addr, sizeof (*addr));
> + setenv_sockaddr (es, name_prefix, &si, flags|SA_NO_IP_SUFFIX);
... most of the other code I've seen that deals with sin6_addr will
just assign the structure
+ si.addr.in6.sin6_addr = *addr;
(which calls memcpy() under the hood, of course). While mostly a matter
of taste, it's actually stronger type-checking to ensure the target
structure is the same, aka "has enough room to copy in".
gert
--
USENET is *not* the non-clickable part of WWW!
//www.muc.de/~gert/
Gert Doering - Munich, Germany g...@greenie.muc.de
fax: +49-89-35655025 g...@net.informatik.tu-muenchen.de
signature.asc
Description: PGP signature
