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

aquatic: actually send error responses from parsing

Browse source
This commit is contained in:
Joakim Frostegård 2020-04-13 16:52:05 +02:00
parent fbeade0ca2
commit 6950726b3c
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
aquatic/src/lib/lib.rs
View file

@ -39,6 +39,7 @@ pub fn run(config: Config){
let state = state.clone(); let state = state.clone();
let config = config.clone(); let config = config.clone();
let request_sender = request_sender.clone(); let request_sender = request_sender.clone();
let response_sender = response_sender.clone();
let response_receiver = response_receiver.clone(); let response_receiver = response_receiver.clone();
Builder::new().name(format!("socket-worker-{}", i + 1)).spawn(move || Builder::new().name(format!("socket-worker-{}", i + 1)).spawn(move ||
@ -47,7 +48,8 @@ pub fn run(config: Config){
config, config,
i, i,
request_sender, request_sender,
response_receiver response_sender,
response_receiver,
) )
).expect("spawn socket worker"); ).expect("spawn socket worker");
} }

5
aquatic/src/lib/network.rs
View file

@ -21,6 +21,7 @@ pub fn run_socket_worker(
config: Config, config: Config,
token_num: usize, token_num: usize,
request_sender: Sender<(Request, SocketAddr)>, request_sender: Sender<(Request, SocketAddr)>,
response_sender: Sender<(Response, SocketAddr)>,
response_receiver: Receiver<(Response, SocketAddr)>, response_receiver: Receiver<(Response, SocketAddr)>,
){ ){
let mut buffer = [0u8; MAX_PACKET_SIZE]; let mut buffer = [0u8; MAX_PACKET_SIZE];
@ -53,6 +54,7 @@ pub fn run_socket_worker(
&mut socket, &mut socket,
&mut buffer, &mut buffer,
&request_sender, &request_sender,
&response_sender
); );
state.statistics.readable_events.fetch_add(1, Ordering::SeqCst); state.statistics.readable_events.fetch_add(1, Ordering::SeqCst);
@ -116,6 +118,7 @@ fn read_requests(
socket: &mut UdpSocket, socket: &mut UdpSocket,
buffer: &mut [u8], buffer: &mut [u8],
request_sender: &Sender<(Request, SocketAddr)>, request_sender: &Sender<(Request, SocketAddr)>,
response_sender: &Sender<(Response, SocketAddr)>,
){ ){
let mut requests_received: usize = 0; let mut requests_received: usize = 0;
let mut bytes_received: usize = 0; let mut bytes_received: usize = 0;
@ -156,7 +159,7 @@ fn read_requests(
message, message,
}; };
// responses.push((response.into(), src)); // FIXME response_sender.try_send((response.into(), src));
} }
} }
}, },