summaryrefslogtreecommitdiff
path: root/crates/tor-proto
Commit message (Collapse)AuthorAgeFilesLines
* Bump all the unstable tor- and arti- crates to 0.32.0.Gabriela Moldovan2025-07-071-19/+19
| | | | | | | | | | Done using: ``` for crate in $(./maint/list_crates | rg '^(tor|arti-)'); do cargo set-version -p $crate 0.32.0 done ```
* Bump the versions of the non-{arti-,tor-} crates.Gabriela Moldovan2025-07-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The non-{arti-,tor-} crates are: ``` ./maint/list_crates | rg -v '^(tor|arti)' oneshot-fused-workaround slotmap-careful test-temp-dir fslock-guard hashx equix caret fs-mistrust safelog retry-error ``` We split them in the following categories: * crates with no changes (no version bumps): None ``` maint/changed_crates -v "arti-v$LAST_VERSION" 2>&1 >/dev/null | grep -i "no change" | grep -v '\(tor\|arti\)-' ``` * crates that only have non-functional changes (bump the patch version): - oneshot-fused-workaround - slotmap-careful - test-temp-dir - fslock-guard - hashx - equix - caret - safelog - retry-error * crates where APIs were broken (bump minor): - fs-mistrust (the implicit once_cell feature was removed) The bumps from this commit were created using this script: ``` PATCH=" oneshot-fused-workaround slotmap-careful test-temp-dir fslock-guard hashx equix caret safelog retry-error " for crate in $PATCH; do cargo set-version --bump patch -p $crate; done MINOR=" fs-mistrust " for crate in $MINOR; do cargo set-version --bump minor -p $crate; done ```
* tor-proto: Remove unnecessary return.Gabriela Moldovan2025-07-071-1/+1
|
* Temporarily suppress mismatched_lifetime_syntaxes.Gabriela Moldovan2025-07-071-0/+1
| | | | See #2060.
* Merge branch 'arti-1.4.5-prep' into 'main'gabi-2502025-07-071-1/+1
|\ | | | | | | | | Run fixup-features, upgrade deps in preparation for release See merge request tpo/core/arti!3083
| * Upgrade to derive-deftly 1.1.0.Gabriela Moldovan2025-07-071-1/+1
| | | | | | | | | | | | I had to also bump `toml` to `0.8.23`, because `toml 0.8.22` is incompatible with `serde_spanned 0.6.9` (which is automatically pulled in because of the d-d upgrade).
* | proto: ignore large_enum_variant warningNick Mathewson2025-07-031-1/+1
|/ | | | | This appears to be a testing-only struct, so we can safely ignore the warning.
* proto: Add clippy exception for handle_cmd().Gabriela Moldovan2025-06-271-0/+1
| | | | We need to pass by value for the conflux case.
* proto: Add clippy exception for next_circ_action().Gabriela Moldovan2025-06-271-0/+1
| | | | The function can return an error, but only if `conflux` is enabled.
* proto: Remove unnecessary return statement to satisfy clippy.Gabriela Moldovan2025-06-271-1/+1
| | | | With the latest rustc version, this now triggers a warning.
* proto: Use primary_join_point() earlier to get the join point.Gabriela Moldovan2025-06-271-3/+2
|
* proto: Rephrase error message to reduce ambiguity.Gabriela Moldovan2025-06-271-1/+1
|
* proto: Continue reading from leaky-pipe streams if main leg is blocked (fmt).Gabriela Moldovan2025-06-273-10/+21
|
* proto: Continue reading from leaky-pipe streams if main leg is blocked.Gabriela Moldovan2025-06-274-90/+118
| | | | Addresses https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/3077#note_3218281
* proto: Allow leaky pipe on multipath tunnels.Gabriela Moldovan2025-06-271-20/+17
| | | | | | | | For leaky pipe, we just need to ensure we don't accidentally reroute it to the join point on the primary leg. Partially addresses https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/3077#note_3218281
* proto: Actually validate the SWITCH cells in the mock exit.Gabriela Moldovan2025-06-271-12/+43
|
* proto: Tweak conflux test RTTs to trigger CONFLUX_SWITCH.Gabriela Moldovan2025-06-271-6/+49
| | | | This causes the test client to send a two SWITCH cells.
* proto: Make RttEstimator::{ewma,min}_rtt_usec() return `Option`.Gabriela Moldovan2025-06-273-13/+20
| | | | | | | | | | A `None` value signals to the conflux code to know to fall back on the initial RTT of the circuit. Without this change, the conflux switching logic is broken as we end up staying on the leg with the best initial RTT forever (the other leg is never picked, because its `ewma_rtt()` is stuck on `u32::MAX`, and never updated as we never send on it).
* proto: Ugly hack to fix seqno accounting bug.Gabriela Moldovan2025-06-274-0/+31
|
* proto: Run test handshake outside of exit task.Gabriela Moldovan2025-06-271-10/+17
|
* proto: Avoid switching legs unnecssarily.Gabriela Moldovan2025-06-271-1/+1
| | | | | If we're already on the best leg, we don't need to switch (even if the other leg happens to have the same "best" RTT).
* proto: Ensure we get all the expected SWITCH cells.Gabriela Moldovan2025-06-271-0/+6
| | | | | | | | | Previously, this failed to assert that the mock relays received all the expected SWITCH cells. As it turns out, the assertion currently fails, because the default value for our estimated RTTs is no longer zero (as of !3074), so we no longer unnecessarily switch legs as much as we used to.
* proto: Sort the received test data.Gabriela Moldovan2025-06-271-4/+4
| | | | | | | | | | The conflux client now sends data to the mock exit relay over both legs (it SWITCHes legs at some point), which causes the test to fail (because the two legs of the mock exit write the data racily to the same `Vec`, without attempting to put it in the right order). To work around the lack of handling of out-of-order cells at the mock exit, we can just sort the received data to make sure we got it all.
* proto: Add trace log for conflux leg switch events.Gabriela Moldovan2025-06-271-1/+7
|
* proto: Fix conflux-related congestion control proto violation.Gabriela Moldovan2025-06-271-1/+87
| | | | | | | | Previously, if the primary leg was blocked on cc, the conflux set would continue polling the stream map non-blocked leg, and send a `CircuitCmd::Send` instructing the reactor to send a DATA cell on the non-blocked leg. The reactor would then (wrongly) reroute the DATA cell to the primary leg, in violation of congestion control.
* proto: Support inserting varied RTT delays in test (fmt).Gabriela Moldovan2025-06-271-16/+3
|
* proto: Support inserting varied RTT delays in test.Gabriela Moldovan2025-06-271-21/+25
| | | | | This will enable us to trigger conflux leg switches at various points in the transmission.
* proto: s/circ_sink/circ_tx for consistency.Gabriela Moldovan2025-06-271-15/+15
| | | | For consistency with `chan_tx`.
* proto: Pass TestCircuitCtx to mock exit task (fmt).Gabriela Moldovan2025-06-271-3/+15
|
* proto: Pass TestCircuitCtx to mock exit task.Gabriela Moldovan2025-06-271-33/+20
| | | | | As opposed to passing the individual parts of `TestCircuitCtx` (I find this slightly neater).
* proto: Apply deferred cargo fmtGabriela Moldovan2025-06-271-2/+11
| | | | This is a mess. A future commit will make it slightly less horrible.
* proto: Unbreak the conflux stream test.Gabriela Moldovan2025-06-271-3/+36
| | | | | | | This fixes a problem which caused the test to stall waiting for a cell (simply blocking on receiving a cell is wrong, because it's possible for the other leg to have already completed the transfer; we need to be able to bail upon receiving a completion notification from the other leg).
* proto: Put mock runtime behind mutex.Gabriela Moldovan2025-06-271-6/+8
| | | | | | | | | | | | | | | The mutex prevents concurrent uses of `MockRuntime::advance_until_stalled` (which are forbidden by the mock runtime), enabling us to call this (and its functions that advance time) more liberally in the future. Note: the `multipath_stream` test is *still* broken, but slightly less so. Now the only failure is "all futures blocked. waiting for the real world? or deadlocked (waiting for each other) ?", which can be solved by ensuring the mock exit tasks always exit: now that the mock client task keeps the stream alive until it receives an END cell, we need to ensure the exits tasks can complete their own, without relying on the client to end the stream. This will be fixed in another commit.
* proto: Send an END at the end of the test conflux stream (fmt).Gabriela Moldovan2025-06-271-1/+3
|
* proto: Send an END at the end of the test conflux stream.Gabriela Moldovan2025-06-271-7/+31
| | | | | This enables the new `read_until_end()` call in the mock client task to complete (otherwise it will just hang, waiting for the stream to end).
* proto: Make conflux mock exit send SENDMEs at the right time.Gabriela Moldovan2025-06-271-16/+43
| | | | | | | | | | | | | | | We now send the SENDMEs as per the client's expectations, using the right tags. This makes the test less fragile and easier to extend. Note: the `multipath_stream` test currently fails, because the mock exit endpoint never actually sends an END, so the stream never gets closed: ``` all futures blocked. waiting for the real world? or deadlocked (waiting for each other) ? ``` This will be fixed in a future commit.
* proto: Support QuerySendWindow for multipath tunnels (fmt).Gabriela Moldovan2025-06-271-7/+3
|
* proto: Support QuerySendWindow for multipath tunnels.Gabriela Moldovan2025-06-272-5/+8
| | | | | We're about to use this in a conflux test, to get the mock exit to reliably send valid SENDMEs to the client.
* proto: Support receiving data in the test client.Gabriela Moldovan2025-06-271-1/+13
| | | | | | | With this change, the `multipath_stream` conflux test fails, because the mock exit endpoint never actually closes the stream. This problem will be solved in a future commit.
* proto: s/stream_data/send_data for clarity.Gabriela Moldovan2025-06-271-10/+10
| | | | I'm about to add a `recv_data` too.
* proto: Use UniqId instead of leg index in tests (fmt).Gabriela Moldovan2025-06-271-3/+1
|
* proto: Use UniqId instead of leg index in tests.Gabriela Moldovan2025-06-271-3/+8
| | | | | This is currently only used for logging purposes, but we will soon need the actual `UniqId` of the test circuit leg to query its CC state.
* proto: Replace magic numbers with constants in test (fmt).Gabriela Moldovan2025-06-271-1/+4
|
* proto: Replace magic numbers with constants in test.Gabriela Moldovan2025-06-271-1/+6
| | | | For clarity, and so we don't forget what these numbers mean.
* proto: Add docs to various conflux test structures.Gabriela Moldovan2025-06-271-0/+19
| | | | | I am about to add more fields to these, so I'm documenting the existing ones so we don't get confused about what they represent.
* tor-proto: Renamed `DataReaderState::Ready` to `Open`Steven Engler2025-06-261-9/+12
|
* tor-proto: improve documentation for `StreamTarget::send_sendme`Steven Engler2025-06-261-1/+7
|
* tor-proto: log warning for SENDME reactor errorSteven Engler2025-06-261-5/+10
|
* tor-proto: remove unneeded `DataReaderState::ReadingCell` stateSteven Engler2025-06-261-10/+6
| | | | | Now that we no longer need to store a future, there's no need for this state since we're never pending waiting for a future to complete.
* tor-proto: rework `StreamReceiver` into a `futures::Stream`Steven Engler2025-06-264-75/+123
| | | | | | | | | | | Having this be a `futures::Stream` makes it nicer to work with. For example we are able to remove a boxed future from `DataReaderState`, which should be better for performance and makes the code simpler. As mentioned in a previous commit when this type was named `StreamReader`, this type is public in the API, but is not actually accessible. As far as I can tell there is no way to construct it or access it.