[or-cvs] authdirservers shouldn"t do orport reachability detection,

[arma@xxxxxxxx (Roger Dingledine)]

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

Modified Files:
	router.c 
Log Message:
authdirservers shouldn't do orport reachability detection,
since they're in clique mode, so it will be rare to find a
server not already connected to them.


Index: router.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/router.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- router.c	31 Mar 2005 19:26:33 -0000	1.162
+++ router.c	1 Apr 2005 07:09:18 -0000	1.163
@@ -383,7 +383,7 @@
 
 /** Return 1 if or port is known reachable; else return 0. */
 int check_whether_orport_reachable(void) {
-  return can_reach_or_port;
+  return clique_mode(get_options()) || can_reach_or_port;
 }
 /** Return 1 if we don't have a dirport configured, or if it's reachable. */
 int check_whether_dirport_reachable(void) {
@@ -413,7 +413,8 @@
 /** Annotate that we found our ORPort reachable. */
 void router_orport_found_reachable(void) {
   if (!can_reach_or_port) {
-    log_fn(LOG_NOTICE,"Your ORPort is reachable from the outside. Excellent. Publishing server descriptor.");
+    if (!clique_mode(get_options()))
+      log_fn(LOG_NOTICE,"Your ORPort is reachable from the outside. Excellent. Publishing server descriptor.");
     can_reach_or_port = 1;
   }
 }