eukara
/
fteqw
forked from fte/fteqw
1
0
Fork 0
Code Pull Requests Activity

Prevent ftenq from overflowing its svc_serverdata quite so easily. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5896 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2021-06-21 13:44:34 +00:00
parent eb4af059cb
commit 19073fe2a5
1 changed files with 72 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
engine/server/sv_user.c
View File

@ -797,15 +797,25 @@ void SVNQ_New_f (void)
MSG_WriteString (&host_client->netchan.message, sv.mapname); MSG_WriteString (&host_client->netchan.message, sv.mapname);
//fixme: don't send too many models. if (host_client->fteprotocolextensions2)
for (i = 1; sv.strings.model_precache[i] ; i++) { //don't bother sending much. we'll spew late precaches later.
MSG_WriteString (&host_client->netchan.message, sv.strings.model_precache[i]); if (sv.strings.model_precache[1])
MSG_WriteByte (&host_client->netchan.message, 0); MSG_WriteString (&host_client->netchan.message, sv.strings.model_precache[1]);
MSG_WriteByte (&host_client->netchan.message, 0); //models. worldmodel only.
MSG_WriteByte (&host_client->netchan.message, 0); //sounds. none at all.
}
else
{
//fixme: don't send too many models.
for (i = 1; sv.strings.model_precache[i] ; i++)
MSG_WriteString (&host_client->netchan.message, sv.strings.model_precache[i]);
MSG_WriteByte (&host_client->netchan.message, 0);
//fixme: don't send too many sounds. //fixme: don't send too many sounds.
for (i = 1; sv.strings.sound_precache[i] ; i++) for (i = 1; sv.strings.sound_precache[i] ; i++)
MSG_WriteString (&host_client->netchan.message, sv.strings.sound_precache[i]); MSG_WriteString (&host_client->netchan.message, sv.strings.sound_precache[i]);
MSG_WriteByte (&host_client->netchan.message, 0); MSG_WriteByte (&host_client->netchan.message, 0);
}
// set view // set view
MSG_WriteByte (&host_client->netchan.message, svc_setview); MSG_WriteByte (&host_client->netchan.message, svc_setview);
@ -1219,9 +1229,7 @@ void SV_SendClientPrespawnInfo(client_t *client)
if (client->prespawn_stage == PRESPAWN_SOUNDLIST) if (client->prespawn_stage == PRESPAWN_SOUNDLIST)
{ {
if (!ISQWCLIENT(client)) if (ISQWCLIENT(client))
client->prespawn_stage++; //nq sends sound lists as part of the svc_serverdata
else
{ {
int maxclientsupportedsounds = 256; int maxclientsupportedsounds = 256;
#ifdef PEXT_SOUNDDBL #ifdef PEXT_SOUNDDBL
@ -1288,6 +1296,32 @@ void SV_SendClientPrespawnInfo(client_t *client)
} }
} }
else if (ISNQCLIENT(client) && client->fteprotocolextensions2)
{
if (client->prespawn_idx < 1)
client->prespawn_idx = 1;
while (client->netchan.message.cursize < maxsize)
{
if (client->prespawn_idx >= MAX_PRECACHE_SOUNDS || !sv.strings.sound_precache[client->prespawn_idx])
{
if (sv.strings.sound_precache[client->prespawn_idx] && !(client->plimitwarned & PLIMIT_SOUNDS))
{
client->plimitwarned |= PLIMIT_SOUNDS;
SV_ClientPrintf(client, PRINT_HIGH, "WARNING: Your client's network protocol only supports %i sounds. Please upgrade or enable extensions.\n", client->prespawn_idx);
}
client->prespawn_stage++;
client->prespawn_idx = 0;
break;
}
MSG_WriteByte (&client->netchan.message, svcdp_precache);
MSG_WriteShort(&client->netchan.message, 0x8000|client->prespawn_idx);
MSG_WriteString (&client->netchan.message, sv.strings.sound_precache[client->prespawn_idx]);
client->prespawn_idx++;
}
}
else
client->prespawn_stage++;
} }
#ifdef HAVE_LEGACY #ifdef HAVE_LEGACY
@ -1334,9 +1368,7 @@ void SV_SendClientPrespawnInfo(client_t *client)
if (client->prespawn_stage == PRESPAWN_MODELLIST) if (client->prespawn_stage == PRESPAWN_MODELLIST)
{ {
if (!ISQWCLIENT(client)) if (ISQWCLIENT(client))
client->prespawn_stage++;
else
{ {
started = false; started = false;
@ -1393,6 +1425,32 @@ void SV_SendClientPrespawnInfo(client_t *client)
MSG_WriteByte (&client->netchan.message, (client->prespawn_idx&0xff)?client->prespawn_idx&0xff:0xff); MSG_WriteByte (&client->netchan.message, (client->prespawn_idx&0xff)?client->prespawn_idx&0xff:0xff);
} }
} }
else if (ISNQCLIENT(client) && client->fteprotocolextensions2)
{
if (client->prespawn_idx < 1)
client->prespawn_idx = 1;
while (client->netchan.message.cursize < maxsize)
{
if (client->prespawn_idx >= client->maxmodels || !sv.strings.model_precache[client->prespawn_idx])
{
if (sv.strings.model_precache[client->prespawn_idx] && !(client->plimitwarned & PLIMIT_MODELS))
{
client->plimitwarned |= PLIMIT_MODELS;
SV_ClientPrintf(client, PRINT_HIGH, "WARNING: Your client's network protocol only supports %i models. Please upgrade or enable extensions.\n", client->prespawn_idx);
}
client->prespawn_stage++;
client->prespawn_idx = 0;
break;
}
MSG_WriteByte (&client->netchan.message, svcdp_precache);
MSG_WriteShort(&client->netchan.message, client->prespawn_idx);
MSG_WriteString (&client->netchan.message, sv.strings.model_precache[client->prespawn_idx]);
client->prespawn_idx++;
}
}
else
client->prespawn_stage++;
} }
if (client->prespawn_stage == PRESPAWN_MAPCHECK) if (client->prespawn_stage == PRESPAWN_MAPCHECK)