diff options
| author | Roger Dingledine <arma@torproject.org> | 2005-12-11 11:54:55 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2005-12-11 11:54:55 +0000 |
| commit | dded1dd8bd2d2ffff6500bc2b5df5661256f0348 (patch) | |
| tree | acebce544b20d9941c18fb2c4ae6ff8c00e28041 /src/or/connection_or.c | |
| parent | 9c01fa3d5981ada2f664f65b8437b4cbeb4d202b (diff) | |
| download | tor-dded1dd8bd2d2ffff6500bc2b5df5661256f0348.tar.gz tor-dded1dd8bd2d2ffff6500bc2b5df5661256f0348.zip | |
don't mark the helper node as down when we fail to connect to
our https proxy.
svn:r5566
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 6c67500c46..fbc86a3764 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -442,9 +442,12 @@ connection_or_connect(uint32_t addr, uint16_t port, const char *id_digest) switch (connection_connect(conn, conn->address, addr, port)) { case -1: - if (!options->HttpsProxy) + if (!options->HttpsProxy) { + /* If the connection failed immediately, our https proxy + * is down. Don't blame the Tor server. */ router_mark_as_down(conn->identity_digest); - helper_node_set_status(conn->identity_digest, 0); + helper_node_set_status(conn->identity_digest, 0); + } control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED); connection_free(conn); return NULL; |