nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use SOCKET_OK/TOR_INVALID_SOCKET in socketpair replacement code

Browse Source
This commit is contained in:
Nick Mathewson 2013-08-06 16:41:53 -04:00
parent 0a0f93d277
commit 031e695aa5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/compat.c
View File

@ -1225,9 +1225,9 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2])
* for now, and really, when localhost is down sometimes, we
* have other problems too.
*/
tor_socket_t listener = -1;
tor_socket_t connector = -1;
tor_socket_t acceptor = -1;
tor_socket_t listener = TOR_INVALID_SOCKET;
tor_socket_t connector = TOR_INVALID_SOCKET;
tor_socket_t acceptor = TOR_INVALID_SOCKET;
struct sockaddr_in listen_addr;
struct sockaddr_in connect_addr;
int size;
@ -1306,11 +1306,11 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2])
tidy_up_and_fail:
if (saved_errno < 0)
saved_errno = errno;
if (listener != -1)
if (SOCKET_OK(listener))
tor_close_socket(listener);
if (connector != -1)
if (SOCKET_OK(connector))
tor_close_socket(connector);
if (acceptor != -1)
if (SOCKET_OK(acceptor))
tor_close_socket(acceptor);
return -saved_errno;
#endif