mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 18:22:09 +01:00
Code Issues Projects Releases Wiki Activity

and then revert half of r9138

Browse Source 
svn:r9140
This commit is contained in:
Roger Dingledine 2006-12-16 07:04:26 +00:00
parent 80b8abf7be
commit f175aca3a8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/or/router.c
View File

@ -863,11 +863,9 @@ router_rebuild_descriptor(int force)
SMARTLIST_FOREACH(family, char *, name,
{
routerinfo_t *member;
if (!strcasecmp(name, options->Nickname)) {
/* Don't list ourself in our own family; that's redundant */
tor_free(name);
continue;
} else
if (!strcasecmp(name, options->Nickname))
member = ri;
else
member = router_get_by_nickname(name, 1);
if (!member) {
if (!smartlist_string_isin(warned_nonexistent_family, name) &&
@ -880,6 +878,8 @@ router_rebuild_descriptor(int force)
}
smartlist_add(ri->declared_family, name);
name = NULL;
} else if (router_is_me(member)) {
/* Don't list ourself in our own family; that's redundant */
} else {
char *fp = tor_malloc(HEX_DIGEST_LEN+2);
fp[0] = '$';