nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

if router_resolve fails on the descriptor the controller

Browse Source 
gives us, we shouldn't leave the routerinfo in the list.


svn:r4205
This commit is contained in:
Roger Dingledine 2005-05-14 05:01:41 +00:00
parent b92a77b1d2
commit 07230a698c
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/or/routerlist.c
View File

@ -796,7 +796,7 @@ void router_mark_as_down(const char *digest) {
/** Add <b>router</b> to the routerlist, if we don't already have it. Replace /** Add <b>router</b> to the routerlist, if we don't already have it. Replace
* older entries (if any) with the same name. Note: Callers should not hold * older entries (if any) with the same name. Note: Callers should not hold
* their pointers to <b>router</b> after invoking this function; <b>router</b> * their pointers to <b>router</b> if this function fails; <b>router</b>
* will either be inserted into the routerlist or freed. Returns 0 if the * will either be inserted into the routerlist or freed. Returns 0 if the
* router was added; -1 if it was not. * router was added; -1 if it was not.
* *
@ -914,6 +914,18 @@ router_load_single_router(const char *s, const char **msg)
if (msg) *msg = "Couldn't parse router descriptor"; if (msg) *msg = "Couldn't parse router descriptor";
return -1; return -1;
} }
if (router_is_me(ri)) {
log_fn(LOG_WARN, "Router's identity key matches mine; dropping.");
if (msg && !*msg) *msg = "Router's identity key matches mine.";
routerinfo_free(ri);
return 0;
}
if (router_resolve(ri)<0) {
log_fn(LOG_WARN, "Couldn't resolve router address; dropping.");
if (msg && !*msg) *msg = "Couldn't resolve router address.";
routerinfo_free(ri);
return 0;
}
if (routerlist && routerlist->running_routers) { if (routerlist && routerlist->running_routers) {
running_routers_t *rr = routerlist->running_routers; running_routers_t *rr = routerlist->running_routers;
router_update_status_from_smartlist(ri, router_update_status_from_smartlist(ri,
@ -923,6 +935,7 @@ router_load_single_router(const char *s, const char **msg)
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; dropping.");
if (msg && !*msg) *msg = "Couldn't add router to list."; if (msg && !*msg) *msg = "Couldn't add router to list.";
/* ri is already freed */
return 0; return 0;
} else { } else {
smartlist_t *changed = smartlist_create(); smartlist_t *changed = smartlist_create();
@ -931,11 +944,6 @@ router_load_single_router(const char *s, const char **msg)
smartlist_free(changed); smartlist_free(changed);
} }
if (router_resolve(ri)<0) {
if (msg && !*msg) *msg = "Couldn't resolve router address.";
return 0;
}
log_fn(LOG_DEBUG, "Added router to list"); log_fn(LOG_DEBUG, "Added router to list");
return 1; return 1;
} }