aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/or/conflux_pool.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/core/or/conflux_pool.c b/src/core/or/conflux_pool.c
index 7e38e151a8..c8018f45e2 100644
--- a/src/core/or/conflux_pool.c
+++ b/src/core/or/conflux_pool.c
@@ -797,11 +797,6 @@ try_finalize_set(unlinked_circuits_t *unlinked)
unlinked->cfx = NULL;
unlinked_free(unlinked);
- /* Now that this set is ready to use, try any pending streams again. */
- if (is_client) {
- connection_ap_attach_pending(1);
- }
-
log_info(LD_CIRC,
"Successfully linked a conflux %s set which is now usable.",
is_client ? "client" : "relay");
@@ -1964,6 +1959,12 @@ conflux_process_linked(circuit_t *circ, crypt_path_t *layer_hint,
goto end;
}
+ /* If this set is ready to use with a valid conflux set, try any pending
+ * streams again. */
+ if (circ->conflux) {
+ connection_ap_attach_pending(1);
+ }
+
goto end;
close: