From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Wed, 14 Apr 2010 12:46:21 +0000 (+0200)
Subject: Fixes IPv6 build on older systems.
X-Git-Tag: v1.2.3~20^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcc6049444f5e12e0d0fcc4cfbb244c08b4c20b0;p=thirdparty%2Fbird.git

Fixes IPv6 build on older systems.
---

diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index d1fad1ff2..c9e6fe136 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -668,6 +668,16 @@ get_sockaddr(struct sockaddr_in *sa, ip_addr *a, unsigned *port, int check)
 #define CMSG_RX_SPACE CMSG_SPACE(sizeof(struct in6_pktinfo))
 #define CMSG_TX_SPACE CMSG_SPACE(sizeof(struct in6_pktinfo))
 
+/*
+ * RFC 2292 uses IPV6_PKTINFO for both the socket option and the cmsg
+ * type, RFC 3542 changed the socket option to IPV6_RECVPKTINFO. If we
+ * don't have IPV6_RECVPKTINFO we suppose the OS implements the older
+ * RFC and we use IPV6_PKTINFO.
+ */
+#ifndef IPV6_RECVPKTINFO
+#define IPV6_RECVPKTINFO IPV6_PKTINFO
+#endif
+
 static char *
 sysio_register_cmsgs(sock *s)
 {