From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 22 Jul 2008 09:57:19 +0000 (+1200)
Subject: Bug 2421: ipv6 on OpenBSD
X-Git-Tag: SQUID_3_1_0_1~49^2~131
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ba890ea0812bac87a3a6c8aa6780ce61e223724;p=thirdparty%2Fsquid.git

Bug 2421: ipv6 on OpenBSD

OpenBSD 4.3 shares the old FreeBSD behavior of limiting the 'non-standard'
(according to them) in6_addr.s6_* fields to only Kernel-visible.
It is in fact non-RFC usage, becoming standard via common use.
---

diff --git a/include/IPAddress.h b/include/IPAddress.h
index 5f86819fe2..0b7b790724 100644
--- a/include/IPAddress.h
+++ b/include/IPAddress.h
@@ -69,8 +69,9 @@
  *   This OS has at least one version that defines these as private
  *   kernel macros commented as being 'non-standard'.
  *   We need to use them, much nicer than the OS-provided __u*_*[]
+ * UPDATE: OpenBSD 4.3 has the same.
  */
-#if USE_IPV6 && defined(_SQUID_FREEBSD_)
+#if USE_IPV6 && ( defined(_SQUID_FREEBSD_) || defined(_SQUID_OPENBSD_) )
 #define s6_addr8  __u6_addr.__u6_addr8
 #define s6_addr16 __u6_addr.__u6_addr16
 #define s6_addr32 __u6_addr.__u6_addr32