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

Remove unused debugging code used for tor#17659

Browse Source 
See: tpo/core/tor#17659
This commit is contained in:
Alexander Færøy 2021-10-11 21:29:49 +02:00
parent ba5a71b913
commit 028b52f1ef
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/or/connection_edge.c
View File

@ -1300,15 +1300,6 @@ connection_ap_rescan_and_attach_pending(void)
connection_ap_attach_pending(1); connection_ap_attach_pending(1);
} }
#ifdef DEBUGGING_17659
#define UNMARK() do { \
entry_conn->marked_pending_circ_line = 0; \
entry_conn->marked_pending_circ_file = 0; \
} while (0)
#else /* !defined(DEBUGGING_17659) */
#define UNMARK() do { } while (0)
#endif /* defined(DEBUGGING_17659) */
/** Tell any AP streams that are listed as waiting for a new circuit to try /** Tell any AP streams that are listed as waiting for a new circuit to try
* again. If there is an available circuit for a stream, attach it. Otherwise, * again. If there is an available circuit for a stream, attach it. Otherwise,
* launch a new circuit. * launch a new circuit.
@ -1337,13 +1328,11 @@ connection_ap_attach_pending(int retry)
connection_t *conn = ENTRY_TO_CONN(entry_conn); connection_t *conn = ENTRY_TO_CONN(entry_conn);
tor_assert(conn && entry_conn); tor_assert(conn && entry_conn);
if (conn->marked_for_close) { if (conn->marked_for_close) {
UNMARK();
continue; continue;
} }
if (conn->magic != ENTRY_CONNECTION_MAGIC) { if (conn->magic != ENTRY_CONNECTION_MAGIC) {
log_warn(LD_BUG, "%p has impossible magic value %u.", log_warn(LD_BUG, "%p has impossible magic value %u.",
entry_conn, (unsigned)conn->magic); entry_conn, (unsigned)conn->magic);
UNMARK();
continue; continue;
} }
if (conn->state != AP_CONN_STATE_CIRCUIT_WAIT) { if (conn->state != AP_CONN_STATE_CIRCUIT_WAIT) {
@ -1375,7 +1364,6 @@ connection_ap_attach_pending(int retry)
/* If we got here, then we either closed the connection, or /* If we got here, then we either closed the connection, or
* we attached it. */ * we attached it. */
UNMARK();
} SMARTLIST_FOREACH_END(entry_conn); } SMARTLIST_FOREACH_END(entry_conn);
smartlist_free(pending); smartlist_free(pending);
@ -1446,7 +1434,6 @@ connection_ap_mark_as_non_pending_circuit(entry_connection_t *entry_conn)
{ {
if (PREDICT_UNLIKELY(NULL == pending_entry_connections)) if (PREDICT_UNLIKELY(NULL == pending_entry_connections))
return; return;
UNMARK();
smartlist_remove(pending_entry_connections, entry_conn); smartlist_remove(pending_entry_connections, entry_conn);
} }