commit 1f7f10e4f3953244a1262f46b726bbe43d025c1a Author: Andrea Shepard andrea@persephoneslair.org Date: Fri Jun 15 16:53:32 2012 -0700
Always set *socket_error to something appropriate when returning -1 from connection_connect() --- changes/bug6028 | 4 ++++ src/or/connection.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/changes/bug6028 b/changes/bug6028 new file mode 100644 index 0000000..fedd02f --- /dev/null +++ b/changes/bug6028 @@ -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. diff --git a/src/or/connection.c b/src/or/connection.c index 34e1a5c..8d3c7b3 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1331,6 +1331,7 @@ connection_connect(connection_t *conn, const char *address,
if (get_n_open_sockets() >= get_options()->_ConnLimit-1) { warn_too_many_conns(); + *socket_error = ENOBUFS; return -1; }
@@ -1423,8 +1424,11 @@ connection_connect(connection_t *conn, const char *address, escaped_safe_str_client(address), port, inprogress?"in progress":"established", 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 inprogress ? 0 : 1; }