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

Bug #40842: Additional diagnostics

Browse Source 
Just in case there are other instances hiding in the maze.
This commit is contained in:
Mike Perry 2023-08-25 22:43:14 +00:00
parent fd6f098c9d
commit 7666dd777a
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/or/conflux_util.c
View File

@ -49,6 +49,20 @@ circuit_get_package_window(circuit_t *circ,
/* If conflux has no circuit to send on, the package window is 0. */ /* If conflux has no circuit to send on, the package window is 0. */
if (!circ) { if (!circ) {
/* Bug #40842: Additional diagnostics for other potential cases */
if (!orig_circ->conflux->curr_leg) {
if (orig_circ->marked_for_close) {
log_warn(LD_BUG, "Conflux has no circuit to send on. "
"Circuit %p idx %d marked at line %s:%d",
orig_circ, orig_circ->global_circuitlist_idx,
orig_circ->marked_for_close_file,
orig_circ->marked_for_close);
} else {
log_warn(LD_BUG, "Conflux has no circuit to send on. "
"Circuit %p idx %d not marked for close.",
orig_circ, orig_circ->global_circuitlist_idx);
}
}
return 0; return 0;
} }
@ -83,6 +97,10 @@ conflux_can_send(conflux_t *cfx)
if (send_circ) { if (send_circ) {
return true; return true;
} else { } else {
if (BUG(!cfx->in_full_teardown && !cfx->curr_leg)) {
log_fn(LOG_WARN,
LD_BUG, "Conflux has no current circuit to send on. ");
}
return false; return false;
} }
} }

2
src/core/or/relay.c
View File

@ -641,6 +641,8 @@ relay_send_command_from_edge_,(streamid_t stream_id, circuit_t *orig_circ,
if (BUG(!circ)) { if (BUG(!circ)) {
log_warn(LD_BUG, "No circuit to send for conflux for relay command %d, " log_warn(LD_BUG, "No circuit to send for conflux for relay command %d, "
"called from %s:%d", relay_command, filename, lineno); "called from %s:%d", relay_command, filename, lineno);
conflux_log_set(LOG_WARN, orig_circ->conflux,
CIRCUIT_IS_ORIGIN(orig_circ));
circ = orig_circ; circ = orig_circ;
} else { } else {
/* Conflux circuits always send multiplexed relay commands to /* Conflux circuits always send multiplexed relay commands to