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

aquatic_http: continue implementation work

Browse source
This commit is contained in:
Joakim Frostegård 2020-07-02 13:21:39 +02:00
parent 76079cf66e
commit a487347a0d
6 changed files with 96 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

26
aquatic_http/src/lib/network/mod.rs
View file

@ -182,7 +182,7 @@ pub fn run_handshake_and_read_requests<'a>(
peer_addr: established_connection.peer_addr
};
debug!("read message");
debug!("read request, sending to handler");
if let Err(err) = request_channel_sender
.send((meta, request))
@ -192,12 +192,16 @@ pub fn run_handshake_and_read_requests<'a>(
err
);
}
break
},
Err(RequestParseError::NeedMoreData) => {
info!("need more data");
break;
},
Err(RequestParseError::Io(err)) => {
info!("error reading messages: {}", err);
info!("error reading request: {}", err);
remove_connection_if_exists(connections, poll_token);
@ -205,6 +209,8 @@ pub fn run_handshake_and_read_requests<'a>(
},
Err(e) => {
info!("error reading request: {:?}", e);
remove_connection_if_exists(connections, poll_token);
break;
},
@ -245,10 +251,17 @@ pub fn send_responses(
match established.send_response(&response.to_http_string()){
Ok(()) => {
debug!("sent message");
debug!("sent response");
remove_connection_if_exists(
connections,
meta.poll_token
);
},
Err(RequestParseError::NeedMoreData) => {}, // FIXME: block?
Err(RequestParseError::Io(err)) => {
Err(err) if err.kind() == ErrorKind::WouldBlock => {
debug!("send response: would block");
},
Err(err) => {
info!("error sending response: {}", err);
remove_connection_if_exists(
@ -256,9 +269,6 @@ pub fn send_responses(
meta.poll_token
);
},
_ => {
unreachable!()
}
}
}
}