diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-06-11 15:42:42 -0400 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2019-07-22 16:24:56 +0200 |
| commit | 56c3a135b239f4c8ccfdbbb1668880d4c39d5b87 (patch) | |
| tree | 22bf3958a3b0046ae690e57dd5eaad90c6fcf25a /crypto/bio/b_sock.c | |
| parent | 1372560f64c9a7cfad1979fa8c41bee335a04373 (diff) | |
Add ERR_put_func_error, and use it.
Change SYSerr to have the function name; remove SYS_F_xxx defines
Add a test and documentation.
Use get_last_socket_err, which removes some ifdef's in OpenSSL code.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9072)
Diffstat (limited to 'crypto/bio/b_sock.c')
| -rw-r--r-- | crypto/bio/b_sock.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index 9877b3d78d..f6ad9f03a9 100644 --- a/crypto/bio/b_sock.c +++ b/crypto/bio/b_sock.c @@ -120,8 +120,6 @@ int BIO_sock_init(void) static struct WSAData wsa_state; if (!wsa_init_done) { - int err; - wsa_init_done = 1; memset(&wsa_state, 0, sizeof(wsa_state)); /* @@ -131,8 +129,7 @@ int BIO_sock_init(void) * probed at run-time with DSO_global_lookup. */ if (WSAStartup(0x0202, &wsa_state) != 0) { - err = WSAGetLastError(); - SYSerr(SYS_F_WSASTARTUP, err); + SYSerr("wsastartup", get_last_socket_error()); BIOerr(BIO_F_BIO_SOCK_INIT, BIO_R_WSASTARTUP); return -1; } @@ -192,7 +189,7 @@ int BIO_socket_ioctl(int fd, long type, void *arg) i = ioctlsocket(fd, type, ARG); # endif /* __DJGPP__ */ if (i < 0) - SYSerr(SYS_F_IOCTLSOCKET, get_last_socket_error()); + SYSerr("ioctlsocket", get_last_socket_error()); return i; } @@ -243,7 +240,7 @@ int BIO_accept(int sock, char **ip_port) ret = -2; goto end; } - SYSerr(SYS_F_ACCEPT, get_last_socket_error()); + SYSerr("accept", get_last_socket_error()); BIOerr(BIO_F_BIO_ACCEPT, BIO_R_ACCEPT_ERROR); goto end; } @@ -308,7 +305,7 @@ int BIO_socket_nbio(int s, int mode) l = fcntl(s, F_GETFL, 0); if (l == -1) { - SYSerr(SYS_F_FCNTL, get_last_sys_error()); + SYSerr("fcntl", get_last_sys_error()); ret = -1; } else { # if defined(O_NONBLOCK) @@ -326,7 +323,7 @@ int BIO_socket_nbio(int s, int mode) ret = fcntl(s, F_SETFL, l); if (ret < 0) { - SYSerr(SYS_F_FCNTL, get_last_sys_error()); + SYSerr("fcntl", get_last_sys_error()); } } # else @@ -349,7 +346,7 @@ int BIO_sock_info(int sock, ret = getsockname(sock, BIO_ADDR_sockaddr_noconst(info->addr), &addr_len); if (ret == -1) { - SYSerr(SYS_F_GETSOCKNAME, get_last_socket_error()); + SYSerr("getsockname", get_last_socket_error()); BIOerr(BIO_F_BIO_SOCK_INFO, BIO_R_GETSOCKNAME_ERROR); return 0; } |