generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use the protocol we know rather than BIO_ADDRINFO_protocol(res)

Browse Source 
Because some platforms won't will in any value in ai_protocol, there's
no point using it if we already know what it should be.

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2016-02-10 20:54:48 +01:00
parent 07aa1e0459
commit 968d1a2372
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/s_socket.c
View File

@ -179,7 +179,7 @@ int init_client(int *sock, const char *host, const char *port,
&& (type == 0 || type == BIO_ADDRINFO_socktype(res))); && (type == 0 || type == BIO_ADDRINFO_socktype(res)));
*sock = BIO_socket(BIO_ADDRINFO_family(ai), BIO_ADDRINFO_socktype(ai), *sock = BIO_socket(BIO_ADDRINFO_family(ai), BIO_ADDRINFO_socktype(ai),
BIO_ADDRINFO_protocol(ai), 0); protocol, 0);
if (*sock == INVALID_SOCKET) { if (*sock == INVALID_SOCKET) {
/* Maybe the kernel doesn't support the socket family, even if /* Maybe the kernel doesn't support the socket family, even if
* BIO_lookup() added it in the returned result... * BIO_lookup() added it in the returned result...
@ -257,7 +257,7 @@ int do_server(int *accept_sock, const char *host, const char *port,
&& (type == 0 || type == BIO_ADDRINFO_socktype(res))); && (type == 0 || type == BIO_ADDRINFO_socktype(res)));
asock = BIO_socket(BIO_ADDRINFO_family(res), BIO_ADDRINFO_socktype(res), asock = BIO_socket(BIO_ADDRINFO_family(res), BIO_ADDRINFO_socktype(res),
BIO_ADDRINFO_protocol(res), 0); protocol, 0);
if (asock == INVALID_SOCKET if (asock == INVALID_SOCKET
|| !BIO_listen(asock, BIO_ADDRINFO_address(res), BIO_SOCK_REUSEADDR)) { || !BIO_listen(asock, BIO_ADDRINFO_address(res), BIO_SOCK_REUSEADDR)) {
BIO_ADDRINFO_free(res); BIO_ADDRINFO_free(res);