commit 9b60acd4d4ee451fd961b1f03ae46eee960c72ee Author: Taylor Yu catalyst@torproject.org Date: Thu Sep 28 17:15:47 2017 -0500

Rewrite bridge addresses earlier

Call rewrite_node_address_for_bridge() in launch_direct_bridge_descriptor_fetch() in case there's an existing node_t for it. --- changes/bug20532 | 4 ++++ src/or/bridges.c | 8 ++++++++ 2 files changed, 12 insertions(+)

diff --git a/changes/bug20532 b/changes/bug20532 new file mode 100644 index 000000000..7c190ea03 --- /dev/null +++ b/changes/bug20532 @@ -0,0 +1,4 @@ + o Minor bugfixes (bridges): + - Overwrite the bridge address earlier in the process of directly + retrieving its descriptor, to make sure we reach it on the configured + address. Fixes bug 20532; bugfix on 0.2.0.10-alpha. diff --git a/src/or/bridges.c b/src/or/bridges.c index 0818fb081..0bcc3eeb4 100644 --- a/src/or/bridges.c +++ b/src/or/bridges.c @@ -54,6 +54,8 @@ struct bridge_info_t { };

static void bridge_free(bridge_info_t *bridge); +static void rewrite_node_address_for_bridge(const bridge_info_t *bridge, + node_t *node);

/** A list of configured bridges. Whenever we actually get a descriptor * for one, we add it as an entry guard. Note that the order of bridges @@ -571,6 +573,12 @@ launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge) return; }

+ /* If we already have a node_t for this bridge, rewrite its address now. */ + node_t *node = node_get_mutable_by_id(bridge->identity); + if (node) { + rewrite_node_address_for_bridge(bridge, node); + } + tor_addr_port_t bridge_addrport; memcpy(&bridge_addrport.addr, &bridge->addr, sizeof(tor_addr_t)); bridge_addrport.port = bridge->port;