diff options
| author | Mike Perry <mikeperry-git@torproject.org> | 2021-11-04 00:46:11 +0000 |
|---|---|---|
| committer | Mike Perry <mikeperry-git@torproject.org> | 2022-02-22 19:28:34 +0000 |
| commit | 76bdadce121b0c33f46bb3d4e5eb0e8dc3277614 (patch) | |
| tree | 2d60fb34fb9315bb98927559fa7a1147988ef1c9 /src/core/or/circuituse.c | |
| parent | b6d5fbba7d7e0e2cfa0c0cbb7f91e6039e3decf9 (diff) | |
| download | tor-76bdadce121b0c33f46bb3d4e5eb0e8dc3277614.tar.gz tor-76bdadce121b0c33f46bb3d4e5eb0e8dc3277614.zip | |
Hook up client usage of congestion control negotiation
Diffstat (limited to 'src/core/or/circuituse.c')
| -rw-r--r-- | src/core/or/circuituse.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index 104e898d6c..a259957d37 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -2427,7 +2427,8 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn, /* We might want to connect to an IPv6 bridge for loading descriptors so we use the preferred address rather than the primary. */ - extend_info = extend_info_from_node(r, conn->want_onehop ? 1 : 0); + extend_info = extend_info_from_node(r, conn->want_onehop ? 1 : 0, + desired_circuit_purpose == CIRCUIT_PURPOSE_C_GENERAL); if (!extend_info) { log_warn(LD_CIRC,"Could not make a one-hop connection to %s. " "Discarding this circuit.", conn->chosen_exit_name); @@ -2463,7 +2464,8 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn, NULL, /* Ed25519 ID */ NULL, NULL, /* onion keys */ &addr, conn->socks_request->port, - NULL); + NULL, + false); } else { /* ! (want_onehop && conn->chosen_exit_name[0] == '$') */ /* We will need an onion key for the router, and we * don't have one. Refuse or relax requirements. */ |