[or-cvs] backport the part about giving log messages that tell the s...

[arma@xxxxxxxx]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/tor-010x/tor/src/or

Modified Files:
      Tag: tor-0_1_0-patches
	circuitbuild.c main.c or.h 
Log Message:
backport the part about giving log messages that tell the server
operator what to expect for reachability testing.


Index: circuitbuild.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.115
retrieving revision 1.115.2.1
diff -u -d -r1.115 -r1.115.2.1
--- circuitbuild.c	17 May 2005 19:46:43 -0000	1.115
+++ circuitbuild.c	8 Dec 2005 21:33:55 -0000	1.115.2.1
@@ -492,9 +492,10 @@
         log(LOG_NOTICE,"Tor has successfully opened a circuit. Looks like it's working.");
         /* XXX009 Log a count of known routers here */
         if (server_mode(options) && !check_whether_orport_reachable())
-          log(LOG_NOTICE,"Now checking whether ORPort %s%s reachable... (this may take several minutes)",
+          log(LOG_NOTICE,"Now checking whether ORPort %s%s reachable... (this may take up to %d minutes -- look for log messages indicating success)",
                  options->DirPort ? "and DirPort " : "",
-                 options->DirPort ? "are" : "is");
+                 options->DirPort ? "are" : "is",
+                 TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT/60);
       }
       circuit_rep_hist_note_result(circ);
       circuit_has_opened(circ); /* do other actions as necessary */

Index: main.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.505.2.6
retrieving revision 1.505.2.7
diff -u -d -r1.505.2.6 -r1.505.2.7
--- main.c	22 Aug 2005 23:00:48 -0000	1.505.2.6
+++ main.c	8 Dec 2005 21:33:56 -0000	1.505.2.7
@@ -103,7 +103,6 @@
 
 #define CHECK_DESCRIPTOR_INTERVAL 60 /* one minute */
 #define BUF_SHRINK_INTERVAL 60 /* one minute */
-#define TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT (20*60) /* 20 minutes */
 
 /********* END VARIABLES ************/
 

Index: or.h
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/or.h,v
retrieving revision 1.610.2.4
retrieving revision 1.610.2.5
diff -u -d -r1.610.2.4 -r1.610.2.5
--- or.h	5 Dec 2005 19:52:05 -0000	1.610.2.4
+++ or.h	8 Dec 2005 21:33:56 -0000	1.610.2.5
@@ -477,6 +477,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