[tor-commits] [tor/maint-0.3.0] Replace entry_guard_get_by_id_digest_for_guard_selection impl.

[nickm@xxxxxxxxxxxxxx]

commit f5995692dadf9bc038455d7e701be84937f28d82
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 14 10:28:54 2017 -0500

    Replace entry_guard_get_by_id_digest_for_guard_selection impl.
    
    We already implemented this whole function somewhere else; no need
    to have the same code twice.
---
 src/or/entrynodes.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 3bb5169..93dd2bd 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -2901,13 +2901,7 @@ entry_guard_t *
 entry_guard_get_by_id_digest_for_guard_selection(guard_selection_t *gs,
                                                  const char *digest)
 {
-  tor_assert(gs != NULL);
-
-  SMARTLIST_FOREACH(gs->sampled_entry_guards, entry_guard_t *, entry,
-                    if (tor_memeq(digest, entry->identity, DIGEST_LEN))
-                      return entry;
-                   );
-  return NULL;
+  return get_sampled_guard_with_id(gs, (const uint8_t*)digest);
 }
 
 /** Return the node_t associated with a single entry_guard_t. May



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits