X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=libcurl.c;h=3baa91b466f6da44b993a826a2f0cc2078bb1501;hb=0304b22b60139ca4525c2fd396300292ba9cbb79;hp=1cdd18b5bee2be46ea71a73f39235ddb7eafc090;hpb=ed37e51373ca324a261acc0fbcaeb855320745a7;p=xonotic%2Fdarkplaces.git

diff --git a/libcurl.c b/libcurl.c
index 1cdd18b5..3baa91b4 100644
--- a/libcurl.c
+++ b/libcurl.c
@@ -1,6 +1,7 @@
 #include "quakedef.h"
 #include "fs.h"
 #include "libcurl.h"
+#include "thread.h"
 
 static cvar_t cl_curl_maxdownloads = {CVAR_SAVE, "cl_curl_maxdownloads","1", "maximum number of concurrent HTTP/FTP downloads"};
 static cvar_t cl_curl_maxspeed = {CVAR_SAVE, "cl_curl_maxspeed","300", "maximum download speed (KiB/s)"};
@@ -8,6 +9,8 @@ static cvar_t sv_curl_defaulturl = {CVAR_SAVE, "sv_curl_defaulturl","", "default
 static cvar_t sv_curl_serverpackages = {CVAR_SAVE, "sv_curl_serverpackages","", "list of required files for the clients, separated by spaces"};
 static cvar_t sv_curl_maxspeed = {CVAR_SAVE, "sv_curl_maxspeed","0", "maximum download speed for clients downloading from sv_curl_defaulturl (KiB/s)"};
 static cvar_t cl_curl_enabled = {CVAR_SAVE, "cl_curl_enabled","1", "whether client's download support is enabled"};
+static cvar_t cl_curl_useragent = {0, "cl_curl_useragent","1", "send the User-Agent string (note: turning this off may break stuff)"};
+static cvar_t cl_curl_useragent_append = {0, "cl_curl_useragent_append","", "a string to append to the User-Agent string (useful for name and version number of your mod)"};
 
 /*
 =================================================================
@@ -182,6 +185,8 @@ static dllfunction_t curlfuncs[] =
 static dllhandle_t curl_dll = NULL;
 // will be checked at many places to find out if qcurl calls are allowed
 
+void *curl_mutex = NULL;
+
 typedef struct downloadinfo_s
 {
 	char filename[MAX_OSPATH];
@@ -231,7 +236,7 @@ all downloads since last server connect ended with a successful status.
 Setting the command to NULL clears it.
 ====================
 */
-void Curl_CommandWhenDone(const char *cmd)
+static void Curl_CommandWhenDone(const char *cmd)
 {
 	if(!curl_dll)
 		return;
@@ -247,7 +252,7 @@ Do not use yet. Not complete.
 Problem: what counts as an error?
 */
 
-void Curl_CommandWhenError(const char *cmd)
+static void Curl_CommandWhenError(const char *cmd)
 {
 	if(!curl_dll)
 		return;
@@ -269,6 +274,7 @@ void Curl_Clear_forthismap(void)
 	downloadinfo *di;
 	if(noclear)
 		return;
+	if (curl_mutex) Thread_LockMutex(curl_mutex);
 	for(di = downloads; di; di = di->next)
 		di->forthismap = false;
 	Curl_CommandWhenError(NULL);
@@ -276,6 +282,7 @@ void Curl_Clear_forthismap(void)
 	numdownloads_fail = 0;
 	numdownloads_success = 0;
 	numdownloads_added = 0;
+	if (curl_mutex) Thread_UnlockMutex(curl_mutex);
 }
 
 /*
@@ -292,8 +299,10 @@ qboolean Curl_Have_forthismap(void)
 
 void Curl_Register_predownload(void)
 {
+	if (curl_mutex) Thread_LockMutex(curl_mutex);
 	Curl_CommandWhenDone("cl_begindownloads");
 	Curl_CommandWhenError("cl_begindownloads");
+	if (curl_mutex) Thread_UnlockMutex(curl_mutex);
 }
 
 /*
@@ -308,20 +317,22 @@ static void Curl_CheckCommandWhenDone(void)
 {
 	if(!curl_dll)
 		return;
-	if(numdownloads_added && (numdownloads_success == numdownloads_added) && *command_when_done)
+	if(numdownloads_added && ((numdownloads_success + numdownloads_fail) == numdownloads_added))
 	{
-		Con_DPrintf("cURL downloads occurred, executing %s\n", command_when_done);
-		Cbuf_AddText("\n");
-		Cbuf_AddText(command_when_done);
-		Cbuf_AddText("\n");
-		Curl_Clear_forthismap();
-	}
-	else if(numdownloads_added && numdownloads_fail && *command_when_error)
-	{
-		Con_DPrintf("cURL downloads FAILED, executing %s\n", command_when_error);
-		Cbuf_AddText("\n");
-		Cbuf_AddText(command_when_error);
-		Cbuf_AddText("\n");
+		if(numdownloads_fail == 0)
+		{
+			Con_DPrintf("cURL downloads occurred, executing %s\n", command_when_done);
+			Cbuf_AddText("\n");
+			Cbuf_AddText(command_when_done);
+			Cbuf_AddText("\n");
+		}
+		else
+		{
+			Con_DPrintf("cURL downloads FAILED, executing %s\n", command_when_error);
+			Cbuf_AddText("\n");
+			Cbuf_AddText(command_when_error);
+			Cbuf_AddText("\n");
+		}
 		Curl_Clear_forthismap();
 	}
 }
@@ -448,11 +459,6 @@ static void curl_default_callback(int status, size_t length_received, unsigned c
 	}
 }
 
-static void curl_quiet_callback(int status, size_t length_received, unsigned char *buffer, void *cbdata)
-{
-	curl_default_callback(status, length_received, buffer, cbdata);
-}
-
 /*
 ====================
 Curl_EndDownload
@@ -560,9 +566,8 @@ CleanURL
 Returns a "cleaned up" URL for display (to strip login data)
 ====================
 */
-static const char *CleanURL(const char *url)
+static const char *CleanURL(const char *url, char *urlbuf, size_t urlbuflength)
 {
-	static char urlbuf[1024];
 	const char *p, *q, *r;
 
 	// if URL is of form anything://foo-without-slash@rest, replace by anything://rest
@@ -575,7 +580,7 @@ static const char *CleanURL(const char *url)
 			r = strchr(p + 3, '/');
 			if(!r || q < r)
 			{
-				dpsnprintf(urlbuf, sizeof(urlbuf), "%.*s%s", (int)(p - url + 3), url, q + 1);
+				dpsnprintf(urlbuf, urlbuflength, "%.*s%s", (int)(p - url + 3), url, q + 1);
 				return urlbuf;
 			}
 		}
@@ -596,6 +601,8 @@ up to a maximum number of cl_curl_maxdownloads are running.
 static void CheckPendingDownloads(void)
 {
 	const char *h;
+	char urlbuf[1024];
+	char vabuf[1024];
 	if(!curl_dll)
 		return;
 	if(numdownloads < cl_curl_maxdownloads.integer)
@@ -607,7 +614,7 @@ static void CheckPendingDownloads(void)
 			{
 				if(!di->buffer)
 				{
-					Con_Printf("Downloading %s -> %s", CleanURL(di->url), di->filename);
+					Con_Printf("Downloading %s -> %s", CleanURL(di->url, urlbuf, sizeof(urlbuf)), di->filename);
 
 					di->stream = FS_OpenRealFile(di->filename, "ab", false);
 					if(!di->stream)
@@ -625,14 +632,34 @@ static void CheckPendingDownloads(void)
 				}
 				else
 				{
-					Con_DPrintf("Downloading %s -> memory\n", CleanURL(di->url));
+					Con_DPrintf("Downloading %s -> memory\n", CleanURL(di->url, urlbuf, sizeof(urlbuf)));
 					di->startpos = 0;
 				}
 
 				di->curle = qcurl_easy_init();
 				di->slist = NULL;
 				qcurl_easy_setopt(di->curle, CURLOPT_URL, di->url);
-				qcurl_easy_setopt(di->curle, CURLOPT_USERAGENT, engineversion);
+				if(cl_curl_useragent.integer)
+				{
+					const char *ua
+#ifdef HTTP_USER_AGENT
+						= HTTP_USER_AGENT;
+#else
+						= engineversion;
+#endif
+					if(!ua)
+						ua = "";
+					if(*cl_curl_useragent_append.string)
+						ua = va(vabuf, sizeof(vabuf), "%s%s%s",
+							ua,
+							(ua[0] && ua[strlen(ua)-1] != ' ')
+								? " "
+								: "",
+							cl_curl_useragent_append.string);
+					qcurl_easy_setopt(di->curle, CURLOPT_USERAGENT, ua);
+				}
+				else
+					qcurl_easy_setopt(di->curle, CURLOPT_USERAGENT, "");
 				qcurl_easy_setopt(di->curle, CURLOPT_REFERER, di->referer);
 				qcurl_easy_setopt(di->curle, CURLOPT_RESUME_FROM, (long) di->startpos);
 				qcurl_easy_setopt(di->curle, CURLOPT_FOLLOWLOCATION, 1);
@@ -652,7 +679,7 @@ static void CheckPendingDownloads(void)
 					qcurl_easy_setopt(di->curle, CURLOPT_POST, 1);
 					qcurl_easy_setopt(di->curle, CURLOPT_POSTFIELDS, di->postbuf);
 					qcurl_easy_setopt(di->curle, CURLOPT_POSTFIELDSIZE, di->postbufsize);
-					di->slist = qcurl_slist_append(di->slist, va("Content-Type: %s", di->post_content_type));
+					di->slist = qcurl_slist_append(di->slist, va(vabuf, sizeof(vabuf), "Content-Type: %s", di->post_content_type));
 				}
 
 				// parse extra headers into slist
@@ -701,6 +728,7 @@ void Curl_Init(void)
 	CURL_OpenLibrary();
 	if(!curl_dll)
 		return;
+	if (Thread_HasThreads()) curl_mutex = Thread_CreateMutex();
 	qcurl_global_init(CURL_GLOBAL_NOTHING);
 	curlm = qcurl_multi_init();
 }
@@ -719,6 +747,7 @@ void Curl_Shutdown(void)
 		return;
 	Curl_ClearRequirements();
 	Curl_CancelAll();
+	if (curl_mutex) Thread_DestroyMutex(curl_mutex);
 	CURL_CloseLibrary();
 	curl_dll = NULL;
 }
@@ -741,24 +770,6 @@ static downloadinfo *Curl_Find(const char *filename)
 	return NULL;
 }
 
