Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjustments to ping and resend rate to reduce packet spam

This commit is contained in:
MysterD 2023-11-08 11:53:32 -08:00
parent febed16c1d
commit a279154e6f
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pc/network/packets/packet_ping.c
View File

@ -49,7 +49,11 @@ void network_receive_pong(struct Packet* p) {
}
u32 ping = (now - timestamp) * 1000;
np->ping = np->ping * 0.5f + ping * 0.5f;
if (ping > np->ping) {
np->ping = ping;
} else {
np->ping = np->ping * 0.7f + ping * 0.3f;
}
if (np->ping > 1000) { np->ping = 1000; }
//LOG_INFO("rx pong from %u: %u", globalIndex, ping);
}

8
src/pc/network/packets/packet_reliable.c
View File

@ -137,9 +137,10 @@ static float adjust_max_elapsed(enum PacketType packetType, float maxElapsed) {
case PACKET_MOD_LIST_ENTRY:
case PACKET_MOD_LIST_FILE:
case PACKET_MOD_LIST_DONE:
return MIN(0.5f + maxElapsed * 2.0f, 5);
case PACKET_LUA_SYNC_TABLE:
return MIN(0.5f + maxElapsed * 2.0f, 4);
default:
return MIN(maxElapsed, 5);
return MIN(maxElapsed, 4);
}
}
@ -157,13 +158,12 @@ void network_update_reliable(void) {
f32 elapsed = (clock_elapsed() - node->lastSend);
f32 maxElapsed = get_max_elapsed_time(node->sendAttempts);
maxElapsed = adjust_max_elapsed(node->p.packetType, maxElapsed);
if (maxElapsed > 3) { maxElapsed = 3; }
// adjust resend time based on ping
struct NetworkPlayer* np = &gNetworkPlayers[node->p.localIndex];
f32 pingElapsed = np->ping / 1000.0f;
if (pingElapsed > 1.0f) { pingElapsed = 1.0f; }
pingElapsed *= 1.1f;
pingElapsed *= 1.25f;
if (maxElapsed < pingElapsed) { maxElapsed = pingElapsed; }
if (elapsed > maxElapsed) {