diff options
| author | David Goulet <dgoulet@torproject.org> | 2022-04-14 09:37:43 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2022-04-14 09:37:43 -0400 |
| commit | dc90226cc3c7c74164f8feb1f50d2fbcf0941a9d (patch) | |
| tree | f99b5178822692438a8fc4a119390e619a77b049 /src/feature | |
| parent | 9ac479ce1c20fd2e58528900b54d5b81bedb641d (diff) | |
| parent | dd085d42f96e39f9387aa1d7a306100c0d7df305 (diff) | |
| download | tor-dc90226cc3c7c74164f8feb1f50d2fbcf0941a9d.tar.gz tor-dc90226cc3c7c74164f8feb1f50d2fbcf0941a9d.zip | |
Merge branch 'tor-gitlab/mr/491' into maint-0.4.5
Diffstat (limited to 'src/feature')
| -rw-r--r-- | src/feature/client/circpathbias.c | 11 | ||||
| -rw-r--r-- | src/feature/control/control_cmd.c | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/feature/client/circpathbias.c b/src/feature/client/circpathbias.c index 4d27553926..29264135f9 100644 --- a/src/feature/client/circpathbias.c +++ b/src/feature/client/circpathbias.c @@ -363,6 +363,17 @@ pathbias_should_count(origin_circuit_t *circ) return 0; } + /* Ignore circuits where the controller helped choose the path. When + * this happens, we can't be sure whether the path was chosen randomly + * or not. */ + if (circ->any_hop_from_controller) { + /* (In this case, we _don't_ check to see if shouldcount is changing, + * since it's possible that an already-created circuit later gets extended + * by the controller. */ + circ->pathbias_shouldcount = PATHBIAS_SHOULDCOUNT_IGNORED; + return 0; + } + /* Completely ignore one hop circuits */ if (circ->build_state->onehop_tunnel || circ->build_state->desired_path_len == 1) { diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c index b4d7228b51..a1c5e55fe1 100644 --- a/src/feature/control/control_cmd.c +++ b/src/feature/control/control_cmd.c @@ -822,6 +822,8 @@ handle_control_extendcircuit(control_connection_t *conn, circ->first_hop_from_controller = 1; } + circ->any_hop_from_controller = 1; + /* now circ refers to something that is ready to be extended */ first_node = zero_circ; SMARTLIST_FOREACH(nodes, const node_t *, node, |