[or-cvs] stop logging at -l notice every single time a create cell s...

[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:
	circuitbuild.c main.c router.c 
Log Message:
stop logging at -l notice every single time a create cell successfully
gets processed


Index: circuitbuild.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- circuitbuild.c	19 Mar 2005 06:57:15 -0000	1.87
+++ circuitbuild.c	19 Mar 2005 23:04:15 -0000	1.88
@@ -734,7 +734,6 @@
   if (!is_local_IP(circ->p_conn->addr)) {
     /* record that we could process create cells; presumably this means
        that create cells can reach us too. */
-    log_fn(LOG_NOTICE,"Your ORPort is reachable from the outside. Excellent.");
     router_orport_found_reachable();
   }
 

Index: main.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -d -r1.461 -r1.462
--- main.c	19 Mar 2005 01:04:05 -0000	1.461
+++ main.c	19 Mar 2005 23:04:15 -0000	1.462
@@ -638,9 +638,8 @@
   if (identity_digest) { /* if this is us, then our dirport is reachable */
     routerinfo_t *router = router_get_by_digest(identity_digest);
     if (!router) // XXX
-      log_fn(LOG_WARN,"Roger, router_get_by_digest doesn't find me.");
+      log_fn(LOG_WARN,"Bug: router_get_by_digest doesn't find me.");
     if (router && router_is_me(router)) {
-      log_fn(LOG_NOTICE,"Your DirPort is reachable from the outside. Excellent.");
       router_dirport_found_reachable();
     }
   }

Index: router.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/router.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- router.c	19 Mar 2005 06:57:16 -0000	1.154
+++ router.c	19 Mar 2005 23:04:15 -0000	1.155
@@ -399,12 +399,18 @@
 
 /** Annotate that we found our ORPort reachable. */
 void router_orport_found_reachable(void) {
-  can_reach_or_port = 1;
+  if (!can_reach_or_port) {
+    log_fn(LOG_NOTICE,"Your ORPort is reachable from the outside. Excellent.");
+    can_reach_or_port = 1;
+  }
 }
 
 /** Annotate that we found our DirPort reachable. */
 void router_dirport_found_reachable(void) {
-  can_reach_dir_port = 1;
+  if (!can_reach_dir_port) {
+    log_fn(LOG_NOTICE,"Your DirPort is reachable from the outside. Excellent.");
+    can_reach_dir_port = 1;
+  }
 }
 
 /** Our router has just moved to a new IP. Reset stats. */