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

Make sure getaddrinfo and getnameinfo works as intended on Windows

Browse Source 
Both getaddrinfo() and getnameinfo() have to be preceeded with a call
to BIO_sock_init().

Also, make sure to give gai_strerror() the actual error code.

Reviewed-by: Stephen Henson <steve@openssl.org>
This commit is contained in:
Richard Levitte 2016-02-04 17:17:36 +01:00
parent b31feae6de
commit ed03c46134
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crypto/bio/b_addr.c
View File

@ -214,6 +214,9 @@ unsigned short BIO_ADDR_rawport(const BIO_ADDR *ap)
static int addr_strings(const BIO_ADDR *ap, int numeric, static int addr_strings(const BIO_ADDR *ap, int numeric,
char **hostname, char **service) char **hostname, char **service)
{ {
if (BIO_sock_init() != 1)
return 0;
if (1) { if (1) {
#ifdef AI_PASSIVE #ifdef AI_PASSIVE
int ret = 0; int ret = 0;
@ -633,7 +636,11 @@ int BIO_lookup(const char *host, const char *service,
} }
#endif #endif
if (BIO_sock_init() != 1)
return 0;
if (1) { if (1) {
int gai_ret = 0;
#ifdef AI_PASSIVE #ifdef AI_PASSIVE
struct addrinfo hints; struct addrinfo hints;
@ -655,7 +662,7 @@ int BIO_lookup(const char *host, const char *service,
/* Note that |res| SHOULD be a 'struct addrinfo **' thanks to /* Note that |res| SHOULD be a 'struct addrinfo **' thanks to
* macro magic in bio_lcl.h * macro magic in bio_lcl.h
*/ */
switch (getaddrinfo(host, service, &hints, res)) { switch ((gai_ret = getaddrinfo(host, service, &hints, res))) {
# ifdef EAI_SYSTEM # ifdef EAI_SYSTEM
case EAI_SYSTEM: case EAI_SYSTEM:
SYSerr(SYS_F_GETADDRINFO, get_last_socket_error()); SYSerr(SYS_F_GETADDRINFO, get_last_socket_error());
@ -667,7 +674,7 @@ int BIO_lookup(const char *host, const char *service,
break; break;
default: default:
BIOerr(BIO_F_BIO_LOOKUP, ERR_R_SYS_LIB); BIOerr(BIO_F_BIO_LOOKUP, ERR_R_SYS_LIB);
ERR_add_error_data(1, gai_strerror(ret)); ERR_add_error_data(1, gai_strerror(gai_ret));
break; break;
} }
} else { } else {