[or-cvs] clean up a few more log entries

[arma@xxxxxxxx]

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

Modified Files:
	directory.c main.c router.c 
Log Message:
clean up a few more log entries


Index: directory.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/directory.c,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -d -r1.229 -r1.230
--- directory.c	23 May 2005 05:20:52 -0000	1.229
+++ directory.c	27 May 2005 17:43:43 -0000	1.230
@@ -664,7 +664,7 @@
   if (!reason) reason = tor_strdup("[no reason given]");
 
   log_fn(LOG_DEBUG,
-         "Received response from directory servers '%s': %d \"%s\"",
+         "Received response from directory server '%s': %d \"%s\"",
          conn->address, status_code, reason);
 
   if (date_header > 0) {

Index: main.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.504
retrieving revision 1.505
diff -u -d -r1.504 -r1.505
--- main.c	25 May 2005 02:20:15 -0000	1.504
+++ main.c	27 May 2005 17:43:43 -0000	1.505
@@ -818,11 +818,11 @@
     /* every 20 minutes, check and complain if necessary */
     routerinfo_t *me = router_get_my_routerinfo();
     if (!check_whether_orport_reachable())
-      log_fn(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);
+      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())
-      log_fn(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);
+      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);
   }
 
   /* if more than 100s have elapsed, probably the clock jumped: doesn't count. */

Index: router.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/router.c,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176
--- router.c	23 May 2005 05:20:52 -0000	1.175
+++ router.c	27 May 2005 17:43:43 -0000	1.176
@@ -405,7 +405,7 @@
     if (me) {
       directory_initiate_command_router(me, DIR_PURPOSE_FETCH_DIR, 1, NULL, NULL, 0);
     } else {
-      log_fn(LOG_NOTICE,"Delaying checking DirPort reachability; can't build descriptor.");
+      log(LOG_NOTICE,"Delaying checking DirPort reachability; can't build descriptor.");
     }
   }
 }
@@ -414,7 +414,7 @@
 void router_orport_found_reachable(void) {
   if (!can_reach_or_port) {
     if (!clique_mode(get_options()))
-      log_fn(LOG_NOTICE,"Your ORPort is reachable from the outside. Excellent. Publishing server descriptor.");
+      log(LOG_NOTICE,"Your ORPort is reachable from the outside. Excellent. Publishing server descriptor.");
     can_reach_or_port = 1;
     consider_publishable_server(time(NULL), 1);
   }
@@ -423,7 +423,7 @@
 /** Annotate that we found our DirPort reachable. */
 void router_dirport_found_reachable(void) {
   if (!can_reach_dir_port) {
-    log_fn(LOG_NOTICE,"Your DirPort is reachable from the outside. Excellent.");
+    log(LOG_NOTICE,"Your DirPort is reachable from the outside. Excellent.");
     can_reach_dir_port = 1;
   }
 }