Handle changed router status correctly when reloading fingerprint file

svn:r4016
This commit is contained in:
Nick Mathewson 2005-04-06 01:09:26 +00:00
parent 1b5e2182fa
commit 88fe4d6292

View File

@ -428,17 +428,25 @@ static void
directory_remove_unrecognized(void) directory_remove_unrecognized(void)
{ {
int i; int i;
int r;
routerinfo_t *ent; routerinfo_t *ent;
if (!descriptor_list) if (!descriptor_list)
descriptor_list = smartlist_create(); descriptor_list = smartlist_create();
for (i = 0; i < smartlist_len(descriptor_list); ++i) { for (i = 0; i < smartlist_len(descriptor_list); ++i) {
ent = smartlist_get(descriptor_list, i); ent = smartlist_get(descriptor_list, i);
if (dirserv_router_fingerprint_is_known(ent)<=0) { r = dirserv_router_fingerprint_is_known(ent);
log(LOG_INFO, "Router '%s' is no longer recognized", if (r<0) {
log(LOG_INFO, "Router '%s' is now verified with a key; removing old router with same name and different key.",
ent->nickname); ent->nickname);
routerinfo_free(ent); routerinfo_free(ent);
smartlist_del(descriptor_list, i--); smartlist_del(descriptor_list, i--);
} else if (r>0 && !ent->is_verified) {
log(LOG_INFO, "Router '%s' is now approved.", ent->nickname);
ent->is_verified = 1;
} else if (r==0 && ent->is_verified) {
log(LOG_INFO, "Router '%s' is no longer approved." ent->nickname);
ent->is_verified = 0;
} }
} }
} }