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

aquatic_http: write custom deserialize logic for Request

Browse source
This commit is contained in:
Joakim Frostegård 2020-07-03 17:10:30 +02:00
parent 501c2a293a
commit 52cc7d8acb
4 changed files with 130 additions and 206 deletions
Download patch file Download diff file Expand all files Collapse all files

16
aquatic_http/src/lib/network/connection.rs
View file

@ -19,7 +19,7 @@ use crate::protocol::Request;
#[derive(Debug)]
pub enum RequestReadError {
NeedMoreData,
Invalid,
Invalid(anyhow::Error),
StreamEnded,
Io(::std::io::Error),
Parse(::httparse::Error),
@ -77,16 +77,16 @@ impl EstablishedConnection {
match http_request.parse(&self.buf[..self.bytes_read]){
Ok(httparse::Status::Complete(_)) => {
let opt_request = http_request.path.and_then(
Request::from_http_get_path
);
if let Some(path) = http_request.path {
let res_request = Request::from_http_get_path(path);
self.clear_buffer();
self.clear_buffer();
if let Some(request) = opt_request {
Ok(request)
res_request.map_err(RequestReadError::Invalid)
} else {
Err(RequestReadError::Invalid)
self.clear_buffer();
Err(RequestReadError::Invalid(anyhow::anyhow!("no http path")))
}
},
Ok(httparse::Status::Partial) => {