Commit 6672ca4e authored by Bernd Edlinger's avatar Bernd Edlinger
Browse files

Fix setting of IPV6_V6ONLY on Windows 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5156)
parent 8b2124ab

crypto/bio/b_sock2.c

+10 −3
Original line number Diff line number Diff line
@@ -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);