summaryrefslogtreecommitdiff
path: root/crates
Commit message (Collapse)AuthorAgeFilesLines
...
* | | tor-rtcompat: Rename BlockOn to ToplevelBlockOnIan Jackson2025-03-0416-29/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're going to distinguish top-level runtime entry, from *re*-entry to an existing executor. It is most convenient to rename this trait first. Documentation of the distinction will come later. (We're going to retain the function name `block_on`, but we want the trait to be more obviously a top-level only thing, though, so we give it a name that will hopefully avoid it peroulating throughout the codebase..)
* | | tor-rtmock: Correct a commentIan Jackson2025-03-041-1/+1
|/ / | | | | | | The MockExecutor doesn't have a threadpool.
* | hsclient: Include rsa_id in debugClara Engler2025-03-041-1/+2
| | | | | | | | | | | | | | This commit adds the RSA ID of a relay into a debug statement, as found in other places in the code. It mostly serves the purpose that the Ed25519 ID in itself is rather inconvenient, as metrics.torproject.org only allows querying from the RSA ID.
* | 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).
* | | Merge branch 'rm-tor-congestion' into 'main'Nick Mathewson2025-03-034-28/+0
|\ \ \ | | | | | | | | | | | | | | | | tor-congestion: remove crate See merge request tpo/core/arti!2828
| * | | tor-congestion: remove crateSteven Engler2025-03-034-28/+0
| | | |
* | | | 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-034-4/+0
|\ \ | | | | | | | | | | | | Remove semver files for 1.4.1 See merge request tpo/core/arti!2827
| * | Remove semver files for 1.4.1Nick Mathewson2025-03-034-4/+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 arti to 1.4.1Nick Mathewson2025-03-033-3/+3
| |
* | Bump minor versions in tor-*, arti-*.Nick Mathewson2025-03-0349-438/+438
| |
* | Bump patchlevel for safelog, retry-error, test-temp-dir.Nick Mathewson2025-03-033-3/+3
|/ | | | | These crates have upgraded to a newer derive_more, and have had no other changes.
* 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 'keymgr-readme' into 'main'Ian Jackson2025-02-271-4/+8
|\ \ | | | | | | | | | | | | tor-keymgr: Minor README updates See merge request tpo/core/arti!2806
| * | tor-keymgr: Update README to mention the experimental features.Gabriela Moldovan2025-02-261-1/+2
| | |
| * | tor-keymgr: Update README to mention the new C Tor keystores.Gabriela Moldovan2025-02-261-3/+6
| | |
* | | Merge branch 'nocolor' into 'main'Ian Jackson2025-02-271-1/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | arti: Disable color when stdout is not a tty. Closes #1763 and #1862 See merge request tpo/core/arti!2802
| * | | arti: Disable color when stdout is not a tty.Nick Mathewson2025-02-241-1/+7
| | | | | | | | | | | | | | | | | | | | Closes #1763. Closes #1862.
* | | | 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
| | | | |
| * | | | tor-proto: Add _mut suffix to functions returning mutable circs.Gabriela Moldovan2025-02-263-20/+20
| | | | |
| * | | | tor-proto: s/legs/leg in variable name.Gabriela Moldovan2025-02-261-2/+2
| | | | |
| * | | | tor-proto: Add TODO about removing CtrlMsg::SendSendme.Gabriela Moldovan2025-02-261-0/+2
| | | | |
| * | | | tor-proto: Update misleading comment about SENDMEs.Gabriela Moldovan2025-02-261-1/+2
| | | | |
| * | | | tor-proto: Make the reactor shut down when all the legs close.Gabriela Moldovan2025-02-262-1/+17
| | | | |
| * | | | tor-proto: Simplify expression using is_ok_and.Gabriela Moldovan2025-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | As suggested by opara in https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2804#note_3165059
| * | | | tor-proto: Rename Circuit variable to circ.Gabriela Moldovan2025-02-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | It used to be a Reactor, but the `reactor` variable name no longer makes sense.
| * | | | tor-proto: Avoid using Reactor in the circuit extender.Gabriela Moldovan2025-02-262-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps us get rid of some unnecessary error handling. Prompted by https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/2804#note_3165058