summaryrefslogtreecommitdiff
path: root/crates/tor-proto
Commit message (Collapse)AuthorAgeFilesLines
...
* tor-proto: remove `ConfluxSet::single_leg_check` and add `get_single`Steven Engler2025-03-111-37/+38
|
* tor-proto: begin using `TargetHop` and `HopLocation`Steven Engler2025-03-116-40/+126
| | | | | | | | This doesn't yet change the public API, it just begins the work of plumbing these around throughout `ClientCirc`, `Reactor`, etc. This can't be broken up into smaller commits without causing build failures.
* tor-proto: add methods for resolving `TargetHop` and `TargetLocation`Steven Engler2025-03-112-1/+96
|
* tor-proto: add a non-pub `ClientCirc::legs()` methodSteven Engler2025-03-113-2/+40
|
* tor-proto: combine `single_leg_with_id` and `single_leg`Steven Engler2025-03-113-43/+30
| | | | And the same with `single_leg_with_id_mut` and `single_leg_mut`.
* tor-proto: remove non-conflux support from `HopLocation`Steven Engler2025-03-111-5/+0
|
* tor-proto: rename `HopLocation::Leg` to `HopLocation::Hop`Steven Engler2025-03-111-1/+1
|
* tor-proto: add methods to `ConfluxSet`Steven Engler2025-03-111-12/+65
| | | | These give more ways of accessing legs.
* tor-proto: change `single_leg_mut` to return `NotSingleLegError`Steven Engler2025-03-112-7/+8
|
* tor-proto: add `NotSingleLegError` for `single_leg_check`Steven Engler2025-03-111-8/+34
|
* tor-rtmock: allow-Decorate every use of MockSleepProviderIan Jackson2025-03-061-0/+1
| | | | | | | MockSleepProvider and MockSleepRuntime have been declared deprecated by the docs for some time. We're about to mark them `#[deprecated]`. This commit has been split out for clarity of review.
* tor-proto: s/note/warning in function docs about locking stream map mutex.Gabriela Moldovan2025-03-061-1/+1
|
* tor-proto: s/has_first_hop/has_hops (fmt).Gabriela Moldovan2025-03-061-5/+1
|
* tor-proto: s/has_first_hop/has_hops.Gabriela Moldovan2025-03-063-3/+3
|
* tor-proto: Fix up docs post-refactoring (fmt).Gabriela Moldovan2025-03-061-4/+1
|
* tor-proto: Fix up docs post-refactoring.Gabriela Moldovan2025-03-061-3/+3
|
* tor-proto: Move Circuit to its own module.Gabriela Moldovan2025-03-069-1325/+1393
| | | | | | | | | | | This is mostly code motion + some visibility adjustments. Moving all of these outside of `reactor` makes it easier to see which parts are internal vs which are accessed by the reactor. It also helps us enforce/audit invariants such as 'there should be no contention on the `CircHop::map` mutex' (the stream map is now private to `reactor::circuit`, and therefore nothing inside `reactor` will be directly accessing it).
* tor-proto: Avoid accessing CircHop internals from the reactor.Gabriela Moldovan2025-03-063-2/+16
| | | | This will enable us to move `CircHop` out of `reactor.rs`.
* tor-proto: Avoid accessing Circuit internals from the reactor.Gabriela Moldovan2025-03-062-3/+16
| | | | This will enable us to factor `Circuit` out of `reactor.rs`.
* tor-rtmock: task: Remove Default impl for ThreadDescriptorIan Jackson2025-03-041-1/+1
| | | | | | | | | This is going to become a hazard. Let's be explicit. This means using educe to derive the Default for Data. We also need to update our educe dependency to 0.4.22, since that's when Default(expression= "...") started working correctly.
* Merge branch 'ctrl-cmd-docs' into 'main'David Goulet2025-03-031-6/+5
|\ | | | | | | | | tor-proto: Update CtrlCmd and CtrlMsg docs. See merge request tpo/core/arti!2829
| * tor-proto: Update CtrlCmd and CtrlMsg docs.Gabriela Moldovan2025-03-031-6/+5
| | | | | | | | | | | | In aa08ede11fd483cd6dcb4522c431f9e07001717e, the reactor loop was rewritten to unconditionally read from the `CtrlMsg` channel, so we need to adjust the docs.
* | Merge branch 'conflux-cmds' into 'main'David Goulet2025-03-033-13/+73
|\ \ | | | | | | | | | | | | | | | | | | tor-proto: Add CtrlCmd:ShutdownAndReturnCircuit Closes #1876 See merge request tpo/core/arti!2831
| * | tor-proto: Add CtrlCmd::ShutdownAndReturn circuit.Gabriela Moldovan2025-03-031-0/+18
| | | | | | | | | | | | Closes #1876
| * | tor-proto: Add ConfluxSet method for taking the only leg in the set.Gabriela Moldovan2025-03-032-0/+28
| | | | | | | | | | | | | | | | | | | | | This will be used to implement the new `ShutdownAndReturnCircuit` control command. Part of #1876
| * | tor-proto: Use bad_api_usage! instead of internal! where applicable (fmt).Gabriela Moldovan2025-03-031-2/+6
| | |
| * | tor-proto: Use bad_api_usage! instead of internal! where applicable.Gabriela Moldovan2025-03-031-3/+3
| | | | | | | | | | | | | | | Some of these were supposed to be `bad_api_usage`, because they result from API misuse rather than an internal error (bug).
| * | tor-proto: Factor out conflux set length check to new function (fmt).Gabriela Moldovan2025-03-031-6/+6
| | |
| * | tor-proto: Factor out conflux set length check to new function.Gabriela Moldovan2025-03-031-3/+13
| | | | | | | | | | | | | | | This will enable us to reuse these checks for implementing other methods that are only supported if the conflux set has a single leg.
| * | tor-proto: Use handle_shutdown() when handling CtrlCmd::Shutdown.Gabriela Moldovan2025-03-031-1/+1
| |/ | | | | | | | | | | For consistency with the `CtrlCmd::Shutdown` handling from `Reactor::wait_for_create` (`handle_shutdown()` also prints a helpful trace log).
* / tor-proto: remove `Arc<AsyncMutex<_>>` in `Circuit::input`Steven Engler2025-03-032-27/+3
|/
* Merge branch 'conflux-poll-multiple' into 'main'gabi-2502025-03-032-64/+148
|\ | | | | | | | | | | | | tor-proto: Rewrite reactor loop to read from all circuits. Closes #1863 See merge request tpo/core/arti!2817
| * tor-proto: Document that ready_streams_iterator() is cancel-safe.Gabriela Moldovan2025-03-031-0/+2
| |
| * tor-proto: Add cancellation-safety note inside circuit_action().Gabriela Moldovan2025-03-031-0/+3
| |
| * tor-proto: Reduce select_biased! indentation.Gabriela Moldovan2025-02-271-21/+21
| | | | | | | | | | This was left over from the refactoring that moved the inner `select` into the `ConfluxSet` impl.
| * tor-proto: Rename SelectResult to CircuitAction.Gabriela Moldovan2025-02-272-13/+13
| |
| * tor-proto: Rewrite reactor loop to read from all circuits.Gabriela Moldovan2025-02-272-55/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates the `Reactor::run_once()` loop to attempt to read from (and write to) all of its circuit legs as opposed to just the primary one. Note that this slightly changes the behavior of the reactor. Previously, we'd only read from the control channel if the `chan_sender` was ready, whereas now the control channel is unconditionally read from, in the *outer* select. The overall effect is that the control channel can cause unbounded buffering in the `chan_sender` of each circuit (which can happen if the `chan_sender` is not ready to send). This was actually how the reactor worked before the refactoring from !2747, which is reflected in the `chan_sender` docs: ```rust /// Sender object used to actually send cells. /// /// NOTE: Control messages could potentially add unboundedly to this, although that's /// not likely to happen (and isn't triggereable from the network, either). chan_sender: SometimesUnboundedSink<AnyChanCell, ChannelSender>, ``` I don't believe this to be a problem, for the reason mentioned in the `chan_sender` docs, and because the main reason we check for `chan_sender` readiness is to apply backpressure on senders, which is not something we need to worry about when it comes to the control channel. Besides, the control channel is unbounded, so not reading from it won't stop the senders from sending more commands anyway. Closes #1863
| * tor-proto: Add a SelectResult::RemoveLeg command.Gabriela Moldovan2025-02-271-0/+6
| | | | | | | | | | This tells the reactor to remove a given circuit from the conflux set, and will be used to remove the circuits that have been shut down.
| * tor-proto: Add function for removing circuits from ConfluxSet.Gabriela Moldovan2025-02-271-1/+23
| |
* | Merge branch 'remove-semver' into 'main'opara2025-03-031-1/+0
|\ \ | | | | | | | | | | | | Remove semver files for 1.4.1 See merge request tpo/core/arti!2827
| * | Remove semver files for 1.4.1Nick Mathewson2025-03-031-1/+0
| | |
* | | Merge branch 'rm-async-block' into 'main'gabi-2502025-03-031-43/+40
|\ \ \ | |/ / |/| | | | | | | | tor-proto: Remove unnecessary async block. See merge request tpo/core/arti!2815
| * | tor-proto: Remove unnecessary async block (fmt).Gabriela Moldovan2025-02-271-42/+40
| | |
| * | tor-proto: Remove unnecessary async block.Gabriela Moldovan2025-02-271-3/+2
| |/ | | | | | | | | `futures::future::poll_fn` returns a future, so the `async` block isn't actually necessary.
* / Bump minor versions in tor-*, arti-*.Nick Mathewson2025-03-031-18/+18
|/
* Merge branch 'sync_datastream' into 'main'Nick Mathewson2025-02-272-6/+11
|\ | | | | | | | | | | | | Make DataStream, and its members, implement Sync. Closes #1859 See merge request tpo/core/arti!2808
| * Apply 1 suggestion(s) to 1 file(s)Nick Mathewson2025-02-271-1/+1
| | | | | | Co-authored-by: Ian Jackson <[email protected]>
| * Make DataStream, and its members, implement Sync.Nick Mathewson2025-02-262-6/+11
| | | | | | | | | | | | | | Also, use static_assertions to enforce that that they _stay_ Send+Sync. Closes #1859.
* | Merge branch 'reactor-confluxation' into 'main'gabi-2502025-02-278-610/+917
|\ \ | | | | | | | | | | | | tor-proto: Add ConfluxSet type in the reactor See merge request tpo/core/arti!2804
| * | tor-proto: Add _mut suffix to functions returning mutable circs (fmt).Gabriela Moldovan2025-02-261-1/+5
| | |
generated by cgit v1.2.3 (git 2.46.0) at 2026-08-28 09:43:43 +0000