[or-cvs] when we"re checking reachability, make it clearer in the logs

[arma at seul.org]

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

Modified Files:
	circuitbuild.c main.c or.h 
Log Message:
when we're checking reachability, make it clearer in the logs
what to expect.


Index: circuitbuild.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -d -r1.170 -r1.171
--- circuitbuild.c	8 Dec 2005 20:33:57 -0000	1.170
+++ circuitbuild.c	8 Dec 2005 21:12:46 -0000	1.171
@@ -485,10 +485,11 @@
   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;
 }
 

Index: main.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.597
retrieving revision 1.598
diff -u -d -r1.597 -r1.598
--- main.c	3 Dec 2005 02:21:31 -0000	1.597
+++ main.c	8 Dec 2005 21:12:47 -0000	1.598
@@ -98,7 +98,6 @@
 #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 ************/

Index: or.h
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/or.h,v
retrieving revision 1.752
retrieving revision 1.753
diff -u -d -r1.752 -r1.753
--- or.h	8 Dec 2005 17:38:32 -0000	1.752
+++ or.h	8 Dec 2005 21:12:47 -0000	1.753
@@ -504,6 +504,9 @@
 #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