summaryrefslogtreecommitdiff
path: root/crates/tor-proto/src/circuit.rs
Commit message (Collapse)AuthorAgeFilesLines
* Run maint/add_warning to add lint block everywhereIan Jackson2023-08-231-0/+1
|
* Use "typos-cli" to fix a bunch of typos.Nick Mathewson2023-08-221-1/+1
|
* proto: fix a comment to refer to circuits, not channels.Nick Mathewson2023-08-221-1/+1
|
* Merge branch 'send_raw_msg' into 'main'Nick Mathewson2023-08-221-0/+27
|\ | | | | | | | | | | | | proto: new ClientCirc::send_raw_msg function. Closes #1010 See merge request tpo/core/arti!1525
| * proto: Add crossrefs between start_conversation and send_raw_msgNick Mathewson2023-08-221-0/+6
| |
| * proto: new ClientCirc::send_raw_msg function.Nick Mathewson2023-08-211-0/+21
| | | | | | | | Closes #1010.
* | Resolve warnings about ambiguous/redundant doc linksNick Mathewson2023-08-221-1/+1
|/ | | | | Nightly rustdoc now warns if you have a link that isn't necessary, and if you have a link that might refer to two different things.
* tor-proto: Add test where an incoming stream comes from an unexpect hop.Gabriela Moldovan2023-08-181-0/+44
| | | | | | | This adds a test that checks if the reactor is shut down if it receives an incoming stream request from an unexpected hop. Part of #1009
* tor-proto: Make ClientCirc::allow_stream_requests take a HopNum.Gabriela Moldovan2023-08-181-4/+18
| | | | | | | | | | For consistency with the other `ClientCirc` APIs, `ClientCirc::allow_stream_requests` now takes a `HopNum` argument. Upon receiving an incoming stream request, the reactor now checks if the request came from the hop specified in `allow_stream_requests` (and if it came from a different hop, the circuit is closed). Part of #1009
* tor-proto: Fix dead_code when building without experimental-apiNick Mathewson2023-08-161-0/+1
|
* Merge branch 'remove-unused-import' into 'main'Ian Jackson2023-08-161-1/+3
|\ | | | | | | | | tor-proto: remove unused import See merge request tpo/core/arti!1493
| * tor-proto: remove unused importEmil Engler2023-08-101-1/+3
| | | | | | | | | | This commit removes an unused import within the test module of the `tor_proto::circuit` module.
* | proto: Fix a type-complexity warning.Nick Mathewson2023-08-141-2/+4
| |
* | proto: API to expose the `CircuitBinding` type.Nick Mathewson2023-08-141-1/+33
| | | | | | | | Closes #993
* | proto: Take CircuitBinding one step forward into Reactor::add_hop.Nick Mathewson2023-08-141-2/+2
|/
* tor-proto: Make StreamTarget::close return the oneshot::Receiver instead of ↵Gabriela Moldovan2023-08-081-23/+6
| | | | | | | | | | | | blocking. Instead of having 2 version of `StreamTarget::close` (a blocking one and a nonblocking one), we can just return the `oneshot::Receiver` for receiving the reactor's response and let the caller of `StreamTarget::close` decide whether to block. This allows us to reduce some code duplication in the `IncomingStream` implementation.
* 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 'proto-flaky-test' into 'main'gabi-2502023-08-041-12/+18
|\ | | | | | | | | | | | | tor-proto: allow_stream_requests now waits until the control message is received. Closes #994 See merge request tpo/core/arti!1474
| * tor-proto: reject() now waits until the control message is received.Gabriela Moldovan2023-08-041-0/+6
| | | | | | | | | | | | | | | | 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-041-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | proto: methods to wait until a channel/circuit is shut down.Nick Mathewson2023-08-041-2/+18
|/ | | | | | | | | | | | | | | | | | 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.
* tor-proto: Add ClientCirc::start_conversation().Gabriela Moldovan2023-08-041-15/+26
| | | | | | | | | | | 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-041-0/+14
|
* 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-031-0/+88
| | | | | | | | | 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 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-031-7/+49
|
* 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: Remove extraneous space.Gabriela Moldovan2023-08-031-1/+1
|
* tor-circmgr: Add two possibly-needed docsrs annotationsIan Jackson2023-07-121-0/+1
| | | | | I don't know if these are needed because the rules are not documented afaict. But it seems like probably they ought to be there?
* tor-proto: Conversation: drop two otiose cfg(feature)Ian Jackson2023-07-121-1/+0
| | | | These fns are in a feature-gated impls on feature-gated structs.
* Merge branch 'clippy-allow' into 'main'Ian Jackson2023-07-111-0/+1
|\ | | | | | | | | clippy: Allow some of our existing code patterns See merge request tpo/core/arti!1396
| * Run maint/add_warning to actually apply new lint allowsIan Jackson2023-07-101-0/+1
| |
* | Merge branch 'conversation' into 'main'Alexander Færøy2023-07-101-89/+113
|\ \ | |/ |/| | | | | Overhaul send_control_message See merge request tpo/core/arti!1367
| * tor-proto: run rustfmtIan Jackson2023-06-301-1/+4
| |
| * tor-proto conversation API: Provide ConversationInHandlerIan Jackson2023-06-301-1/+6
| |
| * tor-proto conversation API: Implement ConversationIan Jackson2023-06-301-89/+98
| | | | | | | | | | Now, after you call start_conversation_last_hop, you can send more messages if you like.
| * tor-proto: Make the handler in SendMsgAndInstallHandler optionalIan Jackson2023-06-301-1/+1
| | | | | | | | | | We're going to want to do almost-the-same thing but without installing a new handler.
| * tor-proto conversation API: Return a ConversationIan Jackson2023-06-301-8/+15
| | | | | | | | | | This is just a placeholder for now, but it'll be a thing you can send more messages with.
| * tor-proto conversation API: Rename to start_conversation_last_hopIan Jackson2023-06-301-7/+7
| | | | | | | | Was send_control_message.
| * tor-proto conversation API: Make starting message optionalIan Jackson2023-06-301-2/+2
| | | | | | | | | | We're going to let people start a conversation and either expect to receive first, or send messages ad-hoc later.
* | Remove explicit allows for missing_panics_docs.Nick Mathewson2023-07-061-1/+1
|/ | | | These are no longer needed.
* proto: ClientCirc: remove now-obsolete note on Clone-nessNick Mathewson2023-06-281-5/+0
|
* proto: document ClientCirc lifecycle better.Nick Mathewson2023-06-281-0/+29
|
* proto: Remove support for receiving unauthenticated SENDMEsNick Mathewson2023-06-261-10/+0
| | | | | | | We haven't generated these since Tor 0.3.5, which is no longer supported on the network. Closes #914.
* Merge branch 'proto-better-path' into 'main'Nick Mathewson2023-06-221-26/+73
|\ | | | | | | | | | | | | Better API for getting circuit paths Closes #787 See merge request tpo/core/arti!1286
| * proto: Resolve/downgrade some path-related "TODO HS" itemsNick Mathewson2023-06-221-2/+0
| |