stop logging at -l notice every single time a create cell successfully

gets processed

svn:r3791

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 7e01fc3d3635e714dab6c7a34938537469ed5581..2c9542e99c8079bf3ffdf238786f7994f5acdaf3 100644 (file)
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -734,7 +734,6 @@ int onionskin_answer(circuit_t *circ, unsigned char *payload, unsigned char *key
   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();
   }
 

diff --git a/src/or/main.c b/src/or/main.c
index f0919c225a44c9b0f7b2e7e20bb30724ad4d5129..4ebace81f1fb5f1af52b0a2a5e1fdbf59a4a8efb 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -638,9 +638,8 @@ void directory_has_arrived(time_t now, char *identity_digest) {
   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();
     }
   }

diff --git a/src/or/router.c b/src/or/router.c
index e2263eef8124f842d5270f012c99a410e5000672..0d158c7eaaaa807e7aed718ac41ac3eddb3bd88c 100644 (file)
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -399,12 +399,18 @@ void consider_testing_reachability(void) {
 
 /** 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. */