-void Curl_Cancel_ToMemory(curl_callback_t callback, void *cbdata)
-{
-	downloadinfo *di;
-	if(!curl_dll)
-		return;
-	for(di = downloads; di; )
-	{
-		if(di->callback == callback && di->callback_data == cbdata)
-		{
-			di->callback = curl_quiet_callback; // do NOT call the callback
-			Curl_EndDownload(di, CURL_DOWNLOAD_ABORTED, CURLE_OK);
-			di = downloads;
-		}
-		else
-			di = di->next;
-	}
-}
-
 /*
 ====================
 Curl_Begin
@@ -828,7 +839,9 @@ static qboolean Curl_Begin(const char *URL, const char *extraheaders, double max
 		//   141.2.16.3 - - [17/Mar/2006:22:32:43 +0100] "GET /maps/tznex07.pk3 HTTP/1.1" 200 1077455 "dp://141.2.16.7:26000/" "Nexuiz Linux 22:07:43 Mar 17 2006"
 
 		if(!name)
-			name = CleanURL(URL);
+			name = CleanURL(URL, urlbuf, sizeof(urlbuf));
+
+		if (curl_mutex) Thread_LockMutex(curl_mutex);
 
 		if(!buf)
 		{
@@ -845,7 +858,7 @@ static qboolean Curl_Begin(const char *URL, const char *extraheaders, double max
 				downloadinfo *di = Curl_Find(fn);
 				if(di)
 				{
-					Con_Printf("Can't download %s, already getting it from %s!\n", fn, CleanURL(di->url));
+					Con_Printf("Can't download %s, already getting it from %s!\n", fn, CleanURL(di->url, urlbuf, sizeof(urlbuf)));
 
 					// however, if it was not for this map yet...
 					if(forthismap && !di->forthismap)
@@ -910,6 +923,7 @@ static qboolean Curl_Begin(const char *URL, const char *extraheaders, double max
 		if(strncmp(URL, "http://", 7) && strncmp(URL, "ftp://", 6) && strncmp(URL, "https://", 8))
 		{
 			Con_Printf("Curl_Begin(\"%s\"): nasty URL scheme rejected\n", URL);
+			if (curl_mutex) Thread_UnlockMutex(curl_mutex);
 			return false;
 		}
 
@@ -962,6 +976,7 @@ static qboolean Curl_Begin(const char *URL, const char *extraheaders, double max
 		}
 
 		downloads = di;
+		if (curl_mutex) Thread_UnlockMutex(curl_mutex);
 		return true;
 	}
 }
@@ -1000,13 +1015,21 @@ void Curl_Run(void)
 	if(!curl_dll)
 		return;
 
+	if (curl_mutex) Thread_LockMutex(curl_mutex);
+
 	Curl_CheckCommandWhenDone();
 
 	if(!downloads)
+	{
+		if (curl_mutex) Thread_UnlockMutex(curl_mutex);
 		return;
+	}
 
 	if(realtime < curltime) // throttle
+	{
+		if (curl_mutex) Thread_UnlockMutex(curl_mutex);
 		return;
+	}
 
 	{
 		int remaining;
@@ -1089,6 +1112,8 @@ void Curl_Run(void)
 	}
 	else
 		curltime = realtime;
+
+	if (curl_mutex) Thread_UnlockMutex(curl_mutex);
 }
 
 /*
@@ -1103,11 +1128,15 @@ void Curl_CancelAll(void)
 	if(!curl_dll)
 		return;
 
+	if (curl_mutex) Thread_LockMutex(curl_mutex);
+
 	while(downloads)
 	{
 		Curl_EndDownload(downloads, CURL_DOWNLOAD_ABORTED, CURLE_OK);
 		// INVARIANT: downloads will point to the next download after that!
 	}
+
+	if (curl_mutex) Thread_UnlockMutex(curl_mutex);
 }
 
 /*
@@ -1182,15 +1211,17 @@ prints the download list
 static void Curl_Info_f(void)
 {
 	downloadinfo *di;
+	char urlbuf[1024];
 	if(!curl_dll)
 		return;
 	if(Curl_Running())
 	{
+		if (curl_mutex) Thread_LockMutex(curl_mutex);
 		Con_Print("Currently running downloads:\n");
 		for(di = downloads; di; di = di->next)
 		{
 			double speed, percent;
-			Con_Printf("  %s -> %s ",  CleanURL(di->url), di->filename);
+			Con_Printf("  %s -> %s ",  CleanURL(di->url, urlbuf, sizeof(urlbuf)), di->filename);
 			percent = 100.0 * Curl_GetDownloadAmount(di);
 			speed = Curl_GetDownloadSpeed(di);
 			if(percent >= 0)
@@ -1198,6 +1229,7 @@ static void Curl_Info_f(void)
 			else
 				Con_Print("(queued)\n");
 		}
+		if (curl_mutex) Thread_UnlockMutex(curl_mutex);
 	}
 	else
 	{
@@ -1231,7 +1263,7 @@ curl --finish_autodownload
 	once the last download completes successfully, reconnect to the current server
 ====================
 */
