[tor-commits] [tor/master] Remove GS_TYPE_LEGACY

[nickm at torproject.org]

commit 6d03e36fd07eabf90c99e17c0aa3e13271e83fb6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 18 15:37:01 2017 -0500

    Remove GS_TYPE_LEGACY
---
 src/or/entrynodes.c        | 31 +++++++------------------------
 src/or/entrynodes.h        |  5 +----
 src/test/test_entrynodes.c |  3 ---
 3 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 3e3dff3..22cab26 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -199,9 +199,7 @@ guard_selection_infer_type(guard_selection_type_t type,
                            const char *name)
 {
   if (type == GS_TYPE_INFER) {
-    if (!strcmp(name, "legacy"))
-      type = GS_TYPE_LEGACY;
-    else if (!strcmp(name, "bridges"))
+    if (!strcmp(name, "bridges"))
       type = GS_TYPE_BRIDGE;
     else if (!strcmp(name, "restricted"))
       type = GS_TYPE_RESTRICTED;
@@ -3100,8 +3098,7 @@ entry_guards_update_state(or_state_t *state)
  * Return a newly allocated string.
  */
 STATIC char *
-getinfo_helper_format_single_entry_guard(const entry_guard_t *e,
-                                         int legacy_guard)
+getinfo_helper_format_single_entry_guard(const entry_guard_t *e)
 {
   const char *status = NULL;
   time_t when = 0;
@@ -3109,10 +3106,7 @@ getinfo_helper_format_single_entry_guard(const entry_guard_t *e,
   char tbuf[ISO_TIME_LEN+1];
   char nbuf[MAX_VERBOSE_NICKNAME_LEN+1];
 
-  if (legacy_guard) {
-    tor_assert_nonfatal_unreached();
-    status = "BUG";
-  } else {
+  if (1) {
     /* modern case.  This is going to be a bit tricky, since the status
      * codes above weren't really intended for prop271 guards.
      *
@@ -3177,19 +3171,12 @@ getinfo_helper_entry_guards(control_connection_t *conn,
   if (!strcmp(question,"entry-guards") ||
       !strcmp(question,"helper-nodes")) {
     const smartlist_t *guards;
-    int legacy_mode;
-    if (gs->type == GS_TYPE_LEGACY) {
-      tor_assert_nonfatal_unreached();
-      return 0;
-    } else {
-      guards = gs->sampled_entry_guards;
-      legacy_mode = 0;
-    }
+    guards = gs->sampled_entry_guards;
 
     smartlist_t *sl = smartlist_new();
 
     SMARTLIST_FOREACH_BEGIN(guards, const entry_guard_t *, e) {
-      char *cp = getinfo_helper_format_single_entry_guard(e, legacy_mode);
+      char *cp = getinfo_helper_format_single_entry_guard(e);
       smartlist_add(sl, cp);
     } SMARTLIST_FOREACH_END(e);
     *answer = smartlist_join_strings(sl, "", 0, NULL);
@@ -3248,12 +3235,8 @@ guards_update_all(void)
 
   tor_assert(curr_guard_context);
 
-  if (curr_guard_context->type == GS_TYPE_LEGACY) {
-    tor_assert_nonfatal_unreached();
-  } else {
-    if (entry_guards_update_all(curr_guard_context))
-      mark_circuits = 1;
-  }
+  if (entry_guards_update_all(curr_guard_context))
+    mark_circuits = 1;
 
   return mark_circuits;
 }
diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h
index a1ede71..2fd11cb 100644
--- a/src/or/entrynodes.h
+++ b/src/or/entrynodes.h
@@ -194,8 +194,6 @@ typedef enum guard_selection_type_t {
   /** Use the normal guard selection algorithm, taking our sample from the
    * set of filtered nodes. */
   GS_TYPE_RESTRICTED,
-  /** Use the legacy (pre-prop271) guard selection algorithm and fields */
-  GS_TYPE_LEGACY,
 } guard_selection_type_t;
 
 /**
@@ -548,8 +546,7 @@ STATIC unsigned entry_guards_note_guard_success(guard_selection_t *gs,
                                                 entry_guard_t *guard,
                                                 unsigned old_state);
 STATIC int entry_guard_has_higher_priority(entry_guard_t *a, entry_guard_t *b);
-STATIC char *getinfo_helper_format_single_entry_guard(const entry_guard_t *e,
-                                                      int is_legacy);
+STATIC char *getinfo_helper_format_single_entry_guard(const entry_guard_t *e);
 #endif
 
 struct bridge_info_t;
diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c
index 772ecaa..031177e 100644
--- a/src/test/test_entrynodes.c
+++ b/src/test/test_entrynodes.c
@@ -747,9 +747,6 @@ test_entry_guard_parse_from_state_broken(void *arg)
   gs_df = get_guard_selection_by_name("default", GS_TYPE_NORMAL, 0);
   tt_assert(gs_df != NULL);
   tt_int_op(smartlist_len(gs_df->sampled_entry_guards), OP_EQ, 1);
-  guard_selection_t *gs_legacy =
-    get_guard_selection_by_name("legacy", GS_TYPE_LEGACY, 0);
-  tt_assert(gs_legacy == NULL);
 
  done:
   config_free_lines(lines);