From b8dc932c05d9e0a937e9b25ef8c5458e067b660a Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Wed, 26 Aug 2009 15:13:43 +0000 Subject: PR: 2005 Submitted by: steve@openssl.org Some systems have broken IPv6 headers and/or implementations. If OPENSSL_USE_IPV6 is set to 0 IPv6 is not used, if it is set to 1 it is used and if undefined an attempt is made to detect at compile time by checking if AF_INET6 is set and excluding known problem platforms. --- crypto/bio/b_sock.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'crypto/bio/b_sock.c') diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index e5c99c6954..462dc2ff46 100644 --- a/crypto/bio/b_sock.c +++ b/crypto/bio/b_sock.c @@ -88,11 +88,6 @@ NETDB_DEFINE_CONTEXT static int wsa_init_done=0; #endif -#if defined(OPENSSL_SYS_BEOS_BONE) -/* BONE's IP6 support is incomplete */ -#undef AF_INET6 -#endif - #if 0 static unsigned long BIO_ghbn_hits=0L; static unsigned long BIO_ghbn_miss=0L; @@ -654,7 +649,7 @@ int BIO_get_accept_socket(char *host, int bind_mode) if (strchr(h,':')) { if (h[1]=='\0') h=NULL; -#ifdef AF_INET6 +#if OPENSSL_USE_IPV6 hint.ai_family = AF_INET6; #else h=NULL; @@ -720,7 +715,7 @@ again: client = server; if (h == NULL || strcmp(h,"*") == 0) { -#ifdef AF_INET6 +#if OPENSSL_USE_IPV6 if (client.sa_family == AF_INET6) { struct sockaddr_in6 *sin6 = -- cgit v1.2.3