nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-01 08:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make "Couldnt add router to list" message more descriptive. Make messages consistenly punctuated.

Browse Source 
svn:r4582
This commit is contained in:
Nick Mathewson 2005-07-15 19:40:38 +00:00
parent f8b48176ed
commit 2cff73e7a4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/routerlist.c
View File

@ -890,7 +890,7 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg)
log_fn(LOG_DEBUG, "Skipping unverified entry for verified router '%s'", log_fn(LOG_DEBUG, "Skipping unverified entry for verified router '%s'",
router->nickname); router->nickname);
routerinfo_free(router); 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; return -1;
} }
} }
@ -944,10 +944,11 @@ router_load_single_router(const char *s, const char **msg)
{ {
routerinfo_t *ri; routerinfo_t *ri;
tor_assert(msg); tor_assert(msg);
*msg = NULL;
if (!(ri = router_parse_entry_from_string(s, NULL))) { if (!(ri = router_parse_entry_from_string(s, NULL))) {
log_fn(LOG_WARN, "Error parsing router descriptor; dropping."); log_fn(LOG_WARN, "Error parsing router descriptor; dropping.");
*msg = "Couldn't parse router descriptor"; *msg = "Couldn't parse router descriptor.";
return -1; return -1;
} }
if (router_is_me(ri)) { if (router_is_me(ri)) {
@ -969,7 +970,8 @@ router_load_single_router(const char *s, const char **msg)
rr->running_routers); rr->running_routers);
} }
if (router_add_to_routerlist(ri, msg)<0) { 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 */ /* we've already assigned to *msg now, and ri is already freed */
return 0; return 0;
} else { } else {