diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-06-18 07:34:04 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-06-18 07:34:04 +0000 |
| commit | c6a94718cd92b53bc647b7a7fa2d2327138303a5 (patch) | |
| tree | 83173d8173a40aec9252b840a4bd4abe4b3a7207 /src/or/connection_or.c | |
| parent | 50d3adb81938137b91b1f6720dfe84339e7309ce (diff) | |
| download | tor-c6a94718cd92b53bc647b7a7fa2d2327138303a5.tar.gz tor-c6a94718cd92b53bc647b7a7fa2d2327138303a5.zip | |
Directory authorities shouldn't complain about bootstrapping
problems just because they do a lot of reachability testing and
some of the connection attempts fail.
svn:r15348
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 1081a46437..b9bc5f40a5 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -548,8 +548,9 @@ connection_or_connect(uint32_t addr, uint16_t port, const char *id_digest) } control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED, errno_to_orconn_end_reason(socket_error)); - control_event_bootstrap_problem(tor_socket_strerror(socket_error), - errno_to_orconn_end_reason(socket_error)); + if (!authdir_mode_tests_reachability(options)) + control_event_bootstrap_problem(tor_socket_strerror(socket_error), + errno_to_orconn_end_reason(socket_error)); connection_free(TO_CONN(conn)); return NULL; case 0: @@ -799,7 +800,8 @@ connection_or_check_valid_tls_handshake(or_connection_t *conn, router_set_status(conn->identity_digest, 0); control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED, END_OR_CONN_REASON_OR_IDENTITY); - control_event_bootstrap_problem("foo", END_OR_CONN_REASON_OR_IDENTITY); + if (!authdir_mode_tests_reachability(options)) + control_event_bootstrap_problem("foo", END_OR_CONN_REASON_OR_IDENTITY); as_advertised = 0; } if (authdir_mode_tests_reachability(options)) { |