aboutsummaryrefslogtreecommitdiff
path: root/src/core/or/circuitbuild.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-10-19 11:45:24 -0400
committerNick Mathewson <nickm@torproject.org>2020-10-19 11:45:24 -0400
commitcb4cedae686bd227d42997840b3a6b0b3bc5e936 (patch)
tree579d5d6a89e8bfdea5a11935eaa355752f51dba6 /src/core/or/circuitbuild.c
parent781ab9eea49b07b1925d7d8dcbad06348896344e (diff)
downloadtor-cb4cedae686bd227d42997840b3a6b0b3bc5e936.tar.gz
tor-cb4cedae686bd227d42997840b3a6b0b3bc5e936.zip
Explain why we use "mark_as_used_for_origin_circuit" where we do
Also, explain why it's relevant for bootstrapping. This is a comments-only patch.
Diffstat (limited to 'src/core/or/circuitbuild.c')
-rw-r--r--src/core/or/circuitbuild.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c
index 225a0112f7..0b53a4cda8 100644
--- a/src/core/or/circuitbuild.c
+++ b/src/core/or/circuitbuild.c
@@ -591,6 +591,10 @@ circuit_handle_first_hop(origin_circuit_t *circ)
log_info(LD_CIRC,"connect to firsthop failed. Closing.");
return -END_CIRC_REASON_CONNECTFAILED;
}
+ /* We didn't find a channel, but we're launching one for an origin
+ * circuit. (If we decided not to launch a channel, then we found at
+ * least one once good in-progress channel use for this circuit, and
+ * marked it in channel_get_for_extend().) */
channel_mark_as_used_for_origin_circuit(n_chan);
circuit_chan_publish(circ, n_chan);
}
@@ -604,6 +608,7 @@ circuit_handle_first_hop(origin_circuit_t *circ)
} else { /* it's already open. use it. */
tor_assert(!circ->base_.n_hop);
circ->base_.n_chan = n_chan;
+ /* We found a channel, and we're using it for an origin circuit. */
channel_mark_as_used_for_origin_circuit(n_chan);
circuit_chan_publish(circ, n_chan);
log_debug(LD_CIRC,"Conn open for %s. Delivering first onion skin.",