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

Merge pull request #53130 from Faless/net/3.x_enet_opts

Browse Source
This commit is contained in:
Rémi Verschelde 2021-12-16 10:36:01 +01:00 committed by GitHub
commit 14d439d868
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
modules/enet/networked_multiplayer_enet.cpp
View File

@ -217,22 +217,25 @@ void NetworkedMultiplayerENet::poll() {
_pop_current_packet(); _pop_current_packet();
if (!host || !active) { // Might be disconnected
return;
}
ENetEvent event; ENetEvent event;
/* Keep servicing until there are no available events left in queue. */ int ret = enet_host_service(host, &event, 0);
while (true) {
if (!host || !active) { // Might have been disconnected while emitting a notification if (ret < 0) {
ERR_FAIL_MSG("Enet host service error");
} else if (ret == 0) {
return; // No events
}
/* Keep servicing until there are no available events left in the queue. */
do {
if (!host || !active) { // Check again after every event
return; return;
} }
int ret = enet_host_service(host, &event, 0);
if (ret < 0) {
// Error, do something?
break;
} else if (ret == 0) {
break;
}
switch (event.type) { switch (event.type) {
case ENET_EVENT_TYPE_CONNECT: { case ENET_EVENT_TYPE_CONNECT: {
// Store any relevant client information here. // Store any relevant client information here.
@ -436,7 +439,7 @@ void NetworkedMultiplayerENet::poll() {
// Do nothing // Do nothing
} break; } break;
} }
} } while (enet_host_check_events(host, &event) > 0);
} }
bool NetworkedMultiplayerENet::is_server() const { bool NetworkedMultiplayerENet::is_server() const {
@ -546,9 +549,10 @@ Error NetworkedMultiplayerENet::put_packet(const uint8_t *p_buffer, int p_buffer
packet_flags = ENET_PACKET_FLAG_UNSEQUENCED; packet_flags = ENET_PACKET_FLAG_UNSEQUENCED;
} }
channel = SYSCH_UNRELIABLE; channel = SYSCH_UNRELIABLE;
packet_flags |= ENET_PACKET_FLAG_UNRELIABLE_FRAGMENT;
} break; } break;
case TRANSFER_MODE_UNRELIABLE_ORDERED: { case TRANSFER_MODE_UNRELIABLE_ORDERED: {
packet_flags = 0; packet_flags = ENET_PACKET_FLAG_UNRELIABLE_FRAGMENT;
channel = SYSCH_UNRELIABLE; channel = SYSCH_UNRELIABLE;
} break; } break;
case TRANSFER_MODE_RELIABLE: { case TRANSFER_MODE_RELIABLE: {
@ -561,6 +565,12 @@ Error NetworkedMultiplayerENet::put_packet(const uint8_t *p_buffer, int p_buffer
channel = transfer_channel; channel = transfer_channel;
} }
#ifdef DEBUG_ENABLED
if ((packet_flags & ENET_PACKET_FLAG_UNRELIABLE_FRAGMENT) && p_buffer_size + 8 > ENET_HOST_DEFAULT_MTU) {
WARN_PRINT_ONCE(vformat("Sending %d bytes unrealiably which is above the MTU (%d), this will result in higher packet loss", p_buffer_size + 8, host->mtu));
}
#endif
Map<int, ENetPeer *>::Element *E = nullptr; Map<int, ENetPeer *>::Element *E = nullptr;
if (target_peer != 0) { if (target_peer != 0) {