aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2013-01-09 15:52:35 +0200
committerGeorge Kadianakis <desnacked@riseup.net>2013-01-09 15:52:35 +0200
commit50028e4d6809f73194ed32031b3c854623582b26 (patch)
tree5a43c991814b5c44385ee0343c3130db3a9589c9
parentdffc8e359bcfeb00813a3afde6aa2328f6a6a476 (diff)
downloadtor-50028e4d6809f73194ed32031b3c854623582b26.tar
tor-50028e4d6809f73194ed32031b3c854623582b26.tar.gz
Mention name of the transport used when we learn the fpr of a bridge.
-rw-r--r--src/or/entrynodes.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index e583b881e..bddbd2496 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -1501,9 +1501,17 @@ learned_router_identity(const tor_addr_t *addr, uint16_t port,
bridge_info_t *bridge =
get_configured_bridge_by_addr_port_digest(addr, port, digest);
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);
- log_notice(LD_DIR, "Learned fingerprint %s for bridge %s",
- hex_str(digest, DIGEST_LEN), fmt_addrport(addr, port));
+ log_notice(LD_DIR, "Learned fingerprint %s for bridge %s%s.",
+ 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;
}
-/* 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 *
find_transport_name_by_bridge_addrport(const tor_addr_t *addr, uint16_t port)
{