YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-02 18:55:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

aquatic_udp: glommio: refactor networking for less state in Connection

Browse source
This commit is contained in:
Joakim Frostegård 2021-10-27 14:07:49 +02:00
parent 6404be8ef8
commit dd968821e4
1 changed files with 33 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

41
aquatic_http/src/lib/glommio/network.rs
View file

@ -52,7 +52,6 @@ struct Connection {
stream: TcpStream, stream: TcpStream,
connection_id: ConnectionId, connection_id: ConnectionId,
request_buffer: Vec<u8>, request_buffer: Vec<u8>,
close_after_writing: bool,
} }
pub async fn run_socket_worker( pub async fn run_socket_worker(
@ -127,7 +126,6 @@ pub async fn run_socket_worker(
stream, stream,
connection_id: ConnectionId(entry.key()), connection_id: ConnectionId(entry.key()),
request_buffer: Vec::new(), request_buffer: Vec::new(),
close_after_writing: false,
}; };
let connections_to_remove = connections_to_remove.clone(); let connections_to_remove = connections_to_remove.clone();
@ -172,10 +170,11 @@ async fn receive_responses(
impl Connection { impl Connection {
async fn handle_stream(&mut self) -> anyhow::Result<()> { async fn handle_stream(&mut self) -> anyhow::Result<()> {
loop { let mut close_after_writing = false;
let opt_request = self.read_tls().await?;
if let Some(request) = opt_request { loop {
match self.read_tls().await? {
Some(Either::Left(request)) => {
let response = match self.handle_request(request).await? { let response = match self.handle_request(request).await? {
Some(Either::Left(response)) => { Some(Either::Left(response)) => {
response response
@ -191,13 +190,22 @@ impl Connection {
self.queue_response(&response)?; self.queue_response(&response)?;
if !self.config.network.keep_alive { if !self.config.network.keep_alive {
self.close_after_writing = true; close_after_writing = true;
}
}
Some(Either::Right(response)) => {
self.queue_response(&Response::Failure(response))?;
close_after_writing = true;
}
None => {
// Still handshaking
} }
} }
self.write_tls().await?; self.write_tls().await?;
if self.close_after_writing { if close_after_writing {
let _ = self.stream.shutdown(std::net::Shutdown::Both).await; let _ = self.stream.shutdown(std::net::Shutdown::Both).await;
break; break;
@ -207,7 +215,7 @@ impl Connection {
Ok(()) Ok(())
} }
async fn read_tls(&mut self) -> anyhow::Result<Option<Request>> { async fn read_tls(&mut self) -> anyhow::Result<Option<Either<Request, FailureResponse>>> {
loop { loop {
::log::debug!("read_tls"); ::log::debug!("read_tls");
@ -216,11 +224,7 @@ impl Connection {
let bytes_read = self.stream.read(&mut buf).await?; let bytes_read = self.stream.read(&mut buf).await?;
if bytes_read == 0 { if bytes_read == 0 {
::log::debug!("peer has closed connection"); return Err(anyhow::anyhow!("Peer has closed connection"));
self.close_after_writing = true;
break;
} }
let _ = self.tls.read_tls(&mut &buf[..bytes_read]).unwrap(); let _ = self.tls.read_tls(&mut &buf[..bytes_read]).unwrap();
@ -260,7 +264,7 @@ impl Connection {
self.request_buffer = Vec::new(); self.request_buffer = Vec::new();
return Ok(Some(request)); return Ok(Some(Either::Left(request)));
} }
Err(RequestParseError::NeedMoreData) => { Err(RequestParseError::NeedMoreData) => {
::log::debug!( ::log::debug!(
@ -271,14 +275,11 @@ impl Connection {
Err(RequestParseError::Invalid(err)) => { Err(RequestParseError::Invalid(err)) => {
::log::debug!("invalid request: {:?}", err); ::log::debug!("invalid request: {:?}", err);
let response = Response::Failure(FailureResponse { let response = FailureResponse {
failure_reason: "Invalid request".into(), failure_reason: "Invalid request".into(),
}); };
self.queue_response(&response)?; return Ok(Some(Either::Right(response)));
self.close_after_writing = true;
break;
} }
} }
} }