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: error response on invalid request; rename response types

Browse source
This commit is contained in:
Joakim Frostegård 2020-07-04 11:08:48 +02:00
parent 60faf2da3f
commit 6b7ce0e211
3 changed files with 38 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@ pub mod connection;
use std::time::{Duration, Instant};
use std::io::ErrorKind;
use std::sync::Arc;
use std::vec::Drain;
use hashbrown::HashMap;
use log::{info, debug, error};
@ -75,6 +76,8 @@ pub fn run_poll_loop(
let mut poll_token_counter = Token(0usize);
let mut iter_counter = 0usize;
let mut local_responses = Vec::new();
loop {
poll.poll(&mut events, Some(poll_timeout))
.expect("failed polling");
@ -97,6 +100,7 @@ pub fn run_poll_loop(
run_handshakes_and_read_requests(
socket_worker_index,
&request_channel_sender,
&mut local_responses,
&mut connections,
token,
valid_until,
@ -105,6 +109,7 @@ pub fn run_poll_loop(
}
send_responses(
local_responses.drain(..),
response_channel_receiver.drain(),
&mut connections
);
@ -166,6 +171,7 @@ fn accept_new_streams(
pub fn run_handshakes_and_read_requests(
socket_worker_index: usize,
request_channel_sender: &RequestChannelSender,
local_responses: &mut Vec<(ConnectionMeta, Response)>,
connections: &mut ConnectionMap,
poll_token: Token,
valid_until: ValidUntil,
@ -209,6 +215,25 @@ pub fn run_handshakes_and_read_requests(
// Stop reading data (defer to later events)
break;
},
Err(RequestReadError::Invalid(err)) => {
info!("error reading request (invalid): {}", err);
let meta = ConnectionMeta {
worker_index: socket_worker_index,
poll_token,
peer_addr: established.peer_addr
};
let response = FailureResponse {
failure_reason: "invalid request".to_string()
};
local_responses.push(
(meta, Response::Failure(response))
);
break;
},
Err(err) => {
info!("error reading request: {:?}", err);
@ -243,10 +268,11 @@ pub fn run_handshakes_and_read_requests(
/// Read responses from channel, send to peers
pub fn send_responses(
local_responses: Drain<(ConnectionMeta, Response)>,
response_channel_receiver: ::flume::Drain<(ConnectionMeta, Response)>,
connections: &mut ConnectionMap,
){
for (meta, response) in response_channel_receiver {
for (meta, response) in local_responses.chain(response_channel_receiver){
if let Some(established) = connections.get_mut(&meta.poll_token)
.and_then(|c| c.inner.as_mut().left())
{