Commit 3c691b9d authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

r11785@catbus: nickm | 2007-02-12 20:27:48 -0500 

 Node-picking fixes: Never warn when a down node is listed in a config option (bug 348); always warn when a node in a config option is unnamed.  Also, when entrynodes is configured, then build the guard list as: (parts of EntryNodes that were guards before), (the rest of EntryNodes), (the rest of the old guards).  This last point ensures that EntryNode users will get the EntryNodes they want with the minimum change to their guard list.


svn:r9574
parent dc4c1f1b

ChangeLog

+6 −0
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ Changes in version 0.1.2.8-alpha - 2007-??-?? 
      other than file-not-found.

    - Don't warn the user when cached-routers.new doesn't exist: that's

      perfectly fine when starting up for the first time.

    - When EntryNodes are configured, rebuild the guard list to contain, in

      order: the EntryNodes that were guards before; the rest of the

      EntryNodes; the nodes that were guards before.



  o Minor features:

    - Warn the user when an application uses the obsolete binary v0
@@ -52,6 +55,9 @@ Changes in version 0.1.2.8-alpha - 2007-??-?? 
      which are incoming connections and which are outgoing.

    - Discard any v1 directory info that's over 1 month old (for

      directories) or over 1 week old (for running-routers lists).

    - Do not warn when individual nodes in the configuration's EntryNodes,

      ExitNodes (etc) are down: warn only when all possible nodes are down.

      (Fixes bug 348.)





Changes in version 0.1.2.7-alpha - 2007-02-06

src/common/container.c

+14 −0
Original line number Diff line number Diff line
@@ -221,6 +221,20 @@ smartlist_string_num_isin(const smartlist_t *sl, int num) 
  return smartlist_string_isin(sl, buf);

}



/** Return true iff <b>sl</b> has some element E such that

 * !memcmp(E,<b>element</b>,DIGEST_LEN)

 */

int

smartlist_digest_isin(const smartlist_t *sl, const char *element)

{

  int i;

  if (!sl) return 0;

  for (i=0; i < sl->num_used; i++)

    if (memcmp((const char*)sl->list[i],element,DIGEST_LEN)==0)

      return 1;

  return 0;

}



/** Return true iff some element E of sl2 has smartlist_isin(sl1,E).

 */

int

src/common/container.h

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ int smartlist_string_isin(const smartlist_t *sl, const char *element) 
int smartlist_string_isin_case(const smartlist_t *sl, const char *element)

  ATTR_PURE;

int smartlist_string_num_isin(const smartlist_t *sl, int num) ATTR_PURE;

int smartlist_digest_isin(const smartlist_t *sl, const char *element)

  ATTR_PURE;

int smartlist_overlap(const smartlist_t *sl1, const smartlist_t *sl2)

  ATTR_PURE;

void smartlist_intersect(smartlist_t *sl1, const smartlist_t *sl2);

src/or/circuitbuild.c

+44 −32
Original line number Diff line number Diff line
@@ -1226,10 +1226,10 @@ choose_good_exit_server_general(routerlist_t *dir, int need_uptime, 
           n_pending_connections);



  preferredexits = smartlist_create();

  add_nickname_list_to_smartlist(preferredexits,options->ExitNodes,1,1,1);

  add_nickname_list_to_smartlist(preferredexits,options->ExitNodes,1);



  excludedexits = smartlist_create();

  add_nickname_list_to_smartlist(excludedexits,options->ExcludeNodes,0,0,1);

  add_nickname_list_to_smartlist(excludedexits,options->ExcludeNodes,0);



  sl = smartlist_create();
@@ -2253,46 +2253,58 @@ entry_nodes_should_be_added(void) 
void

entry_guards_prepend_from_config(void)

