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

Mention name of the transport used when we learn the fpr of a bridge.

Browse Source
This commit is contained in:
George Kadianakis 2013-01-09 15:52:35 +02:00
parent dffc8e359b
commit 50028e4d68
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/or/entrynodes.c
View File

@ -1501,9 +1501,17 @@ learned_router_identity(const tor_addr_t *addr, uint16_t port,
bridge_info_t *bridge = bridge_info_t *bridge =
get_configured_bridge_by_addr_port_digest(addr, port, digest); get_configured_bridge_by_addr_port_digest(addr, port, digest);
if (bridge && tor_digest_is_zero(bridge->identity)) { if (bridge && tor_digest_is_zero(bridge->identity)) {
char *transport_info = NULL;
const char *transport_name =
find_transport_name_by_bridge_addrport(addr, port);
if (transport_name)
tor_asprintf(&transport_info, " (with transport '%s')", transport_name);
memcpy(bridge->identity, digest, DIGEST_LEN); memcpy(bridge->identity, digest, DIGEST_LEN);
log_notice(LD_DIR, "Learned fingerprint %s for bridge %s", log_notice(LD_DIR, "Learned fingerprint %s for bridge %s%s.",
hex_str(digest, DIGEST_LEN), fmt_addrport(addr, port)); hex_str(digest, DIGEST_LEN), fmt_addrport(addr, port),
transport_info ? transport_info : "");
tor_free(transport_info);
} }
} }
@ -1629,7 +1637,9 @@ find_bridge_by_digest(const char *digest)
return NULL; return NULL;
} }
/* DOCDOC find_transport_name_by_bridge_addrport */ /** Given the <b>addr</b> and <b>port</b> of a bridge, if that bridge
* supports a pluggable transport, return its name. Otherwise, return
* NULL. */
const char * const char *
find_transport_name_by_bridge_addrport(const tor_addr_t *addr, uint16_t port) find_transport_name_by_bridge_addrport(const tor_addr_t *addr, uint16_t port)
{ {