nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug7733a'

Browse Source
This commit is contained in:
Nick Mathewson 2014-09-22 10:38:05 -04:00
commit 1a1e695800
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/or/entrynodes.c
View File

@ -2291,6 +2291,13 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache)
node = node_get_mutable_by_id(ri->cache_info.identity_digest); node = node_get_mutable_by_id(ri->cache_info.identity_digest);
tor_assert(node); tor_assert(node);
rewrite_node_address_for_bridge(bridge, node); rewrite_node_address_for_bridge(bridge, node);
if (tor_digest_is_zero(bridge->identity)) {
memcpy(bridge->identity,ri->cache_info.identity_digest, DIGEST_LEN);
log_notice(LD_DIR, "Learned identity %s for bridge at %s:%d",
hex_str(bridge->identity, DIGEST_LEN),
fmt_and_decorate_addr(&bridge->addr),
(int) bridge->port);
}
add_an_entry_guard(node, 1, 1, 0, 0); add_an_entry_guard(node, 1, 1, 0, 0);
log_notice(LD_DIR, "new bridge descriptor '%s' (%s): %s", ri->nickname, log_notice(LD_DIR, "new bridge descriptor '%s' (%s): %s", ri->nickname,