[or-cvs] and back-port that part of the fix

[arma at seul.org]

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
	main.c 
Log Message:
and back-port that part of the fix


Index: main.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.505.2.5
retrieving revision 1.505.2.6
diff -u -d -r1.505.2.5 -r1.505.2.6
--- main.c	15 Jul 2005 19:31:39 -0000	1.505.2.5
+++ main.c	22 Aug 2005 23:00:48 -0000	1.505.2.6
@@ -818,12 +818,12 @@
         TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) {
     /* every 20 minutes, check and complain if necessary */
     routerinfo_t *me = router_get_my_routerinfo();
-    if (!check_whether_orport_reachable())
+    if (me && !check_whether_orport_reachable())
       log(LOG_WARN,"Your server (%s:%d) has not managed to confirm that its ORPort is reachable. Please check your firewalls, ports, address, etc.",
-          me ? me->address : options->Address, options->ORPort);
-    if (!check_whether_dirport_reachable())
+          me->address, me->or_port);
+    if (me && !check_whether_dirport_reachable())
       log(LOG_WARN,"Your server (%s:%d) has not managed to confirm that its DirPort is reachable. Please check your firewalls, ports, address, etc.",
-          me ? me->address : options->Address, options->DirPort);
+          me->address, me->dir_port);
   }
 
   /* if more than 100s have elapsed, probably the clock jumped: doesn't count. */