vincenzopalazzo
/
arti
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify error checking in begin_data_stream().

This commit is contained in:
George Kadianakis 2021-02-08 20:23:46 +02:00
parent bd4169e7d2
commit 65da0f5da0
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tor-proto/src/circuit.rs
View File

@ -540,24 +540,18 @@ impl ClientCirc {
// XXXX: Make this configurable (is it the same as SocksTimeout)?
let stream_timeout = Duration::from_secs(120);
let response = tor_rtcompat::timer::timeout(stream_timeout, stream.recv()).await?;
let response = tor_rtcompat::timer::timeout(stream_timeout, stream.recv()).await??;
// If we received a legit RELAY cell, handle it
match response {
Ok(response) => {
if response.cmd() == RelayCmd::CONNECTED {
Ok(DataStream::new(stream))
} else if response.cmd() == RelayCmd::END {
Err(Error::StreamClosed("end cell when waiting for connection"))
} else {
self.protocol_error().await;
Err(Error::StreamProto(format!(
"Received {} while waiting for connection",
response.cmd()
)))
}
}
Err(err) => Err(err),
if response.cmd() == RelayCmd::CONNECTED {
Ok(DataStream::new(stream))
} else if response.cmd() == RelayCmd::END {
Err(Error::StreamClosed("end cell when waiting for connection"))
} else {
self.protocol_error().await;
Err(Error::StreamProto(format!(
"Received {} while waiting for connection",
response.cmd()
)))
}
}