[or-cvs] Make "Couldnt add router to list" message more descriptive....

Nick Mathewson nickm at seul.org
Fri Jul 15 19:40:40 UTC 2005


Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv11025/src/or

Modified Files:
	routerlist.c 
Log Message:
Make "Couldnt add router to list" message more descriptive.  Make messages consistenly punctuated.

Index: routerlist.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/routerlist.c,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -d -r1.243 -r1.244
--- routerlist.c	15 Jul 2005 18:56:59 -0000	1.243
+++ routerlist.c	15 Jul 2005 19:40:38 -0000	1.244
@@ -890,7 +890,7 @@
         log_fn(LOG_DEBUG, "Skipping unverified entry for verified router '%s'",
                router->nickname);
         routerinfo_free(router);
-        if (msg) *msg = "Already have verified router with same nickname and different key";
+        if (msg) *msg = "Already have verified router with same nickname and different key.";
         return -1;
       }
     }
@@ -944,10 +944,11 @@
 {
   routerinfo_t *ri;
   tor_assert(msg);
+  *msg = NULL;
 
   if (!(ri = router_parse_entry_from_string(s, NULL))) {
     log_fn(LOG_WARN, "Error parsing router descriptor; dropping.");
-    *msg = "Couldn't parse router descriptor";
+    *msg = "Couldn't parse router descriptor.";
     return -1;
   }
   if (router_is_me(ri)) {
@@ -969,7 +970,8 @@
                                         rr->running_routers);
   }
   if (router_add_to_routerlist(ri, msg)<0) {
-    log_fn(LOG_WARN, "Couldn't add router to list; dropping.");
+    log_fn(LOG_WARN, "Couldn't add router to list: %s Dropping.",
+           *msg?*msg:"(No message).");
     /* we've already assigned to *msg now, and ri is already freed */
     return 0;
   } else {



More information about the tor-commits mailing list