diff options
| author | Nick Mathewson <nickm@torproject.org> | 2005-07-15 19:40:38 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2005-07-15 19:40:38 +0000 |
| commit | 2cff73e7a4bf66dce0d539df351ec430f6bdc6fe (patch) | |
| tree | 608d833c1e813876191af906dd095bb88c721a6f /src | |
| parent | f8b48176ede5012ff21c67fa4d9a8c13c0e12860 (diff) | |
| download | tor-2cff73e7a4bf66dce0d539df351ec430f6bdc6fe.tar.gz tor-2cff73e7a4bf66dce0d539df351ec430f6bdc6fe.zip | |
Make "Couldnt add router to list" message more descriptive. Make messages consistenly punctuated.
svn:r4582
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/routerlist.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 2f5397eac1..41975c4262 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -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'", 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 @@ router_load_single_router(const char *s, const char **msg) { 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 @@ router_load_single_router(const char *s, const char **msg) 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 { |