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

Revert accidentally-committed changes to routerlist.c

Browse Source 
This reverts part of commit a0c1c2ac01.
This commit is contained in:
Nick Mathewson 2010-10-13 13:16:12 -04:00
parent a0c1c2ac01
commit 1c6649418d
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/routerlist.c
View File

@ -3216,13 +3216,13 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg,
/* Make sure that we haven't already got this exact descriptor. */ /* Make sure that we haven't already got this exact descriptor. */
if (sdmap_get(routerlist->desc_digest_map, if (sdmap_get(routerlist->desc_digest_map,
router->cache_info.signed_descriptor_digest)) { router->cache_info.signed_descriptor_digest)) {
/* If we have this descriptor already but the new descriptor is a bridge /* If we have this descriptor already and the new descriptor is a bridge
* descriptor, replace it. If we had a bridge descriptor before and the * descriptor, replace it. If we had a bridge descriptor before and the
* new one is not a bridge descriptor, don't replace it. */ * new one is not a bridge descriptor, don't replace it. */
const int had_as_bridge = old_router && tor_assert(old_router);
old_router->purpose == ROUTER_PURPOSE_BRIDGE; if (! (routerinfo_is_a_configured_bridge(router) &&
if (! routerinfo_is_a_configured_bridge(router) || (router->purpose == ROUTER_PURPOSE_BRIDGE ||
(router->purpose != ROUTER_PURPOSE_BRIDGE && had_as_bridge)) { old_router->purpose != ROUTER_PURPOSE_BRIDGE))) {
log_info(LD_DIR, log_info(LD_DIR,
"Dropping descriptor that we already have for router '%s'", "Dropping descriptor that we already have for router '%s'",
router->nickname); router->nickname);