From 5596b146fec9b2287ea3ce2e6122b975210932ef Mon Sep 17 00:00:00 2001 From: Spoike Date: Sat, 6 Jan 2007 09:40:57 +0000 Subject: [PATCH] Fixed a bug in the html demo listing. Tolerate telnet users spamming the server. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2457 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- fteqtv/forward.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/fteqtv/forward.c b/fteqtv/forward.c index 5961525da..b6009ac73 100644 --- a/fteqtv/forward.c +++ b/fteqtv/forward.c @@ -786,13 +786,16 @@ void SV_GenerateQTVDemoListing(cluster_t *cluster, oproxy_t *dest) WIN32_FIND_DATA ffd; HANDLE h; h = FindFirstFile("*.mvd", &ffd); - do + if (h != INVALID_HANDLE_VALUE) { - numdemos++; - snprintf(link, sizeof(link), "%s
", ffd.cFileName, ffd.cFileName); - Net_ProxySend(cluster, dest, link, strlen(link)); - } while(FindNextFile(h, &ffd)); - FindClose(h); + do + { + numdemos++; + snprintf(link, sizeof(link), "%s
", ffd.cFileName, ffd.cFileName); + Net_ProxySend(cluster, dest, link, strlen(link)); + } while(FindNextFile(h, &ffd)); + FindClose(h); + } } #else { @@ -891,7 +894,7 @@ qboolean SV_ReadPendingProxy(cluster_t *cluster, oproxy_t *pend) if (pend->inbuffersize >= 4) { - if (strncmp(pend->inbuffer, "QTV\n", 4) && strncmp(pend->inbuffer, "GET ", 4) && strncmp(pend->inbuffer, "POST ", 5)) + if (strncmp(pend->inbuffer, "QTV\r", 4) && strncmp(pend->inbuffer, "QTV\n", 4) && strncmp(pend->inbuffer, "GET ", 4) && strncmp(pend->inbuffer, "POST ", 5)) { //I have no idea what the smeg you are. pend->drop = true; return false; @@ -1026,7 +1029,7 @@ qboolean SV_ReadPendingProxy(cluster_t *cluster, oproxy_t *pend) s = e; while(*e) { - if (*e == '\n') + if (*e == '\n' || *e == '\r') { *e = '\0'; colon = strchr(s, ':');