when we're checking reachability, make it clearer in the logs

what to expect.

svn:r5538

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 7b7f828d71e4881c5d18c9c442f600e90977b3d5..a7c8ca8788294b5442bfb4b86759be24f71c8845 100644 (file)
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -485,10 +485,11 @@ inform_testing_reachability(void)
   if (me->dir_port)
     tor_snprintf(dirbuf, sizeof(dirbuf), " and DirPort %s:%d",
                  me->address, me->dir_port);
-  log(LOG_NOTICE, LD_OR, "Now checking whether ORPort %s:%d%s %s reachable... (this may take several minutes)",
+  log(LOG_NOTICE, LD_OR, "Now checking whether ORPort %s:%d%s %s reachable... (this may take up to %d minutes -- look for log messages indicating success)",
       me->address, me->or_port,
       me->dir_port ? dirbuf : "",
-      me->dir_port ? "are" : "is");
+      me->dir_port ? "are" : "is",
+      TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT/60);
   return 1;
 }
 

diff --git a/src/or/main.c b/src/or/main.c
index ccba96e9919957aee1b5053707442a7cb10c697c..af9534da0baf3f582acac50ba85b9b8cdb89262e 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -98,7 +98,6 @@ static char* nt_strerror(uint32_t errnum);
 #define BUF_SHRINK_INTERVAL 60 /* one minute */
 #define DESCRIPTOR_RETRY_INTERVAL 10
 #define DESCRIPTOR_FAILURE_RESET_INTERVAL 60*60
-#define TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT (20*60) /* 20 minutes */
 #define ENTROPY_INTERVAL 60*60
 
 /********* END VARIABLES ************/

diff --git a/src/or/or.h b/src/or/or.h
index b3a78f74dc93f06979f265392c2f746632fdf8a9..e7edaa33a3574b6e74781a45ddd9d93ffc7da39c 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -504,6 +504,9 @@ typedef enum {
 #define CELL_CREATE_FAST 5
 #define CELL_CREATED_FAST 6
 
+/** How long to test reachability before complaining to the user. */
+#define TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT (20*60) /* 20 minutes */
+
 /* people behind fascist firewalls use only these ports */
 #define REQUIRED_FIREWALL_DIRPORT 80
 #define REQUIRED_FIREWALL_ORPORT 443