diff options
author | Nick Mathewson <nickm@torproject.org> | 2011-05-30 14:58:26 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2011-05-30 14:58:26 -0400 |
commit | 21de9d46e264ceb14f3fe59d17210d82f2499637 (patch) | |
tree | 225afa4993f268fc867d922e646f0449cedebf1c /src/or/control.c | |
parent | 5dc3c462dcf42488055685e7f4fdb4a1a48003f1 (diff) | |
parent | da7c60dcf310fb9914bfd1b84a34b440ab04900a (diff) | |
download | tor-21de9d46e264ceb14f3fe59d17210d82f2499637.tar.gz tor-21de9d46e264ceb14f3fe59d17210d82f2499637.zip |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/common/compat.c
src/or/main.c
Diffstat (limited to 'src/or/control.c')
-rw-r--r-- | src/or/control.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c index 02cb422f4d..7a68f9bd3e 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1577,7 +1577,7 @@ getinfo_helper_listeners(control_connection_t *control_conn, struct sockaddr_storage ss; socklen_t ss_len = sizeof(ss); - if (conn->type != type || conn->marked_for_close || conn->s < 0) + if (conn->type != type || conn->marked_for_close || !SOCKET_OK(conn->s)) continue; if (getsockname(conn->s, (struct sockaddr *)&ss, &ss_len) < 0) { |