Fix socket accounting with ORConn sockets.

When we close a socket via tor_tls_free(), we previously had no way
for our socket accounting logic to learn about it.  This meant that
the socket accounting code would think we had run out of sockets,
and freak out.

Fixes bug 27795; bugfix on 0.3.5.1-alpha.
This commit is contained in:
Nick Mathewson
2018-09-20 12:52:29 -04:00
parent 1c1e84281d
commit f25323fe3f
2 changed files with 6 additions and 0 deletions
+5
View File
@@ -0,0 +1,5 @@
o Major bugfixes (socket accounting):
- In our socket accounting code, count a socket as closed even
when it is closed indirectly by the TLS layer. Previously, we
would count these sockets as still in use, and incorrectly believe that
we had run out of sockets. Fixes bug 27795; bugfix on 0.3.5.1-alpha.
+1
View File
@@ -646,6 +646,7 @@ connection_free_minimal(connection_t *conn)
} else {
/* The tor_tls_free() call below will close the socket; we must tell
* the code below not to close it a second time. */
tor_release_socket_ownership(conn->s);
conn->s = TOR_INVALID_SOCKET;
}
tor_tls_free(or_conn->tls);