From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 16 Nov 2010 00:38:19 +0000 (-0500)
Subject: Clean up my 1776 fix a bit
X-Git-Tag: tor-0.2.2.18-alpha~4^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45b500d5a60ca6c43e5a545b9e15e203be1feeac;p=thirdparty%2Ftor.git

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.
---

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);