From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 5 May 2013 22:55:19 +0000 (-0400)
Subject: Use a clearer idiom for node identity in router_counts_toward_thresholds
X-Git-Tag: tor-0.2.5.1-alpha~198^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1d7f7ea503f2f739953d6a25ebb5d93981604be;p=thirdparty%2Ftor.git

Use a clearer idiom for node identity in router_counts_toward_thresholds
---

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 16f297a80a..8f6d9ec438 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1898,7 +1898,7 @@ router_counts_toward_thresholds(const node_t *node, time_t now,
   }
 
   return node->ri && router_is_active(node->ri, node, now) &&
-    !digestmap_get(omit_as_sybil, node->ri->cache_info.identity_digest) &&
+    !digestmap_get(omit_as_sybil, node->identity) &&
     (dirserv_get_credible_bandwidth_kb(node->ri) >= min_bw_kb) &&
     (have_mbw || !require_mbw);
 }