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

Merge branch 'remove-conflux-bug-log' into 'main'

Browse Source 
relay: Remove logging for a bug. It triggers a BUG() later

See merge request tpo/core/tor!738
This commit is contained in:
David Goulet 2023-08-02 16:48:03 +00:00
commit ec7a03e112
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2352,24 +2352,6 @@ connection_edge_package_raw_inbuf(edge_connection_t *conn, int package_partial,
return -1; return -1;
} }
// Bug 40827: With conflux, we suspect marked circuits were getting here.
// We think we fixed it, but let's add a check and log sets if it still
// happens.
if (BUG(circ->marked_for_close)) {
log_warn(LD_BUG,
"called on circ that's already marked for close at %s:%d.",
circ->marked_for_close_file, circ->marked_for_close);
if (CIRCUIT_IS_CONFLUX(circ)) {
if (circ->conflux) {
conflux_log_set(circ->conflux, CIRCUIT_IS_ORIGIN(circ));
} else {
log_warn(LD_BUG, " - circ is unlinked conflux");
}
}
conn->end_reason = END_STREAM_REASON_INTERNAL;
return -1;
}
if (circuit_consider_stop_edge_reading(circ, cpath_layer)) if (circuit_consider_stop_edge_reading(circ, cpath_layer))
return 0; return 0;