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_ws: rename "read_and_forward_in_messages; move around code

Browse source
This commit is contained in:
Joakim Frostegård 2020-05-11 14:41:17 +02:00
parent 6136184890
commit 87290f4289
1 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

37
aquatic_ws/src/lib/network.rs
View file

@ -37,6 +37,23 @@ pub struct PeerConnection {
pub type ConnectionMap = HashMap<Token, Connection>; pub type ConnectionMap = HashMap<Token, Connection>;
#[derive(Clone, Copy, Debug)]
pub struct DebugCallback;
impl ::tungstenite::handshake::server::Callback for DebugCallback {
fn on_request(
self,
request: &::tungstenite::handshake::server::Request,
response: ::tungstenite::handshake::server::Response,
) -> Result<::tungstenite::handshake::server::Response, ::tungstenite::handshake::server::ErrorResponse> {
println!("request: {:#?}", request);
println!("response: {:#?}", response);
Ok(response)
}
}
pub fn run_socket_worker( pub fn run_socket_worker(
address: SocketAddr, address: SocketAddr,
socket_worker_index: usize, socket_worker_index: usize,
@ -76,7 +93,7 @@ pub fn run_socket_worker(
&mut poll_token_counter &mut poll_token_counter
); );
} else if event.is_readable(){ } else if event.is_readable(){
read_and_forward_in_messages( run_handshake_and_read_messages(
socket_worker_index, socket_worker_index,
&in_message_sender, &in_message_sender,
&mut poll, &mut poll,
@ -203,22 +220,6 @@ fn accept_new_streams(
} }
} }
#[derive(Clone, Copy, Debug)]
pub struct DebugCallback;
impl ::tungstenite::handshake::server::Callback for DebugCallback {
fn on_request(
self,
request: &::tungstenite::handshake::server::Request,
response: ::tungstenite::handshake::server::Response,
) -> Result<::tungstenite::handshake::server::Response, ::tungstenite::handshake::server::ErrorResponse> {
println!("request: {:#?}", request);
println!("response: {:#?}", response);
Ok(response)
}
}
pub fn handle_handshake_result( pub fn handle_handshake_result(
connections: &mut ConnectionMap, connections: &mut ConnectionMap,
@ -268,7 +269,7 @@ pub fn handle_handshake_result(
} }
pub fn read_and_forward_in_messages( pub fn run_handshake_and_read_messages(
socket_worker_index: usize, socket_worker_index: usize,
in_message_sender: &InMessageSender, in_message_sender: &InMessageSender,
poll: &mut Poll, poll: &mut Poll,