GitLab

This patch is the initial attempt at refactoring common code found in
router_pick_directory_server_impl and router_pick_trusteddirserver_impl.

We remove the functions router_is_already_dir_fetching_ds and
router_is_already_dir_fetching_rs and lift their body into the macro
SKIP_IF_ALREADY_DIR_FETCHING. These two functions had the exact same
function body, but was created to support the dir_server_t and
routerstatus_t types respectively. Using a macro we can reduce this to a
single macro instead of two functions.

Additionally, we lift common code found within
router_pick_trusteddirserver_impl and router_pick_directory_server_impl
into the following macros:

 - SKIP_MISSING_TRUSTED_EXTRAINFO(identity): Check if a given server's
   identity supports fetching the extra-info document, otherwise skip
   it.

 - SKIP_EXCLUDED(status, country): Check if a given server's included in
   the users' ExcludeNodes torrc configuration entry, if so, skip it.

This is a partial fix of bug #17847.

Signed-off-by: David Goulet <dgoulet@torproject.org>

Signed-off-by: David Goulet <dgoulet@torproject.org>

Signed-off-by: David Goulet <dgoulet@torproject.org>

Previously we freed the old "keys" object, but leaked the
worker_state_t that we had taken it from.

Fixes bug 20401; bugfix on 0.2.6.3-alpha.

Closes 20487.

Previously we said we did, but didn't.

Fixes #19968; bugfix on 0.2.3.1-alpha.

This helps avoid the confusion that caused bug 20472.
Bugfix on commit 10aa913a from #19163 in tor-0.2.9.3-alpha.

Make the structure of circuit_pick_create_handshake consistent with
circuit_pick_extend_handshake.

No behaviour change.

This simplifies the function: if we have an ntor key, use ntor/EXTEND2,
otherwise, use TAP/EXTEND.

Bugfix on commit 10aa913a from 19163 in 0.2.9.3-alpha.

I had replaced a comment implying that a set of ifs was meant to be
exhaustive with an actual check for exhaustiveness.  It turns out,
they were exhaustive, but not in the way I had assumed. :(

Bug introduced in f3e158ed, not in any released Tor.

The coccinelle script produced errors with these test files so
convert the remaining cases of smartlist_add to
smartlist_add_strdup by hand.

Use the following coccinelle script to change uses of
smartlist_add(sl, tor_strdup(str)) to
smartlist_add_strdup(sl, string) (coccinelle script from nickm
via bug 20048):

@@
expression a;
expression b;
@@
- smartlist_add
+ smartlist_add_strdup
   (a,
- tor_strdup(
   b
- )
  )

Add smartlist_add_strdup(sl, string) - replaces the use of
smartlist_add(sl, tor_strdup(string)). Fixes bug 20048.

See #14881

The tor_fragile_assert() bug has existed here since c8a5e2d5
in tor-0.2.1.7-alpha forever, but tor_fragile_assert() was mostly a
no-op until 0.2.9.1-alpha.

Fixes bug 19869.