diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-06-20 04:34:39 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-06-20 04:34:39 +0000 |
| commit | 94dabd2c23bf86dcd603d53a1e0a678b77097737 (patch) | |
| tree | ae4be6978766f346407a9c3d4eca92a793c944fc /src/or/connection.c | |
| parent | dd50ffb1de2b408be2d6e5c0aba767d361bc80c5 (diff) | |
| download | tor-94dabd2c23bf86dcd603d53a1e0a678b77097737.tar.gz tor-94dabd2c23bf86dcd603d53a1e0a678b77097737.zip | |
If you're using bridges, generate "bootstrap problem" warnings
as soon as you run out of working bridges, rather than waiting
for ten failures -- which will never happen if you have less than
ten bridges.
svn:r15368
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index f83ea9d7ff..690cc02774 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -494,6 +494,10 @@ connection_about_to_close_connection(connection_t *conn) or_conn = TO_OR_CONN(conn); /* Remember why we're closing this connection. */ if (conn->state != OR_CONN_STATE_OPEN) { + /* Inform any pending (not attached) circs that they should + * give up. */ + circuit_n_conn_done(TO_OR_CONN(conn), 0); + /* now mark things down as needed */ if (connection_or_nonopen_was_started_here(or_conn)) { or_options_t *options = get_options(); rep_hist_note_connect_failed(or_conn->identity_digest, now); @@ -517,9 +521,6 @@ connection_about_to_close_connection(connection_t *conn) orconn_end_reason_to_control_string(reason), reason); } } - /* Inform any pending (not attached) circs that they should - * give up. */ - circuit_n_conn_done(TO_OR_CONN(conn), 0); } else if (conn->hold_open_until_flushed) { /* We only set hold_open_until_flushed when we're intentionally * closing a connection. */ |