aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-07-05 05:08:54 -0400
committerNick Mathewson <nickm@torproject.org>2012-07-05 05:08:54 -0400
commit7e8d7a017e130cc7855aa508e8a37321438b6e52 (patch)
tree8140c6d2ae46baa8dfab0fb934808a4f68f9e038 /src/or
parent46434ecf5b6f1ad88deb86fdac044c41ae4b534b (diff)
parente9b33ed1bf4140e3aeda5eb9126027fbe5a3ec5a (diff)
downloadtor-7e8d7a017e130cc7855aa508e8a37321438b6e52.tar
tor-7e8d7a017e130cc7855aa508e8a37321438b6e52.tar.gz
Merge remote-tracking branch 'origin/maint-0.2.3'
Diffstat (limited to 'src/or')
-rw-r--r--src/or/connection.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index af5c01181..95101ef65 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1336,7 +1336,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;
+ *socket_error = SOCK_ERRNO(ENOBUFS);
return -1;
}
@@ -1431,7 +1431,7 @@ connection_connect(connection_t *conn, const char *address,
conn->s = s;
if (connection_add_connecting(conn) < 0) {
/* no space, forget it */
- *socket_error = ENOBUFS;
+ *socket_error = SOCK_ERRNO(ENOBUFS);
return -1;
}
return inprogress ? 0 : 1;