[or-cvs] don"t tell people that the testing circuit failed if we alr...

[arma@xxxxxxxx]

Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	circuituse.c 
Log Message:
don't tell people that the testing circuit failed if we already
consider ourselves reachable. this just confuses them.


Index: circuituse.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuituse.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -p -d -r1.128 -r1.129
--- circuituse.c	5 Jun 2006 08:25:02 -0000	1.128
+++ circuituse.c	5 Jun 2006 10:01:52 -0000	1.129
@@ -602,6 +602,9 @@ circuit_testing_failed(circuit_t *circ, 
     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.");