mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-12-03 05:41:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

BIO acpt_state(): Allow retrying addresses (e.g., using IPv6 vs. IPv4) on creating accept socket

Browse Source 
Fixes #15386

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15417)
This commit is contained in:
Dr. David von Oheimb 2021-05-25 08:43:59 +02:00 committed by Dr. David von Oheimb
parent a7014122ac
commit 24c07e5055
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/bio/bss_acpt.c
View File

@ -216,18 +216,24 @@ static int acpt_state(BIO *b, BIO_ACCEPT *c)
ERR_raise(ERR_LIB_BIO, BIO_R_LOOKUP_RETURNED_NOTHING); ERR_raise(ERR_LIB_BIO, BIO_R_LOOKUP_RETURNED_NOTHING);
goto exit_loop; goto exit_loop;
} }
/* We're currently not iterating, but set this as preparation
* for possible future development in that regard
*/
c->addr_iter = c->addr_first; c->addr_iter = c->addr_first;
c->state = ACPT_S_CREATE_SOCKET; c->state = ACPT_S_CREATE_SOCKET;
break; break;
case ACPT_S_CREATE_SOCKET: case ACPT_S_CREATE_SOCKET:
ERR_set_mark();
s = BIO_socket(BIO_ADDRINFO_family(c->addr_iter), s = BIO_socket(BIO_ADDRINFO_family(c->addr_iter),
BIO_ADDRINFO_socktype(c->addr_iter), BIO_ADDRINFO_socktype(c->addr_iter),
BIO_ADDRINFO_protocol(c->addr_iter), 0); BIO_ADDRINFO_protocol(c->addr_iter), 0);
if (s == (int)INVALID_SOCKET) { if (s == (int)INVALID_SOCKET) {
if ((c->addr_iter = BIO_ADDRINFO_next(c->addr_iter)) != NULL) {
/*
* if there are more addresses to try, do that first
*/
ERR_pop_to_mark();
break;
}
ERR_clear_last_mark();
ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(), ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
"calling socket(%s, %s)", "calling socket(%s, %s)",
c->param_addr, c->param_serv); c->param_addr, c->param_serv);