mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-24 20:33:31 +01:00
Revert accidentally-committed changes to routerlist.c
This reverts part of commit a0c1c2ac01
.
This commit is contained in:
parent
a0c1c2ac01
commit
1c6649418d
@ -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. */
|
||||
if (sdmap_get(routerlist->desc_digest_map,
|
||||
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
|
||||
* new one is not a bridge descriptor, don't replace it. */
|
||||
const int had_as_bridge = old_router &&
|
||||
old_router->purpose == ROUTER_PURPOSE_BRIDGE;
|
||||
if (! routerinfo_is_a_configured_bridge(router) ||
|
||||
(router->purpose != ROUTER_PURPOSE_BRIDGE && had_as_bridge)) {
|
||||
tor_assert(old_router);
|
||||
if (! (routerinfo_is_a_configured_bridge(router) &&
|
||||
(router->purpose == ROUTER_PURPOSE_BRIDGE ||
|
||||
old_router->purpose != ROUTER_PURPOSE_BRIDGE))) {
|
||||
log_info(LD_DIR,
|
||||
"Dropping descriptor that we already have for router '%s'",
|
||||
router->nickname);
|
||||
|
Loading…
Reference in New Issue
Block a user