{

  int missed_some = 0;

  int idx;

  or_options_t *options = get_options();

  smartlist_t *routers = smartlist_create();

  smartlist_t *tmp = smartlist_create();

  smartlist_t *entry_routers = smartlist_create();

  smartlist_t *old_entry_guards_on_list = smartlist_create();

  smartlist_t *old_entry_guards_not_on_list = smartlist_create();

  smartlist_t *entry_fps = smartlist_create();



  tor_assert(entry_guards);

  tor_assert(options->EntryNodes);



  if (options->StrictEntryNodes) {

    log_info(LD_CIRC,"Clearing old entry guards");

    SMARTLIST_FOREACH(entry_guards, entry_guard_t *, e, tor_free(e));

    smartlist_clear(entry_guards);

    entry_guards_changed();

  }



  add_nickname_list_to_smartlist(routers, options->EntryNodes,

                                 0, 1, 1);



  /* take a moment first to notice whether we got them all */

  log_info(LD_CIRC,"Adding configured EntryNodes '%s'.",

           options->EntryNodes);

  smartlist_split_string(tmp, options->EntryNodes, ",",

                         SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);

  missed_some = smartlist_len(routers) != smartlist_len(tmp);

  SMARTLIST_FOREACH(tmp, char *, nick, tor_free(nick));

  smartlist_free(tmp);



  for (idx = smartlist_len(routers)-1 ; idx >= 0; idx--) {

    /* pick off the last one, turn it into a router, prepend it

     * to our entry_guards list. If we can't find it, set missed_some

     * to 1. */

    routerinfo_t *r = smartlist_get(routers, idx);

    add_an_entry_guard(r);

  /* Split entry guards into those on the list and those not. */

  add_nickname_list_to_smartlist(entry_routers, options->EntryNodes, 0);

  SMARTLIST_FOREACH(entry_routers, routerinfo_t *, ri,

                    smartlist_add(entry_fps,ri->cache_info.identity_digest));

  SMARTLIST_FOREACH(entry_guards, entry_guard_t *, e, {

    if (smartlist_digest_isin(entry_fps, e->identity))

      smartlist_add(old_entry_guards_on_list, e);

    else

      smartlist_add(old_entry_guards_not_on_list, e);

  });



  /* Remove all currently configured entry guards from entry_routers. */

  SMARTLIST_FOREACH(entry_routers, routerinfo_t *, ri, {

    if (is_an_entry_guard(ri->cache_info.identity_digest)) {

      smartlist_del(entry_routers, ri_sl_idx--);

    }

  });



  if (!missed_some)

    should_add_entry_nodes = 0; /* whew, we're done */

  /* Now build the new entry_guards list. */

  smartlist_clear(entry_guards);

  /* First, the previously configured guards that are in EntryNodes. */

  smartlist_add_all(entry_guards, old_entry_guards_on_list);

  /* Next, the rest of EntryNodes */

  SMARTLIST_FOREACH(entry_routers, routerinfo_t *, ri, {

    add_an_entry_guard(ri);

  });

  /* Finally, the remaining EntryNodes, unless we're strict */

  if (options->StrictEntryNodes) {

    SMARTLIST_FOREACH(old_entry_guards_not_on_list, entry_guard_t *, e,

                      tor_free(e));

  } else {

    smartlist_add_all(entry_guards, old_entry_guards_not_on_list);

  }



  smartlist_free(routers);

  should_add_entry_nodes = 0;

  smartlist_free(entry_routers);

  smartlist_free(entry_fps);

  smartlist_free(old_entry_guards_on_list);

  smartlist_free(old_entry_guards_not_on_list);

  entry_guards_changed();

}



/** Pick a live (up and listed) entry guard from entry_guards, and

src/or/or.h

+1 −2
Original line number Diff line number Diff line
@@ -2869,8 +2869,7 @@ trusted_dir_server_t *router_get_trusteddirserver_by_digest( 
     const char *digest);

void routerlist_add_family(smartlist_t *sl, routerinfo_t *router);

void add_nickname_list_to_smartlist(smartlist_t *sl, const char *list,

                                    int must_be_running,

                                    int warn_if_down, int warn_if_unnamed);

                                    int must_be_running);

int router_nickname_is_in_list(routerinfo_t *router, const char *list);

routerinfo_t *routerlist_find_my_routerinfo(void);

routerinfo_t *router_find_exact_exit_enclave(const char *address,