This is an automated email from the git hooks/post-receive script.
dgoulet pushed a change to branch main in repository tor.
from cdb270d55e Change git.tpo URLs to gitlab.tpo new 44cd704636 Bug 40811: Count conflux leg launch attempts early. new 17037f8732 Changes file for Bug 40811 new 7a83aa4f50 Merge branch 'tor-gitlab/mr/722'
The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Summary of changes: changes/bug40811 | 6 ++++++ src/core/or/conflux_pool.c | 13 +++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 changes/bug40811
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 44cd704636c5e67857cc93b193e1849bcebc96b4 Author: Mike Perry mikeperry-git@torproject.org AuthorDate: Thu Jun 15 16:13:34 2023 +0000
Bug 40811: Count conflux leg launch attempts early.
Also, double check that the consensus has enough overall exits before attempting conflux set launch. --- src/core/or/conflux_pool.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/core/or/conflux_pool.c b/src/core/or/conflux_pool.c index c8018f45e2..79fd6c1648 100644 --- a/src/core/or/conflux_pool.c +++ b/src/core/or/conflux_pool.c @@ -1140,6 +1140,11 @@ conflux_launch_leg(const uint8_t *nonce) fmt_nonce(nonce)); }
+ /* Increase the retry count for this conflux object as in this nonce. + * We must do this now, because some of the maze's early failure paths + * call right back into this function for relaunch. */ + unlinked->cfx->num_leg_launch++; + origin_circuit_t *circ = circuit_establish_circuit_conflux(nonce, CIRCUIT_PURPOSE_CONFLUX_UNLINKED, exit, flags); @@ -1169,9 +1174,6 @@ conflux_launch_leg(const uint8_t *nonce) last_seq_sent, last_seq_recv, get_client_ux()));
- /* Increase the retry count for this conflux object as in this nonce. */ - unlinked->cfx->num_leg_launch++; - unlinked_leg_add(unlinked, leg); return true;
@@ -1338,7 +1340,10 @@ conflux_predict_new(time_t now) { (void) now;
- if (!conflux_is_enabled(NULL)) { + /* If conflux is disabled, or we have insufficient consensus exits, + * don't prebuild. */ + if (!conflux_is_enabled(NULL) || + router_have_consensus_path() != CONSENSUS_PATH_EXIT) { return; }
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 17037f8732cc31a1f0cff5aea11840be038796d9 Author: Mike Perry mikeperry-git@torproject.org AuthorDate: Thu Jun 15 16:14:56 2023 +0000
Changes file for Bug 40811 --- changes/bug40811 | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/changes/bug40811 b/changes/bug40811 new file mode 100644 index 0000000000..2cf763592a --- /dev/null +++ b/changes/bug40811 @@ -0,0 +1,6 @@ + o Minor bugfixes (conflux): + - Count leg launch attempts prior to attempting to launch them. This + avoids inifinite launch attempts due to internal circuit building + failures. Additionally, double-check that we have enough exits in + our consensus overall, before attempting to launch conflux sets. + Fixes bug 40811; bugfix on 0.4.8.1-alpha.
This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 7a83aa4f5042905844cb9ab48a4876becd8f2175 Merge: cdb270d55e 17037f8732 Author: David Goulet dgoulet@torproject.org AuthorDate: Thu Jun 15 13:23:36 2023 -0400
Merge branch 'tor-gitlab/mr/722'
changes/bug40811 | 6 ++++++ src/core/or/conflux_pool.c | 13 +++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-)
tor-commits@lists.torproject.org
-
gitolite role