Commit c72fb77f authored by Richard Levitte's avatar Richard Levitte
Browse files

Rework BIO_ADDRINFO_protocol() to return correct values 



As noted already, some platforms don't fill in ai_protocol as
expected.  To circumvent that, we have BIO_ADDRINFO_protocol() to
compute a sensible answer in that case.

Reviewed-by: default avatarKurt Roeckx <kurt@openssl.org>
parent 210ac682

crypto/bio/b_addr.c

+18 −2
Original line number Diff line number Diff line
@@ -379,8 +379,24 @@ int BIO_ADDRINFO_socktype(const BIO_ADDRINFO *bai) 


int BIO_ADDRINFO_protocol(const BIO_ADDRINFO *bai)

{

    if (bai != NULL)

    if (bai != NULL) {

        if (bai->bai_protocol != 0)

            return bai->bai_protocol;



#ifdef AF_UNIX

        if (bai->bai_family == AF_UNIX)

            return 0;

#endif



        switch (bai->bai_socktype) {

        case SOCK_STREAM:

            return IPPROTO_TCP;

        case SOCK_DGRAM:

            return IPPROTO_UDP;

        default:

            break;

        }

    }

    return 0;

}