tor

commit fd6f098c9df0015f503cf8ccacbedbb3ee6ac61a
parent 4119a7f971e732a7b3a0fa2548e8c80e8a5bf080
Author: Mike Perry <mikeperry-git@torproject.org>
Date:   Fri, 25 Aug 2023 22:42:18 +0000

Bug #40842: Don't send on sets that are being torn down

Diffstat:
M
src/core/or/conflux.c
 | 
6
++++++
M
src/core/or/conflux_util.c
 | 
7
+++++++

2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/core/or/conflux.c b/src/core/or/conflux.c
@@ -604,6 +604,12 @@ conflux_decide_next_circ(conflux_t *cfx)
   // this once tuning is complete.
   conflux_validate_legs(cfx);
 
+  /* If the conflux set is tearing down and has no current leg,
+   * bail and give up */
+  if (cfx->in_full_teardown) {
+    return NULL;
+  }
+
   /* If we don't have a current leg yet, pick one.
    * (This is the only non-const operation in this function). */
   if (!cfx->curr_leg) {
diff --git a/src/core/or/conflux_util.c b/src/core/or/conflux_util.c
@@ -38,6 +38,13 @@ circuit_get_package_window(circuit_t *circ,
       tor_assert_nonfatal(circ->purpose ==
                           CIRCUIT_PURPOSE_CONFLUX_LINKED);
     }
+    circuit_t *orig_circ = circ;
+
+    /* If conflux is in the process of tearing down the set,
+     * the package window is 0 -- there is no room. */
+    if (circ->conflux->in_full_teardown)
+      return 0;
+
     circ = conflux_decide_next_circ(circ->conflux);
 
     /* If conflux has no circuit to send on, the package window is 0. */