From 45b500d5a60ca6c43e5a545b9e15e203be1feeac Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 15 Nov 2010 19:38:19 -0500 Subject: [PATCH] Clean up my 1776 fix a bit Sebastian notes (and I think correctly) that one of our ||s should have been an &&, which simplifies a boolean expression to decide whether to replace bridges. I'm also refactoring out the negation at the start of the expression, to make it more readable. --- src/or/routerlist.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 0e9265fe4f..670574a9d3 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -3238,8 +3238,12 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg, const int was_bridge = old_router && old_router->purpose == ROUTER_PURPOSE_BRIDGE; - if (! (routerinfo_is_a_configured_bridge(router) && - (router->purpose == ROUTER_PURPOSE_BRIDGE || !was_bridge))) { + if (routerinfo_is_a_configured_bridge(router) && + router->purpose == ROUTER_PURPOSE_BRIDGE && + !was_bridge) { + log_info(LD_DIR, "Replacing non-bridge descriptor with bridge " + "descriptor for router '%s'", router->nickname); + } else { log_info(LD_DIR, "Dropping descriptor that we already have for router '%s'", router->nickname); -- 2.11.4.GIT