wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make the BIO_ADDR param optional.

Browse source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Rich Salz 2016-02-14 15:50:13 -05:00 committed by Rich Salz
parent 0756592b60
commit d9d8e7a9c1
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
crypto/bio/b_sock.c
View file

@ -316,16 +316,10 @@ int BIO_get_accept_socket(char *host, int bind_mode)
int BIO_accept(int sock, char **ip_port)
{
BIO_ADDR *res = BIO_ADDR_new();
BIO_ADDR res;
int ret = -1;
if (res == NULL) {
BIOerr(BIO_F_BIO_ACCEPT, ERR_R_MALLOC_FAILURE);
return ret;
}
ret = BIO_accept_ex(sock, res, 0);
ret = BIO_accept_ex(sock, &res, 0);
if (ret == (int)INVALID_SOCKET) {
if (BIO_sock_should_retry(ret)) {
ret = -2;
@ -337,8 +331,8 @@ int BIO_accept(int sock, char **ip_port)
}
if (ip_port != NULL) {
char *host = BIO_ADDR_hostname_string(res, 1);
char *port = BIO_ADDR_service_string(res, 1);
char *host = BIO_ADDR_hostname_string(&res, 1);
char *port = BIO_ADDR_service_string(&res, 1);
*ip_port = OPENSSL_zalloc(strlen(host) + strlen(port) + 2);
strcpy(*ip_port, host);
strcat(*ip_port, ":");
@ -348,7 +342,6 @@ int BIO_accept(int sock, char **ip_port)
}
end:
BIO_ADDR_free(res);
return ret;
}
# endif

4
crypto/bio/b_sock2.c
View file

@ -274,10 +274,12 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int options)
* @options: BIO socket options, applied on the accepted socket.
*
*/
int BIO_accept_ex(int accept_sock, BIO_ADDR *addr, int options)
int BIO_accept_ex(int accept_sock, BIO_ADDR *addr_, int options)
{
socklen_t len;
int accepted_sock;
BIO_ADDR locaddr;
BIO_ADDR *addr = addr_ == NULL ? &locaddr : addr_;
len = sizeof(*addr);
accepted_sock = accept(accept_sock,