-void Curl_Curl_f(void)
+static void Curl_Curl_f(void)
 {
 	double maxspeed = 0;
 	int i;
@@ -1385,6 +1417,8 @@ void Curl_Init_Commands(void)
 	Cvar_RegisterVariable (&sv_curl_defaulturl);
 	Cvar_RegisterVariable (&sv_curl_serverpackages);
 	Cvar_RegisterVariable (&sv_curl_maxspeed);
+	Cvar_RegisterVariable (&cl_curl_useragent);
+	Cvar_RegisterVariable (&cl_curl_useragent_append);
 	Cmd_AddCommand ("curl", Curl_Curl_f, "download data from an URL and add to search path");
 	//Cmd_AddCommand ("curlcat", Curl_CurlCat_f, "display data from an URL (debugging command)");
 }
@@ -1400,12 +1434,11 @@ information, or to NULL if no such display shall occur. The returned
 array must be freed later using Z_Free.
 ====================
 */
-Curl_downloadinfo_t *Curl_GetDownloadInfo(int *nDownloads, const char **additional_info)
+Curl_downloadinfo_t *Curl_GetDownloadInfo(int *nDownloads, const char **additional_info, char *addinfo, size_t addinfolength)
 {
 	int i;
 	downloadinfo *di;
 	Curl_downloadinfo_t *downinfo;
-	static char addinfo[128];
 
 	if(!curl_dll)
 	{
@@ -1415,6 +1448,8 @@ Curl_downloadinfo_t *Curl_GetDownloadInfo(int *nDownloads, const char **addition
 		return NULL;
 	}
 
+	if (curl_mutex) Thread_LockMutex(curl_mutex);
+
 	i = 0;
 	for(di = downloads; di; di = di->next)
 		++i;
@@ -1447,11 +1482,11 @@ Curl_downloadinfo_t *Curl_GetDownloadInfo(int *nDownloads, const char **addition
 		if(*command_when_done && !numdownloads_fail && numdownloads_added)
 		{
 			if(!strncmp(command_when_done, "connect ", 8))
-				dpsnprintf(addinfo, sizeof(addinfo), "(will join %s when done)", command_when_done + 8);
+				dpsnprintf(addinfo, addinfolength, "(will join %s when done)", command_when_done + 8);
 			else if(!strcmp(command_when_done, "cl_begindownloads"))
-				dpsnprintf(addinfo, sizeof(addinfo), "(will enter the game when done)");
+				dpsnprintf(addinfo, addinfolength, "(will enter the game when done)");
 			else
-				dpsnprintf(addinfo, sizeof(addinfo), "(will do '%s' when done)", command_when_done);
+				dpsnprintf(addinfo, addinfolength, "(will do '%s' when done)", command_when_done);
 			*additional_info = addinfo;
 		}
 		else
@@ -1459,6 +1494,7 @@ Curl_downloadinfo_t *Curl_GetDownloadInfo(int *nDownloads, const char **addition
 	}
 
 	*nDownloads = i;
+	if (curl_mutex) Thread_UnlockMutex(curl_mutex);
 	return downinfo;
 }
 
@@ -1489,7 +1525,7 @@ this file for obvious reasons.
 */
 static const char *Curl_FindPackURL(const char *filename)
 {
-	static char foundurl[1024];
+	static char foundurl[1024]; // invoked only by server
 	fs_offset_t filesize;
 	char *buf = (char *) FS_LoadFile("curl_urls.txt", tempmempool, true, &filesize);
 	if(buf && filesize)
@@ -1651,7 +1687,7 @@ void Curl_SendRequirements(void)
 		foundone = Curl_SendRequirement(req->filename, foundone, sendbuffer, sizeof(sendbuffer)) || foundone;
 
 	p = sv_curl_serverpackages.string;
-	while(COM_ParseToken_Simple(&p, false, false))
+	while(COM_ParseToken_Simple(&p, false, false, true))
 		foundone = Curl_SendRequirement(com_token, foundone, sendbuffer, sizeof(sendbuffer)) || foundone;
 
 	if(foundone)