]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
Un-break compilation on *BSD
authorGert Doering <gert@greenie.muc.de>
Sat, 28 Nov 2015 19:58:37 +0000 (20:58 +0100)
committerGert Doering <gert@greenie.muc.de>
Sun, 29 Nov 2015 11:34:52 +0000 (12:34 +0100)
Commit 2191c47165 introduced code to handle IP address query on
multihoming hosts for IP_PKTINFO-supporting OSes, but all the BSDs
need the "#elsif IP_RECVDSTADDR" variant... add code equivalent
to what we have in socket.c/print_link_socket_actual_ex()

Tested on FreeBSD 9.3/sparc64

Signed-off-by: Gert Doering <gert@greenie.muc.de>
Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: <1448740717-60914-1-git-send-email-gert@greenie.muc.de>
URL: http://article.gmane.org/gmane.network.openvpn.devel/10648

src/openvpn/init.c

index 5c1708796829813bce4f014fb81349f723ec5bcb..179c7efba5a861662084117572fa623a8320de62 100644 (file)
@@ -1293,7 +1293,11 @@ initialization_sequence_completed (struct context *c, const unsigned int flags)
           switch (local.addr.sa.sa_family)
             {
             case AF_INET:
+#ifdef IP_PKTINFO
               local.addr.in4.sin_addr = actual->pi.in4.ipi_spec_dst;
+#else
+              local.addr.in4.sin_addr = actual->pi.in4;
+#endif
               break;
             case AF_INET6:
               local.addr.in6.sin6_addr = actual->pi.in6.ipi6_addr;