| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| ... | |
| | |
| |
| |
| |
| |
| | |
While we still re-export StreamReceiver from the client module, I want
to avoid importing it from there in the implementation-agnostic modules,
just to make it clearer we're not using client-specific types.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Initially I wanted to turn `msg_streamid()` into a method on
`UnparsedRelayMsg`, but I ultimately decided against it, because it
feels like it doesn't belong there (even though intuitively, I would've
expected it to handle the mismatch between stream ID and cell command
internally). This is because all the `UnparsedRelayMsg` methods return
`tor_bytes::Result`, and do not actually do any validation beyond some
length checks on the various fields.
|
| | |
| |
| |
| | |
All this indirection is making me dizzy.
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The relay reactor is now able to handle incoming stream requests (i.e.
cells that open streams). It currently only supports DATA stream
requests (BEGIN); support for other stream types (BEGIN_DIR, RESOLVE)
will be added later.
`Reactor::new()` now returns the futures::Stream of Tor streams, alongside
the `Reactor` and `RelayCirc` handle. Whoever calls `Reactor::new()` is
responsible for passing the stream of streams over to the task that is
meant to handle it ("handle" in this case means either rejecting the
stream with a given `END` cell, or accepting it and forwarding the
connection between it and the corresponding application stream).
IMPORTANT: the above is a bit half-baked! Next on my TODO list is is to
iron out the details of how/where this will actually be handled.
I am also a bit unsure about the API here: I think it might've been
nicer to give the user the ability to obtain this `futures::Stream` from
`RelayCirc`, which is, after all, a handle to the reactor?
Also on my short-term TODO list is to figure out how conflux will affect
this API and usage.
And there is another wrinkle here: for incoming DATA stream requests,
the handler will need to produce a resulting `DataStream`, which is not
yet fully implementation-agnostic (it wraps a `ClientDataStreamCtrl`).
This too will be handled in a separate MR.
|
| | |
| |
| |
| | |
These will need to be handled soon
|
| | |
| |
| |
| |
| | |
This is needed because we will soon have another callsite for it, which
will need to pass `AnyRelayMsgOuter`.
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is needed because we want to reuse `StreamTarget` and `DataStream`
on the relay side too, but to do that, we need to abstract away the
tunnel/circuit type (prior to this MR, `StreamTarget` was was
client-specific, as it used to wrap a client tunnel).
Note that `StreamTarget` needs a handle to the client/relay circuit
reactor because it needs to be able to shut down the circuit if a
protocol error occurs (cells carrying stream data are parsed late,
*outside* of the reactor, so if e.g. a cell fails to parse, the
`DataReaderImpl` needs to be able to shut it down), and because it needs
to be able to inform the reactor of flow control-related events (such as
drain rate update).
|
| | |
| |
| |
| | |
For relays, the hop of the StreamTarget will be set to `None`.
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| | |
I've made `run()` more similar to its client circuit reactor counterpart
(I think the error reporting will be better, and if we ever need to make
the reactor public, it will be easier this way because now `run()`
doesn't expose the crate-private `ReactorError` type).
|
| | |
| |
| |
| |
| | |
This is already namespaced under the `relay` module so the `Relay`
prefix is redundant.
|
| | |
| |
| |
| | |
This will be needed soon.
|
| | | |
|
| | |
| |
| |
| | |
We are about to use `StreamReqInfo` for exit streams too.
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| | |
This MPSC channel now has zero buffering, because if the backward
reactor can't send the cell, the forward reactor must immediately stop
reading from its inputs (note that the backward reactor's Tor channel
towards the client *does* have a buffering layer).
|
| | |
| |
| |
| |
| | |
There are other types of messages (like circuit-level SENDMEs) that need
to be handled in the backward reactor too.
|
| | |
| |
| |
| |
| | |
We will soon need a handle to the runtime in BackwardReactor (we need a
time provider to call `note_sendme_received()`).
|
| | |
| |
| |
| |
| | |
We need to avoid reading from all of these if the chan_sender isn't
ready, because otherwise we can't provide backpressure.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The backward reactor needs this for handling padding (because it may
need to e.g. put the chan sender in a blocked state).
Note that `CircuitCellSender` has an underlying
`SometimesUnboundedSink`, so from now on we must be very careful and
avoid writing to the `chan_sender` if it's not ready (because otherwise
we can end up buffering unboundedly). The next commit will add some
extra checks against reading from futures::Streams that might cause us
to write to the `chan_sender` sink (futures::Sink).
|
| | |
| |
| |
| |
| |
| | |
Rewriting the code this way reduces the indentation level for the
"recognized cell" case (which is not yet implemented, but will be very
soon), thereby making it more readable.
|
| | | |
|
| | | |
|
| | | |
|
| |/
|
|
|
| |
These are all aimed at figuring out in more detail what's going on
in #2079 and related issues.
|
| |
|
|
| |
Signed-off-by: David Goulet <[email protected]>
|
| |
|
|
| |
Signed-off-by: David Goulet <[email protected]>
|
| |
|
|
| |
Signed-off-by: David Goulet <[email protected]>
|
| |
|
|
| |
Signed-off-by: David Goulet <[email protected]>
|
| |
|
|
|
|
|
| |
We know from the start that this is 32 bytes so no reason to hard fail
if not, just propagate the right type from the start.
Signed-off-by: David Goulet <[email protected]>
|
| |
|
|
| |
Signed-off-by: David Goulet <[email protected]>
|
| |
|
|
| |
Signed-off-by: David Goulet <[email protected]>
|
| |
|
|
|
|
|
|
|
|
| |
The UnverifiedChannel::finish() was split in previous commit so this
adds the support for sending the right NETINFO cell instead of the
client specific one.
Added more TODOs for followup commits.
Signed-off-by: David Goulet <[email protected]>
|
| |
|
|
|
|
|
|
|
|
| |
Move the client specific code into VerifiedClientChannel as in sending
the NETINFO cell. The rest is pretty much boiler plate to build a
channel reactor.
The relay finish() code is coming in a followup commit.
Signed-off-by: David Goulet <[email protected]>
|
| |
|
|
|
|
|
|
|
| |
By changing the connect() returned object we therefore officially make
VerifiedChannel and UnverifiedChannel crate only objects.
Thus, this commit changes visibility on most things.
Signed-off-by: David Goulet <[email protected]>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
This adds the UnverifiedClientChannel and VerifiedClientChannel
mirroring the relay API for channels.
It plainly uses the generic object underneath as for now those objects
are client only.
Followup commits will make things more client specific.
No behavior change.
Signed-off-by: David Goulet <[email protected]>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
This only moves code from src/channel to src/client/channel.
It introduces a ClientChanBuilder that is used to launch client specific
channel by the public ChanBuilder.
The followup commits will add a VerifiedClientChannel and
UnverifiedClientChannel in order to again decouple client and relay code
from the generic objects.
Signed-off-by: David Goulet <[email protected]>
|
| |
|
|
|
|
|
|
| |
Add the finish() function that for now simply calls the generic
finish(). There is a bunch of TODO in the code in this commit explaining
why we haven't made the implementation relay specific just yet.
Signed-off-by: David Goulet <[email protected]>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
This commits takes out the relay specific code out of UnverifiedChannel
and puts it in UnverifiedRelayChannel.
In order to pull this off, we added some fiels to the VerifiedChannel
struct so the relay code get back generated data from the
UnverifiedChannel::check() in order to do its validation work and yield
a VerifiedRelayChannel.
This also lead to a cleanup of expect() and ChannelType::is_initiator().
Signed-off-by: David Goulet <[email protected]>
|
| |
|
|
|
|
|
|
|
|
| |
The new UnverifiedRelayChannel and VerifiedRelayChannel struct are added
to decouple the client code and put the relay component in its module.
Both objects hold the to become generic object that both client and
relay will use to create a channel.
Signed-off-by: David Goulet <[email protected]>
|
| | |
|
| | |
|
| | |
|
