From 9b60acd4d4ee451fd961b1f03ae46eee960c72ee Mon Sep 17 00:00:00 2001 From: Taylor Yu Date: Thu, 28 Sep 2017 17:15:47 -0500 Subject: 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. --- src/or/bridges.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/or') diff --git a/src/or/bridges.c b/src/or/bridges.c index 0818fb0812..0bcc3eeb45 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; -- cgit v1.2.3-54-g00ecf