diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-09-09 06:25:39 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-09-09 06:25:39 +0000 |
| commit | d37fae2f4edb03095f943577f78b518f75f6ca71 (patch) | |
| tree | 65affa5651b1e0b1de42fe96ef4245974fbfbcc3 /src/or/main.c | |
| parent | aacda9cd8eae992c9359279782234dd626415948 (diff) | |
| download | tor-d37fae2f4edb03095f943577f78b518f75f6ca71.tar.gz tor-d37fae2f4edb03095f943577f78b518f75f6ca71.zip | |
Catch and report a few more bootstrapping failure cases when Tor
fails to establish a TCP connection. Cleanup on 0.2.1.x.
svn:r16803
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c index a91937c7a9..6f783e6e0b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -743,6 +743,10 @@ run_connection_housekeeping(int i, time_t now) log_info(LD_OR, "Expiring non-used OR connection to fd %d (%s:%d) [Obsolete].", conn->s, conn->address, conn->port); + if (conn->state == OR_CONN_STATE_CONNECTING) + connection_or_connect_failed(TO_OR_CONN(conn), + END_OR_CONN_REASON_TIMEOUT, + "Tor gave up on the connection"); connection_mark_for_close(conn); conn->hold_open_until_flushed = 1; return; |