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

Add a tor_release_socket_ownership() function.

Browse Source
This commit is contained in:
Nick Mathewson 2018-09-20 12:46:47 -04:00
parent bd6007d898
commit 1c1e84281d
2 changed files with 54 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/lib/net/socket.c
View File

@ -142,41 +142,6 @@ tor_close_socket_simple(tor_socket_t s)
return r; return r;
} }
/** As tor_close_socket_simple(), but keeps track of the number
* of open sockets. Returns 0 on success, -1 on failure. */
MOCK_IMPL(int,
tor_close_socket,(tor_socket_t s))
{
int r = tor_close_socket_simple(s);
socket_accounting_lock();
#ifdef DEBUG_SOCKET_COUNTING
if (s > max_socket || ! bitarray_is_set(open_sockets, s)) {
log_warn(LD_BUG, "Closing a socket (%d) that wasn't returned by tor_open_"
"socket(), or that was already closed or something.", s);
} else {
tor_assert(open_sockets && s <= max_socket);
bitarray_clear(open_sockets, s);
}
#endif /* defined(DEBUG_SOCKET_COUNTING) */
if (r == 0) {
--n_sockets_open;
} else {
#ifdef _WIN32
if (r != WSAENOTSOCK)
--n_sockets_open;
#else
if (r != EBADF)
--n_sockets_open; // LCOV_EXCL_LINE -- EIO and EINTR too hard to force.
#endif /* defined(_WIN32) */
r = -1;
}
tor_assert_nonfatal(n_sockets_open >= 0);
socket_accounting_unlock();
return r;
}
/** @{ */ /** @{ */
#ifdef DEBUG_SOCKET_COUNTING #ifdef DEBUG_SOCKET_COUNTING
/** Helper: if DEBUG_SOCKET_COUNTING is enabled, remember that <b>s</b> is /** Helper: if DEBUG_SOCKET_COUNTING is enabled, remember that <b>s</b> is
@ -201,11 +166,50 @@ mark_socket_open(tor_socket_t s)
} }
bitarray_set(open_sockets, s); bitarray_set(open_sockets, s);
} }
static inline void
mark_socket_closed(tor_socket_t s)
{
if (s > max_socket || ! bitarray_is_set(open_sockets, s)) {
log_warn(LD_BUG, "Closing a socket (%d) that wasn't returned by tor_open_"
"socket(), or that was already closed or something.", s);
} else {
tor_assert(open_sockets && s <= max_socket);
bitarray_clear(open_sockets, s);
}
}
#else /* !(defined(DEBUG_SOCKET_COUNTING)) */ #else /* !(defined(DEBUG_SOCKET_COUNTING)) */
#define mark_socket_open(s) ((void) (s)) #define mark_socket_open(s) ((void) (s))
#define mark_socket_closed(s) ((void) (s))
#endif /* defined(DEBUG_SOCKET_COUNTING) */ #endif /* defined(DEBUG_SOCKET_COUNTING) */
/** @} */ /** @} */
/** As tor_close_socket_simple(), but keeps track of the number
* of open sockets. Returns 0 on success, -1 on failure. */
MOCK_IMPL(int,
tor_close_socket,(tor_socket_t s))
{
int r = tor_close_socket_simple(s);
socket_accounting_lock();
mark_socket_closed(s);
if (r == 0) {
--n_sockets_open;
} else {
#ifdef _WIN32
if (r != WSAENOTSOCK)
--n_sockets_open;
#else
if (r != EBADF)
--n_sockets_open; // LCOV_EXCL_LINE -- EIO and EINTR too hard to force.
#endif /* defined(_WIN32) */
r = -1;
}
tor_assert_nonfatal(n_sockets_open >= 0);
socket_accounting_unlock();
return r;
}
/** As socket(), but counts the number of open sockets. */ /** As socket(), but counts the number of open sockets. */
MOCK_IMPL(tor_socket_t, MOCK_IMPL(tor_socket_t,
tor_open_socket,(int domain, int type, int protocol)) tor_open_socket,(int domain, int type, int protocol))
@ -307,6 +311,20 @@ tor_take_socket_ownership(tor_socket_t s)
socket_accounting_unlock(); socket_accounting_unlock();
} }
/**
* For socket accounting: declare that we are no longer the owner of the
* socket <b>s</b>. This will prevent us from overallocating sockets, and
* prevent us from asserting later when we close the socket <b>s</b>.
*/
void
tor_release_socket_ownership(tor_socket_t s)
{
socket_accounting_lock();
--n_sockets_open;
mark_socket_closed(s);
socket_accounting_unlock();
}
/** As accept(), but counts the number of open sockets. */ /** As accept(), but counts the number of open sockets. */
tor_socket_t tor_socket_t
tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len) tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len)

1
src/lib/net/socket.h
View File

@ -23,6 +23,7 @@ struct sockaddr;
int tor_close_socket_simple(tor_socket_t s); int tor_close_socket_simple(tor_socket_t s);
MOCK_DECL(int, tor_close_socket, (tor_socket_t s)); MOCK_DECL(int, tor_close_socket, (tor_socket_t s));
void tor_take_socket_ownership(tor_socket_t s); void tor_take_socket_ownership(tor_socket_t s);
void tor_release_socket_ownership(tor_socket_t s);
tor_socket_t tor_open_socket_with_extensions( tor_socket_t tor_open_socket_with_extensions(
int domain, int type, int protocol, int domain, int type, int protocol,
int cloexec, int nonblock); int cloexec, int nonblock);