summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | tor-proto: Make take_inner() use mut_inner() to check the inner value.Gabriela Moldovan2023-08-081-3/+6
| |/ / /
| * | | tor-proto: Implement `Drop` for `IncomingStream`.Gabriela Moldovan2023-08-071-11/+64
| | | |
| * | | tor-proto: Keep track of whether the `IncomingStream` was accepted.Gabriela Moldovan2023-08-071-0/+5
| | | | | | | | | | | | | | | | | | | | The behaviour of `IncomingStream::drop` is going to depend on whether the stream was accepted or not.
| * | | tor-proto: Add a function for closing a stream without waiting for the ↵Gabriela Moldovan2023-08-071-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | reactor to respond. This will be used for implementing `Drop` for `IncomingStream` (it needs to "reject" the stream on drop).
* | | | Merge branch 'error' into 'main'gabi-2502023-08-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | tor-config: Expand NoProjectDirs error message See merge request tpo/core/arti!1480
| * | | | tor-config: Expand NoProjectDirs error messageIan Jackson2023-08-081-1/+1
|/ / / /
* | | | Merge branch 'error2' into 'main'gabi-2502023-08-075-10/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow operation when default config files cannot be determined See merge request tpo/core/arti!1479
| * | | | arti: Use ConfigurationSources::try_from_cmdlineIan Jackson2023-08-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to proceed if * the default config file locations can't be established (eg due to failure of the `directories` crate), but * configuration files are explicitly specified, so the defaults wouldn't be used
| * | | | tor-config: Add ConfigurationSources::try_from_cmdlineIan Jackson2023-08-074-7/+37
| | | | | | | | | | | | | | | | | | | | We'll use this in crates/arti in a moment.
* | | | | Merge branch 'error' into 'main'gabi-2502023-08-071-1/+1
|\| | | | | |/ / / |/| | | | | | | | | | | arti: Add context to default config files error message See merge request tpo/core/arti!1478
| * | | arti: Add context to default config files error messageIan Jackson2023-08-071-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves the error mesage in #989 somewhat. Before: target/debug/arti: error: Can't construct project directories to resolve a path element After: target/debug/arti: error: identify default config file locations: Can't construct project directories to resolve a path element
* | | Merge branch 'tor-proto-todos' into 'main'Ian Jackson2023-08-071-13/+16
|\ \ \ | | | | | | | | | | | | | | | | tor-proto: Rename misleading field in `DataCmdChecker`. See merge request tpo/core/arti!1475
| * | | tor-proto: Rename misleading field in `DataCmdChecker`.Gabriela Moldovan2023-08-071-13/+16
|/ / / | | | | | | | | | | | | | | | | | | | | | This is a follow-up from !1451. This commit solves a `TODO HSS` introduced when `DataCmdChecker` got an additional constructor (`new_connected`) for creating "pre-connected" streams. See f6745d31 for more details.
* | | Merge branch 'proto-flaky-test' into 'main'gabi-2502023-08-043-14/+29
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | tor-proto: allow_stream_requests now waits until the control message is received. Closes #994 See merge request tpo/core/arti!1474
| * | | tor-proto: Shut down the reactor if an error occurs in incoming stream ↵Gabriela Moldovan2023-08-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | init/close. Propagating the error means will cause the reactor to shut down (there's not much the control message sender can do about it, so there's no point in sending it the error).
| * | | tor-proto: reject() now waits until the control message is received.Gabriela Moldovan2023-08-042-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a result, by the time the `reject` future resolves, the stream has been removed from the reactor's stream map and the corresponding END cell has been sent. Fixes #998.
| * | | tor-proto: allow_stream_requests now waits until the control message is ↵Gabriela Moldovan2023-08-043-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | received. `ClientCirc::allow_stream_requests` is now `async` and waits until the `AwaitIncomingStream` control message is processed by the reactor. This guarantees that by the time the `allow_stream_requests` future resolves, the reactor is ready to process BEGIN/BEGIN_DIR/RESOLVE cells. Previously, the client tasks from allow_stream_requests tests had to sleep before sending the BEGIN cell to give the reactor time to process the `AwaitIncomingStream` control message (which tells the reactor to expect incoming BEGIN/BEGIN_DIR/RESOLVE cells on the circuit). Fixes #994
* | | | Merge branch 'wait_for_close' into 'main'gabi-2502023-08-046-4/+60
|\ \ \ \ | |/ / / |/| | | | | | | | | | | proto: methods to wait until a channel/circuit is shut down. See merge request tpo/core/arti!1473
| * | | proto: methods to wait until a channel/circuit is shut down.Nick Mathewson2023-08-046-4/+60
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation here is perhaps excessively simple: we put a `oneshot::Sender` in the `Reactor` object, and a `Shared<oneshot::Receiver>` in the circuit or channel. When the reactor is dropped, any copy of the `Shared<Receiver>` will yield `Err(Cancelled)`. I'm marking these methods as experimental because I'm not sure I've thought of all the implications here, and we might want to change things around. Down the road, these methods might want to yield a `Result<>` indicating why the reactor was shut down. This feature was inspired by a request from Saksham Mittal, and a felt need while working on !1472.
* | | Merge branch 'future_proof_lints' into 'main'gabi-2502023-08-0450-100/+105
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | add_warning: Change missing_docs,unreachable_pub to warn Closes #951 See merge request tpo/core/arti!1470
| * | Run add_warnings on all files.Nick Mathewson2023-08-0449-98/+98
| | |
| * | add_warning: Change missing_docs,unreachable_pub to warnNick Mathewson2023-08-041-2/+7
| | | | | | | | | | | | Part of #951. See comments for explanation of why this is important.
* | | Merge branch 'proto-choose-hop' into 'main'gabi-2502023-08-048-23/+55
|\ \ \ | |/ / |/| | | | | | | | | | | | | | tor-proto: Make start_conversation_last_hop() use a given hop, not the last. Closes #959 See merge request tpo/core/arti!1469
| * | tor-proto: Add ClientCirc::start_conversation().Gabriela Moldovan2023-08-046-22/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will enable hidden services to send `RENDEZVOUS1` messages to the `N`th hop of the circuit rather than the `N + 1`th virtual one (which can only used after the client and service have completed the introduction handshake). This also deprecates `start_conversation_last_hop`. Closes #959
| * | tor-proto: Add method for getting the HopNum of the last hop.Gabriela Moldovan2023-08-042-0/+15
| | |
| * | tor-proto: Make HopNum public.Gabriela Moldovan2023-08-043-1/+3
|/ / | | | | | | | | | | `HopNum` will be used in `ClientCirc`'s public API when we refactor `ClientCirc::start_conversation_last_hop` to use the provided hop rather than always using the last one.
* | Merge branch 'check_all_lockfiles' into 'main'Nick Mathewson2023-08-032-0/+20
|\ \ | | | | | | | | | | | | Add maint/check_all_lockfiles See merge request tpo/core/arti!1468
| * | Add maint/check_all_lockfilesMicah Elizabeth Scott2023-08-032-0/+20
| | | | | | | | | | | | | | | Looks for any checked-in Cargo.lock files, and checks the lockfile quickly by running `cargo tree --locked` there.
* | | Merge branch 'proto-incoming-stream' into 'main'gabi-2502023-08-038-30/+711
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | tor-proto: Let onion services accept incoming BEGIN cells and make streams Closes #864 See merge request tpo/core/arti!1451
| * | | tor-proto: Bump test sleep to 200ms for now.Gabriela Moldovan2023-08-031-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This `sleep` is to give the reactor task a chance to process the `AwaitIncomingStream` message. With an 100ms, this test sometimes fails because for some reason the reactor doesn't get a chance to process the `AwaitIncomingStream` control command before the BEGIN cell from the client task is received. This bumps the sleep time to 200ms for now (TODO: follow-up with an MR with a less flaky approach). While trying to repro the issue, I found another corner case for which I've added a TODO HSS.
| * | | tor-proto: Handle new BEGIN cells for rejected stream.Gabriela Moldovan2023-08-032-0/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates the reactor to call the incoming stream handler even for streams for which we have a stream map entry of `EndSent`. If we've sent an END message for a stream but have not yet received an END message back from the other party, but we later receive a BEGIN from them, it is safe to assume we cam remove the stream from the stream map and handle the new incoming stream request.
| * | | tor-proto: Clarify what we mean by "stream" in allow_stream_requests.Gabriela Moldovan2023-08-031-3/+3
| | | |
| * | | tor-proto: Add note about making hop_num optional.Gabriela Moldovan2023-08-031-0/+7
| | | |
| * | | tor-proto: Add a TODO about checking if a hop is allowed to create streams.Gabriela Moldovan2023-08-031-0/+3
| | | |
| * | | tor-proto: Remove unnecessary else-branch.Gabriela Moldovan2023-08-031-38/+38
| | | | | | | | | | | | | | | | | | | | We return early if `message_closes_stream == true`, so we can get rid of the `else` to remove one level of indentation.
| * | | tor-proto: Update the stream map if we get an END message.Gabriela Moldovan2023-08-031-1/+5
| | | | | | | | | | | | | | | | | | | | This handles the previously not handled `message_closes_stream == true` case.
| * | | tor-proto: Add TODO regarding allow_stream_requests corner case.Gabriela Moldovan2023-08-031-0/+24
| | | |
| * | | tor-proto: Remove outdated comments.Gabriela Moldovan2023-08-031-3/+0
| | | |
| * | | tor-proto: Add a test for allow_stream_requests.Gabriela Moldovan2023-08-031-0/+70
| | | |
| * | | tor-proto: Implement allow_stream_requests.Gabriela Moldovan2023-08-032-7/+51
| | | |
| * | | tor-proto: Handle RELAY_BEGIN cells if we have an incoming req handler.Gabriela Moldovan2023-08-031-0/+84
| | | |
| * | | tor-proto: Implement IncomingStream::{accept_data, request, reject}.Gabriela Moldovan2023-08-032-6/+38
| | | |
| * | | tor-proto: Add StreamTarget function for sending CtrlMsg::CloseStream .Gabriela Moldovan2023-08-031-0/+46
| | | | | | | | | | | | | | | | This will be used by `IncomingStream` to implement `reject()`.
| * | | tor-proto: Add reactor control commands for accepting/closing incoming streams.Gabriela Moldovan2023-08-031-4/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new `AwaitIncomingStream` control message for registering an interest in an incoming stream. This also adds a `ClosePendingStream` control message for explicitly closing a stream with a given END message (needed for implementing `IncomingStream::reject`).
| * | | tor-proto: Add types for sharing stream request info with the reactor.Gabriela Moldovan2023-08-031-0/+49
| | | |
| * | | tor-proto: Add a helper for adding a stream entry with a specific stream ID.Gabriela Moldovan2023-08-032-2/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new `add_ent_with_id` function for adding a new entry to the `StreamMap`. The existing `add_ent` function auto-generates a new stream ID, which is not good if we're a hidden service, as stream IDs are supposed to be chosen by the OP (client). When accepting a new stream, services, exit relays, and dir auths need to use the stream ID received in the BEGIN cell (instead of generating a new stream ID).
| * | | tor-proto: Remove extraneous space.Gabriela Moldovan2023-08-032-2/+2
| | | |
| * | | tor-proto: Add constructors for pre-connected DataStreams.Gabriela Moldovan2023-08-031-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When accepting a new stream, hidden services, exit relays and dirauths don't wait for a `CONNECTED` cell from the initiator. This commit adds constructors for building `DataStream`s and `DataCmdChecker`s that can immediately receive data cells (and don't expect to receive `CONNECTED` cells at all).
| * | | tor-proto: Add a constructor for IncomingStream.Gabriela Moldovan2023-08-031-0/+13
| | | |
| * | | tor-proto: Add imports for commonly used types.Gabriela Moldovan2023-08-031-4/+4
| | | |
generated by cgit v1.2.3 (git 2.46.0) at 2026-08-27 22:41:03 +0000