diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-07-04 03:31:27 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-07-04 03:31:27 +0000 |
| commit | 05d0b705734b43d1986be2b999de904676f854c0 (patch) | |
| tree | 80816dfb5679e587ce851935ed15b93f91d0ae30 /src/or/main.c | |
| parent | ff1b4764e900760a45e3690c18d56e26e51bfa5a (diff) | |
| download | tor-05d0b705734b43d1986be2b999de904676f854c0.tar.gz tor-05d0b705734b43d1986be2b999de904676f854c0.zip | |
Get rid of the router_retry_connections notion. Now routers no longer
try to rebuild long-term connections to directory authorities, and
directory authorities no longer try to rebuild long-term connections to
all servers.
We still don't hang up connections in these two cases though -- we need
to look at it more carefully to avoid flapping, and we likely need to
wait til 0.1.1.x is obsolete.
svn:r6712
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/or/main.c b/src/or/main.c index d331c961cc..bb562a5723 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -568,13 +568,9 @@ directory_info_has_arrived(time_t now, int from_cache) return; } - if (server_mode(options) && - !we_are_hibernating()) { /* connect to the appropriate routers */ - if (!authdir_mode(options)) - router_retry_connections(0, 1); - if (!from_cache && has_completed_circuit) - consider_testing_reachability(); - } + if (server_mode(options) && !we_are_hibernating() && + !from_cache && has_completed_circuit) + consider_testing_reachability(); } /** Perform regular maintenance tasks for a single connection. This @@ -782,7 +778,7 @@ run_scheduled_events(time_t now) if (now % 10 == 0 && authdir_mode(options) && !we_are_hibernating()) { /* try to determine reachability */ - router_retry_connections(1, 0); + dirserv_test_reachability(0); } /** 2. Periodically, we consider getting a new directory, getting a @@ -1134,7 +1130,7 @@ do_main_loop(void) if (authdir_mode(get_options())) { /* the directory is already here, run startup things */ - router_retry_connections(1, 1); + dirserv_test_reachability(1); } if (server_mode(get_options())) { |