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

Merge remote-tracking branch 'andrea/bug6028'

Browse Source
This commit is contained in:
Nick Mathewson 2012-06-18 11:51:55 -04:00
commit 4432fa40dd
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug6028 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes:
- Make sure to set *socket_error in all error cases in
connection_connect(), so it can't produce a warning about errno being
zero from errno_to_orconn_end_reason(). Resolves ticket 6028.

6
src/or/connection.c
View File

@ -1336,6 +1336,7 @@ connection_connect(connection_t *conn, const char *address,
if (get_n_open_sockets() >= get_options()->_ConnLimit-1) { if (get_n_open_sockets() >= get_options()->_ConnLimit-1) {
warn_too_many_conns(); warn_too_many_conns();
*socket_error = ENOBUFS;
return -1; return -1;
} }
@ -1428,8 +1429,11 @@ connection_connect(connection_t *conn, const char *address,
escaped_safe_str_client(address), escaped_safe_str_client(address),
port, inprogress?"in progress":"established", s); port, inprogress?"in progress":"established", s);
conn->s = s; conn->s = s;
if (connection_add_connecting(conn) < 0) /* no space, forget it */ if (connection_add_connecting(conn) < 0) {
/* no space, forget it */
*socket_error = ENOBUFS;
return -1; return -1;
}
return inprogress ? 0 : 1; return inprogress ? 0 : 1;
} }