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

[Net] Fix WebRTC returning packets from peers too early.

Browse Source 
Due to the async nature of WebRTC implementations, the multiplayer peer
could end up having queued packets from a given connection before it is
able to emit the "peer_added" signal.
This commit ensures that packets from peers which are not notified yet
are skipped by `get_packet` and `get_available_packet_count`.
This commit is contained in:
Fabio Alessandrelli 2021-12-15 10:58:48 +01:00
parent 1930fc8b31
commit 84112d9610
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/webrtc/webrtc_multiplayer_peer.cpp
View File

@ -146,6 +146,10 @@ void WebRTCMultiplayerPeer::_find_next_peer() {
} }
// After last. // After last.
while (E) { while (E) {
if (!E->get()->connected) {
E = E->next();
continue;
}
for (const Ref<WebRTCDataChannel> &F : E->get()->channels) { for (const Ref<WebRTCDataChannel> &F : E->get()->channels) {
if (F->get_available_packet_count()) { if (F->get_available_packet_count()) {
next_packet_peer = E->key(); next_packet_peer = E->key();
@ -157,6 +161,10 @@ void WebRTCMultiplayerPeer::_find_next_peer() {
E = peer_map.front(); E = peer_map.front();
// Before last // Before last
while (E) { while (E) {
if (!E->get()->connected) {
E = E->next();
continue;
}
for (const Ref<WebRTCDataChannel> &F : E->get()->channels) { for (const Ref<WebRTCDataChannel> &F : E->get()->channels) {
if (F->get_available_packet_count()) { if (F->get_available_packet_count()) {
next_packet_peer = E->key(); next_packet_peer = E->key();
@ -378,6 +386,9 @@ int WebRTCMultiplayerPeer::get_available_packet_count() const {
} }
int size = 0; int size = 0;
for (const KeyValue<int, Ref<ConnectedPeer>> &E : peer_map) { for (const KeyValue<int, Ref<ConnectedPeer>> &E : peer_map) {
if (!E.value->connected) {
continue;
}
for (const Ref<WebRTCDataChannel> &F : E.value->channels) { for (const Ref<WebRTCDataChannel> &F : E.value->channels) {
size += F->get_available_packet_count(); size += F->get_available_packet_count();
} }