godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MP] Fix auth not waiting for confirmation in some cases 

The auth implementation was treating any received packet as a remote
confirmation after the peer was confirmed locally.

It now correctly awaits for the remote confirmation packet before
admitting new peers.
This commit is contained in:
Fabio Alessandrelli 2023-12-17 13:19:07 +01:00
parent 26b1fd0d84
commit 754036f82f
1 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/multiplayer/scene_multiplayer.cpp
View File

@ -96,11 +96,6 @@ Error SceneMultiplayer::poll() {
#endif #endif
if (pending_peers.has(sender)) { if (pending_peers.has(sender)) {
if (pending_peers[sender].local) {
// If the auth is over, admit the peer at the first packet.
pending_peers.erase(sender);
_admit_peer(sender);
} else {
ERR_CONTINUE(len < 2 || (packet[0] & CMD_MASK) != NETWORK_COMMAND_SYS || packet[1] != SYS_COMMAND_AUTH); ERR_CONTINUE(len < 2 || (packet[0] & CMD_MASK) != NETWORK_COMMAND_SYS || packet[1] != SYS_COMMAND_AUTH);
// Auth message. // Auth message.
PackedByteArray pba; PackedByteArray pba;
@ -125,7 +120,6 @@ Error SceneMultiplayer::poll() {
} }
continue; // Auth in progress. continue; // Auth in progress.
} }
}
ERR_CONTINUE(!connected_peers.has(sender)); ERR_CONTINUE(!connected_peers.has(sender));