stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-26 12:21:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Legacy downloader adjustments

Browse source 
- Fixed off by one in Got_RequestFilePak that could cause correct, maximised-space-usage packets to be rejected
- More verbose printing for aborting send files
- More verbose printing for client request files (behind a define for troubleshooting)
This commit is contained in:
toaster 2022-11-01 21:30:10 +00:00
parent f30f1bf163
commit 234bdc90bf
1 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/d_netfil.c
View file

@ -358,6 +358,10 @@ tryagain:
skippedafile = -1; skippedafile = -1;
#endif #endif
#ifdef VERBOSEREQUESTFILE
CONS_Printf("Preparing packet\n");
#endif
netbuffer->packettype = PT_REQUESTFILE; netbuffer->packettype = PT_REQUESTFILE;
p = (char *)netbuffer->u.textcmd; p = (char *)netbuffer->u.textcmd;
@ -371,7 +375,7 @@ tryagain:
// Figure out if we'd overrun our buffer. // Figure out if we'd overrun our buffer.
checklen = strlen(fileneeded[i].filename)+2; // plus the fileid (and terminator, in case this is last) checklen = strlen(fileneeded[i].filename)+2; // plus the fileid (and terminator, in case this is last)
if ((UINT8 *)(p + checklen) > netbuffer->u.textcmd + MAXTEXTCMD-1) if ((UINT8 *)(p + checklen) >= netbuffer->u.textcmd + MAXTEXTCMD)
{ {
skippedafile = i; skippedafile = i;
// we might have a shorter file that can fit in the remaining space, and file ID permits out-of-order data // we might have a shorter file that can fit in the remaining space, and file ID permits out-of-order data
@ -382,6 +386,10 @@ tryagain:
WRITEUINT8(p, i); // fileid WRITEUINT8(p, i); // fileid
WRITESTRINGN(p, fileneeded[i].filename, MAX_WADPATH); WRITESTRINGN(p, fileneeded[i].filename, MAX_WADPATH);
#ifdef VERBOSEREQUESTFILE
CONS_Printf(" file \"%s\" (id %d)\n", i, fileneeded[i].filename);
#endif
// put it in download dir // put it in download dir
strcatbf(fileneeded[i].filename, downloaddir, "/"); strcatbf(fileneeded[i].filename, downloaddir, "/");
fileneeded[i].status = FS_REQUESTED; fileneeded[i].status = FS_REQUESTED;
@ -394,14 +402,12 @@ tryagain:
// If we're not trying extralong legacy download requests, gotta bail. // If we're not trying extralong legacy download requests, gotta bail.
if (skippedafile != -1) if (skippedafile != -1)
{ {
#ifndef MORELEGACYDOWNLOADER
CONS_Printf("Direct download - missing files are as follows:\n"); CONS_Printf("Direct download - missing files are as follows:\n");
for (i = 0; i < fileneedednum; i++) for (i = 0; i < fileneedednum; i++)
{ {
if ((fileneeded[i].status == FS_NOTFOUND || fileneeded[i].status == FS_MD5SUMBAD || fileneeded[i].status == FS_FALLBACK || fileneeded[i].status == FS_REQUESTED)) // FS_REQUESTED added if ((fileneeded[i].status == FS_NOTFOUND || fileneeded[i].status == FS_MD5SUMBAD || fileneeded[i].status == FS_FALLBACK || fileneeded[i].status == FS_REQUESTED)) // FS_REQUESTED added
CONS_Printf(" %s\n", fileneeded[i].filename); CONS_Printf(" %s\n", fileneeded[i].filename);
} }
#endif
return false; return false;
} }
#endif #endif
@ -429,6 +435,10 @@ tryagain:
} }
#endif #endif
#ifdef VERBOSEREQUESTFILE
CONS_Printf("Returning true\n");
#endif
return true; return true;
} }
@ -439,14 +449,16 @@ boolean Got_RequestFilePak(INT32 node)
char wad[MAX_WADPATH+1]; char wad[MAX_WADPATH+1];
UINT8 *p = netbuffer->u.textcmd; UINT8 *p = netbuffer->u.textcmd;
UINT8 id; UINT8 id;
while (p < netbuffer->u.textcmd + MAXTEXTCMD-1) // Don't allow hacked client to overflow while (p < netbuffer->u.textcmd + MAXTEXTCMD) // Don't allow hacked client to overflow
{ {
id = READUINT8(p); id = READUINT8(p);
if (id == 0xFF) if (id == 0xFF)
break; break;
READSTRINGN(p, wad, MAX_WADPATH); READSTRINGN(p, wad, MAX_WADPATH);
if (p >= netbuffer->u.textcmd + MAXTEXTCMD-1 || !SV_SendFile(node, wad, id)) if (p >= netbuffer->u.textcmd + MAXTEXTCMD || !SV_SendFile(node, wad, id))
{ {
if (cv_noticedownload.value)
CONS_Printf("Bad PT_REQUESTFILE from node %d!\n", node);
SV_AbortSendFiles(node); SV_AbortSendFiles(node);
return false; // don't read any more return false; // don't read any more
} }
@ -621,7 +633,7 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid)
char wadfilename[MAX_WADPATH]; char wadfilename[MAX_WADPATH];
if (cv_noticedownload.value) if (cv_noticedownload.value)
CONS_Printf("Sending file \"%s\" to node %d (%s)\n", filename, node, I_GetNodeAddress(node)); CONS_Printf("Sending file \"%s\" (id %d) to node %d (%s)\n", filename, fileid, node, I_GetNodeAddress(node));
// Find the last file in the list and set a pointer to its "next" field // Find the last file in the list and set a pointer to its "next" field
q = &transfer[node].txlist; q = &transfer[node].txlist;
@ -747,7 +759,7 @@ static void SV_EndFileSend(INT32 node)
{ {
case SF_FILE: // It's a file, close it and free its filename case SF_FILE: // It's a file, close it and free its filename
if (cv_noticedownload.value) if (cv_noticedownload.value)
CONS_Printf("Ending file transfer for node %d\n", node); CONS_Printf("Ending file transfer (id %d) for node %d\n", p->fileid, node);
if (transfer[node].currentfile) if (transfer[node].currentfile)
fclose(transfer[node].currentfile); fclose(transfer[node].currentfile);
free(p->id.filename); free(p->id.filename);
@ -1019,6 +1031,8 @@ boolean SV_SendingFile(INT32 node)
*/ */
void SV_AbortSendFiles(INT32 node) void SV_AbortSendFiles(INT32 node)
{ {
if (cv_noticedownload.value)
CONS_Printf("Aborting send files for node %d...\n", node);
while (transfer[node].txlist) while (transfer[node].txlist)
SV_EndFileSend(node); SV_EndFileSend(node);
} }