diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 5fb87abaf..b903ef0b3 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -485,6 +485,8 @@ consvar_t cv_netjitter = { "netjitter", "0", 0, netdelay_cons_t, NULL, 0, NULL, consvar_t cv_netsmoothing = { "netsmoothing", "0", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL }; +consvar_t cv_netspikes = { "netspikes", "0", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL }; + static CV_PossibleValue_t debugsimulaterewind_cons_t[] = { {0, "MIN"}, {BACKUPTICS - 1, "MAX"}, {0, NULL} }; consvar_t cv_debugsimulaterewind = { "debugsimulaterewind", "0", 0, debugsimulaterewind_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL }; @@ -647,6 +649,7 @@ void D_RegisterServerCommands(void) CV_RegisterVar(&cv_netdelay); CV_RegisterVar(&cv_netjitter); CV_RegisterVar(&cv_netsmoothing); + CV_RegisterVar(&cv_netspikes); CV_RegisterVar(&cv_debugsimulaterewind); // for master server connection diff --git a/src/d_netcmd.h b/src/d_netcmd.h index edac15d43..044d23582 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -152,6 +152,7 @@ extern consvar_t cv_simulatetics; extern consvar_t cv_netdelay; extern consvar_t cv_netjitter; extern consvar_t cv_netsmoothing; +extern consvar_t cv_netspikes; extern consvar_t cv_debugsimulaterewind; extern consvar_t cv_skipmapcheck; diff --git a/src/i_tcp.c b/src/i_tcp.c index c0f02ae87..3c3b03524 100644 --- a/src/i_tcp.c +++ b/src/i_tcp.c @@ -727,6 +727,8 @@ typedef struct { #define NUMDELAYPACKETS 200 DelayBuffer delayPackets[NUMDELAYPACKETS]; +tic_t nextSpikeTime = 0; +tic_t nextSpikeDuration = 0; void SOCK_FlushDelayBuffers(boolean flushImmediate) { @@ -747,6 +749,7 @@ static inline ssize_t SOCK_SendToAddr(SOCKET_TYPE socket, mysockaddr_t *sockaddr socklen_t d6 = (socklen_t)sizeof(struct sockaddr_in6); #endif socklen_t d, da = (socklen_t)sizeof(mysockaddr_t); + tic_t time = I_GetTime(); switch (sockaddr->any.sa_family) { @@ -757,17 +760,24 @@ static inline ssize_t SOCK_SendToAddr(SOCKET_TYPE socket, mysockaddr_t *sockaddr default: d = da; break; } - if (cv_netdelay.value > 0 || cv_netjitter.value > 0) { + if (cv_netspikes.value && time >= nextSpikeTime + nextSpikeDuration) + { + nextSpikeTime = time + (rand() % 35) + 1 * TICRATE; + nextSpikeDuration = (rand() % 10) + 1; + } + + if (cv_netdelay.value > 0 || cv_netjitter.value > 0 || (cv_netspikes.value && time >= nextSpikeTime)) { // add a nasty packet delay for testing! boolean writtenPacket = false; - int time = I_GetTime(); + int addSpike = (cv_netspikes.value && time >= nextSpikeTime) ? nextSpikeDuration : 0; + for (int i = 0; i < NUMDELAYPACKETS; i++) { if (!delayPackets[i].inUse) { delayPackets[i].data = malloc(doomcom->datalength); delayPackets[i].dataLength = doomcom->datalength; delayPackets[i].socket = socket; delayPackets[i].sockaddr = *sockaddr; - delayPackets[i].time = time + (rand() % (cv_netjitter.value + 1)); + delayPackets[i].time = time + (rand() % (cv_netjitter.value + 1)) + addSpike; delayPackets[i].sockaddr_size = d; delayPackets[i].inUse = true; memcpy(delayPackets[i].data, doomcom->data, doomcom->datalength);