Stowage/noita_entangled_worlds
2
0
Fork 0
mirror of https://github.com/IntQuant/noita_entangled_worlds.git synced 2025-10-19 07:03:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Should avoid the hang on disconnect.

Browse source
This commit is contained in:
IQuant 2024-08-24 11:36:18 +03:00
parent df98596a07
commit 9e2ff64539
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
noita-proxy/src/net/steam_networking.rs
View file

@ -181,6 +181,8 @@ impl Connections {
fn poll_status(&self) -> bool {
let networking_sockets = self.client.networking_sockets();
let mut all_connected = true;
// Postpone reconnect so we don't get deadlocked.
let mut pending_reconnect = Vec::new();
for mut state in self.peers.iter_mut() {
match state.value() {
ConnectionState::AwaitingIncoming => {
@ -214,7 +216,7 @@ impl Connections {
"Some problem happened for peer {:?} while making connection. Will try to connect again.",
*state.key()
);
self.connect(*state.key());
pending_reconnect.push(*state.key());
all_connected = false;
}
}
@ -229,7 +231,7 @@ impl Connections {
// Not supposed to happen, as we're in NetConnectionPending state while connecting.
warn!("Not supposed to be in connecting state here.");
// Still recreate connection.
self.connect(*state.key());
pending_reconnect.push(*state.key());
all_connected = false;
}
NetworkingConnectionState::Connected => {
@ -243,8 +245,8 @@ impl Connections {
"Some problem happened for peer {:?} while connection was established. Will try to connect again.",
*state.key()
);
self.connect(*state.key());
// TODO: signal that reconnect happened.
pending_reconnect.push(*state.key());
// TODO: signal that reconnect happened.
// Several things should be reset on it, as we certainly lost several messages during it.
all_connected = false;
}
@ -252,6 +254,10 @@ impl Connections {
}
}
}
for peer_id in pending_reconnect {
self.connect(peer_id);
}
all_connected
}