From 6672ca4e860a56973f5dfe502276e2f5709ddfca Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Mon, 22 Jan 2018 19:53:45 +0100 Subject: [PATCH] Fix setting of IPV6_V6ONLY on Windows Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/5156) --- crypto/bio/b_sock2.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/crypto/bio/b_sock2.c b/crypto/bio/b_sock2.c index 7f4d89e551..780f0f42b0 100644 --- a/crypto/bio/b_sock2.c +++ b/crypto/bio/b_sock2.c @@ -172,8 +172,10 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options) return 0; # ifndef OPENSSL_SYS_WINDOWS - /* SO_REUSEADDR has different behavior on Windows than on - * other operating systems, don't set it there. */ + /* + * SO_REUSEADDR has different behavior on Windows than on + * other operating systems, don't set it there. + */ if (options & BIO_SOCK_REUSEADDR) { if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) != 0) { SYSerr(SYS_F_SETSOCKOPT, get_last_socket_error()); @@ -200,7 +202,12 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options) } # ifdef IPV6_V6ONLY - if ((options & BIO_SOCK_V6_ONLY) && BIO_ADDR_family(addr) == AF_INET6) { + if (BIO_ADDR_family(addr) == AF_INET6) { + /* + * Note: Windows default of IPV6_V6ONLY is ON, and Linux is OFF. + * Therefore we always have to use setsockopt here. + */ + on = options & BIO_SOCK_V6_ONLY ? 1 : 0; if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)) != 0) { SYSerr(SYS_F_SETSOCKOPT, get_last_socket_error()); BIOerr(BIO_F_BIO_LISTEN, BIO_R_LISTEN_V6_ONLY); -- 2.25.1