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

aquatic_ws: create fn handle_handshake_result

Browse source
This commit is contained in:
Joakim Frostegård 2020-05-11 14:25:35 +02:00
parent 274799872f
commit 583d323c7f
1 changed files with 61 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -131,6 +131,7 @@ pub fn run_socket_worker(
} }
/// FIXME: close channel if not closed?
fn remove_connection_if_exists( fn remove_connection_if_exists(
poll: &mut Poll, poll: &mut Poll,
connections: &mut ConnectionMap, connections: &mut ConnectionMap,
@ -219,6 +220,54 @@ impl ::tungstenite::handshake::server::Callback for DebugCallback {
} }
pub fn handle_handshake_result(
connections: &mut ConnectionMap,
poll_token: Token,
valid_until: ValidUntil,
result: Result<WebSocket<TcpStream>, HandshakeError<ServerHandshake<TcpStream, DebugCallback>>> ,
) -> bool {
match result {
Ok(mut ws) => {
println!("handshake established");
let peer_socket_addr = ws.get_mut().peer_addr().unwrap();
let peer_connection = PeerConnection {
ws,
peer_socket_addr,
valid_until,
};
let connection = Connection {
valid_until: Some(valid_until),
stage: ConnectionStage::Established(peer_connection)
};
connections.insert(poll_token, connection);
false
},
Err(HandshakeError::Interrupted(handshake)) => {
println!("interrupted");
let connection = Connection {
valid_until: Some(valid_until),
stage: ConnectionStage::MidHandshake(handshake),
};
connections.insert(poll_token, connection);
true
},
Err(HandshakeError::Failure(err)) => {
dbg!(err);
false
}
}
}
pub fn read_and_forward_in_messages( pub fn read_and_forward_in_messages(
socket_worker_index: usize, socket_worker_index: usize,
in_message_sender: &InMessageSender, in_message_sender: &InMessageSender,
@ -242,39 +291,20 @@ pub fn read_and_forward_in_messages(
match conn.stage { match conn.stage {
ConnectionStage::Stream(stream) => { ConnectionStage::Stream(stream) => {
let peer_socket_addr = stream.peer_addr().unwrap(); let handshake_result = ::tungstenite::server::accept_hdr(
stream,
DebugCallback
);
match ::tungstenite::server::accept_hdr(stream, DebugCallback){ let stop_loop = handle_handshake_result(
Ok(ws) => { connections,
println!("handshake established"); poll_token,
let peer_connection = PeerConnection { valid_until,
ws, handshake_result
peer_socket_addr, );
valid_until,
};
let connection = Connection { if stop_loop {
valid_until: Some(valid_until), break;
stage: ConnectionStage::Established(peer_connection)
};
connections.insert(poll_token, connection);
},
Err(HandshakeError::Interrupted(handshake)) => {
println!("interrupted");
let connection = Connection {
valid_until: Some(valid_until),
stage: ConnectionStage::MidHandshake(handshake),
};
connections.insert(poll_token, connection);
break;
},
Err(HandshakeError::Failure(err)) => {
dbg!(err);
}
} }
}, },
ConnectionStage::MidHandshake(mut handshake) => { ConnectionStage::MidHandshake(mut handshake) => {