DevComp/ruck
1
0
Fork 0
mirror of https://github.com/CompeyDev/ruck.git synced 2025-01-07 11:29:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle interrupted handshake better

Browse source
This commit is contained in:
rictorlome 2022-02-17 14:01:40 -05:00
parent d6e299b031
commit 0c2041a6db
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/server.rs
View file

@ -60,10 +60,15 @@ impl Client {
Some(peer_tx) => peer_tx,
// Sender - needs to wait for the incoming msg to look up peer_tx
None => {
match client.rx.recv().await {
Some(msg) => client.messages.send(msg).await?,
None => return Err(anyhow!("Connection not stapled")),
};
tokio::select! {
Some(msg) = client.rx.recv() => {
client.messages.send(msg).await?
}
result = client.messages.next() => match result {
Some(_) => return Err(anyhow!("Client sending more messages before handshake complete")),
None => return Err(anyhow!("Connection interrupted")),
}
}
match state
.lock()
.await
@ -121,13 +126,20 @@ pub async fn handle_connection(
return Ok(());
}
};
// println!("server - received msg from {:?}", addr);
let client = Client::new(handshake_payload.id.clone(), state.clone(), stream).await?;
let mut client = Client::upgrade(client, state.clone(), handshake_payload).await?;
let id = handshake_payload.id.clone();
let client = Client::new(id.clone(), state.clone(), stream).await?;
let mut client = match Client::upgrade(client, state.clone(), handshake_payload).await {
Ok(client) => client,
Err(err) => {
// Clear handshake cache if staple is unsuccessful
state.lock().await.handshake_cache.remove(&id);
return Err(err);
}
};
// The handshake cache should be empty for {id} at this point.
loop {
tokio::select! {
Some(msg) = client.rx.recv() => {
// println!("message received to client.rx {:?}", msg);
client.messages.send(msg).await?
}
result = client.messages.next() => match result {