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

hs: Improve logging

Browse Source 
Also demote a log message that can occur under natural causes
(if the circuit subsystem is missing descriptors/consensus etc.).
The HS subsystem will naturally retry to connect to intro points,
so no need to make that log user-facing.
This commit is contained in:
David Goulet 2017-09-25 16:31:43 -04:00 committed by George Kadianakis
parent 4190f602bd
commit 648d5ea67e
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/or/hs_service.c
View File

@ -1570,6 +1570,8 @@ pick_intro_point(unsigned int direct_conn, smartlist_t *exclude_nodes)
if (ip == NULL) { if (ip == NULL) {
goto err; goto err;
} }
log_info(LD_REND, "Picked intro point: %s", extend_info_describe(info));
extend_info_free(info); extend_info_free(info);
return ip; return ip;
err: err:
@ -1725,11 +1727,12 @@ update_service_descriptor(hs_service_t *service,
desc); desc);
if (num_new_intro_points != 0) { if (num_new_intro_points != 0) {
log_info(LD_REND, "Service %s just picked %u intro points and wanted " log_info(LD_REND, "Service %s just picked %u intro points and wanted "
"%u. It currently has %d intro points. " "%u for %s descriptor. It currently has %d intro "
"Launching ESTABLISH_INTRO circuit shortly.", "points. Launching ESTABLISH_INTRO circuit shortly.",
safe_str_client(service->onion_address), safe_str_client(service->onion_address),
num_new_intro_points, num_new_intro_points,
service->config.num_intro_points - num_intro_points, service->config.num_intro_points - num_intro_points,
(desc == service->desc_current) ? "current" : "next",
num_intro_points); num_intro_points);
/* We'll build those introduction point into the descriptor once we have /* We'll build those introduction point into the descriptor once we have
* confirmation that the circuits are opened and ready. However, * confirmation that the circuits are opened and ready. However,
@ -2046,7 +2049,7 @@ launch_intro_point_circuits(hs_service_t *service)
/* Launch a circuit to the intro point. */ /* Launch a circuit to the intro point. */
ip->circuit_retries++; ip->circuit_retries++;
if (hs_circ_launch_intro_point(service, ip, ei) < 0) { if (hs_circ_launch_intro_point(service, ip, ei) < 0) {
log_warn(LD_REND, "Unable to launch intro circuit to node %s " log_info(LD_REND, "Unable to launch intro circuit to node %s "
"for service %s.", "for service %s.",
safe_str_client(extend_info_describe(ei)), safe_str_client(extend_info_describe(ei)),
safe_str_client(service->onion_address)); safe_str_client(service->onion_address));

6
src/test/test_hs_service.c
View File

@ -1149,9 +1149,9 @@ test_build_update_descriptors(void *arg)
tor_free(node->ri->onion_curve25519_pkey); /* Avoid memleak. */ tor_free(node->ri->onion_curve25519_pkey); /* Avoid memleak. */
tor_free(node->ri->cache_info.signing_key_cert); tor_free(node->ri->cache_info.signing_key_cert);
crypto_pk_free(node->ri->onion_pkey); crypto_pk_free(node->ri->onion_pkey);
expect_log_msg_containing("just picked 1 intro points and wanted 3. It " expect_log_msg_containing("just picked 1 intro points and wanted 3 for next "
"currently has 0 intro points. Launching " "descriptor. It currently has 0 intro points. "
"ESTABLISH_INTRO circuit shortly."); "Launching ESTABLISH_INTRO circuit shortly.");
teardown_capture_of_logs(); teardown_capture_of_logs();
tt_int_op(digest256map_size(service->desc_current->intro_points.map), tt_int_op(digest256map_size(service->desc_current->intro_points.map),
OP_EQ, 1); OP_EQ, 1);