aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuituse.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-06-05 10:01:52 +0000
committerRoger Dingledine <arma@torproject.org>2006-06-05 10:01:52 +0000
commit542b8af592edb731777207c39c02ffbeda2787b4 (patch)
tree806e9213096312493dc204aacdd6a1cddc8a0c85 /src/or/circuituse.c
parent8705db6c2c8666cb9e801d5a092c0c13f8cea0b0 (diff)
downloadtor-542b8af592edb731777207c39c02ffbeda2787b4.tar.gz
tor-542b8af592edb731777207c39c02ffbeda2787b4.zip
don't tell people that the testing circuit failed if we already
consider ourselves reachable. this just confuses them. svn:r6546
Diffstat (limited to 'src/or/circuituse.c')
-rw-r--r--src/or/circuituse.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 9e8d410813..372649a7b8 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -602,6 +602,9 @@ circuit_testing_failed(circuit_t *circ, int at_last_hop)
circuit_launch_by_router(CIRCUIT_PURPOSE_TESTING, me, 0, 1, 1);
else
#endif
+ if (server_mode(get_options()) && check_whether_orport_reachable())
+ return;
+
log_info(LD_GENERAL,
"Our testing circuit (to see if your ORPort is reachable) "
"has failed. I'll try again later.");