mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
don't warn when we get a server descriptor from the controller
but it's too old. that's not something tor should fix. svn:r6019
This commit is contained in:
parent
3a48b3e186
commit
f6d80d60e0
@ -1820,6 +1820,7 @@ int
|
||||
router_load_single_router(const char *s, const char **msg)
|
||||
{
|
||||
routerinfo_t *ri;
|
||||
int r;
|
||||
smartlist_t *lst;
|
||||
tor_assert(msg);
|
||||
*msg = NULL;
|
||||
@ -1840,10 +1841,11 @@ router_load_single_router(const char *s, const char **msg)
|
||||
smartlist_add(lst, ri);
|
||||
routers_update_status_from_networkstatus(lst, 0);
|
||||
|
||||
if (router_add_to_routerlist(ri, msg, 0, 0)<0) {
|
||||
log_warn(LD_DIR, "Couldn't add router to list: %s Dropping.",
|
||||
*msg?*msg:"(No message).");
|
||||
if ((r=router_add_to_routerlist(ri, msg, 0, 0))<0) {
|
||||
/* we've already assigned to *msg now, and ri is already freed */
|
||||
tor_assert(*msg);
|
||||
if (r < -1)
|
||||
log_warn(LD_DIR, "Couldn't add router to list: %s Dropping.", *msg);
|
||||
smartlist_free(lst);
|
||||
return 0;
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user