X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=libcurl.c;h=48b9fdaa6e07ed1065590ebe47a39416082b3832;hb=43834947ad92401e07b3f39d1ab1ae42d07a1972;hp=38278606d0cd0f5fea86c27c30f8ebbd09665f85;hpb=cfee52a1ec9db338098789cae89ae5cf1f7a6fbf;p=xonotic%2Fdarkplaces.git

diff --git a/libcurl.c b/libcurl.c
index 38278606..48b9fdaa 100644
--- a/libcurl.c
+++ b/libcurl.c
@@ -3,12 +3,18 @@
 #include "libcurl.h"
 #include "thread.h"
 
+#include "image.h"
+#include "jpeg.h"
+#include "image_png.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)"};
 static cvar_t sv_curl_defaulturl = {CVAR_SAVE, "sv_curl_defaulturl","", "default autodownload source URL"};
 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)"};
 
 /*
 =================================================================
@@ -183,6 +189,11 @@ static dllfunction_t curlfuncs[] =
 static dllhandle_t curl_dll = NULL;
 // will be checked at many places to find out if qcurl calls are allowed
 
+#define LOADTYPE_NONE 0
+#define LOADTYPE_PAK 1
+#define LOADTYPE_CACHEPIC 2
+#define LOADTYPE_SKINFRAME 3
+
 void *curl_mutex = NULL;
 
 typedef struct downloadinfo_s
@@ -194,7 +205,7 @@ typedef struct downloadinfo_s
 	fs_offset_t startpos;
 	CURL *curle;
 	qboolean started;
-	qboolean ispak;
+	int loadtype;
 	unsigned long bytes_received; // for buffer
 	double bytes_received_curl; // for throttling
 	double bytes_sent_curl; // for throttling
@@ -457,6 +468,35 @@ 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);
+}
+
+static unsigned char *decode_image(downloadinfo *di, const char *content_type)
+{
+	unsigned char *pixels = NULL;
+	fs_offset_t filesize = 0;
+	unsigned char *data = FS_LoadFile(di->filename, tempmempool, true, &filesize);
+	if(data)
+	{
+		int mip = 0;
+		if(!strcmp(content_type, "image/jpeg"))
+			pixels = JPEG_LoadImage_BGRA(data, filesize, &mip);
+		else if(!strcmp(content_type, "image/png"))
+			pixels = PNG_LoadImage_BGRA(data, filesize, &mip);
+		else if(filesize >= 7 && !strncmp((char *) data, "\xFF\xD8", 7))
+			pixels = JPEG_LoadImage_BGRA(data, filesize, &mip);
+		else if(filesize >= 7 && !strncmp((char *) data, "\x89PNG\x0D\x0A\x1A\x0A", 7))
+			pixels = PNG_LoadImage_BGRA(data, filesize, &mip);
+		else
+			Con_Printf("Did not detect content type: %s\n", content_type);
+		Mem_Free(data);
+	}
+	// do we call Image_MakeLinearColorsFromsRGB or not?
+	return pixels;
+}
+
 /*
 ====================
 Curl_EndDownload
@@ -466,9 +506,10 @@ CURL_DOWNLOAD_FAILED or CURL_DOWNLOAD_ABORTED) and in the second case the error
 code from libcurl, or 0, if another error has occurred.
 ====================
 */
-static qboolean Curl_Begin(const char *URL, const char *extraheaders, double maxspeed, const char *name, qboolean ispak, qboolean forthismap, const char *post_content_type, const unsigned char *postbuf, size_t postbufsize, unsigned char *buf, size_t bufsize, curl_callback_t callback, void *cbdata);
-static void Curl_EndDownload(downloadinfo *di, CurlStatus status, CURLcode error)
+static qboolean Curl_Begin(const char *URL, const char *extraheaders, double maxspeed, const char *name, int loadtype, qboolean forthismap, const char *post_content_type, const unsigned char *postbuf, size_t postbufsize, unsigned char *buf, size_t bufsize, curl_callback_t callback, void *cbdata);
+static void Curl_EndDownload(downloadinfo *di, CurlStatus status, CURLcode error, const char *content_type_)
 {
+	char content_type[64];
 	qboolean ok = false;
 	if(!curl_dll)
 		return;
@@ -500,6 +541,10 @@ static void Curl_EndDownload(downloadinfo *di, CurlStatus status, CURLcode error
 				di->callback(CURLCBSTATUS_UNKNOWN, di->bytes_received, di->buffer, di->callback_data);
 			break;
 	}
+	if(content_type_)
+		strlcpy(content_type, content_type_, sizeof(content_type));
+	else
+		*content_type = 0;
 
 	if(di->curle)
 	{
@@ -518,25 +563,58 @@ static void Curl_EndDownload(downloadinfo *di, CurlStatus status, CURLcode error
 	if(di->stream)
 		FS_Close(di->stream);
 
-	if(ok && di->ispak)
+#define CLEAR_AND_RETRY() \
+	do \
+	{ \
+		di->stream = FS_OpenRealFile(di->filename, "wb", false); \
+		FS_Close(di->stream); \
+		if(di->startpos && !di->callback) \
+		{ \
+			Curl_Begin(di->url, di->extraheaders, di->maxspeed, di->filename, di->loadtype, di->forthismap, di->post_content_type, di->postbuf, di->postbufsize, NULL, 0, NULL, NULL); \
+			di->forthismap = false; \
+		} \
+	} \
+	while(0)
+
+	if(ok && di->loadtype == LOADTYPE_PAK)
 	{
 		ok = FS_AddPack(di->filename, NULL, true);
 		if(!ok)
-		{
-			// pack loading failed?
-			// this is critical
-			// better clear the file again...
-			di->stream = FS_OpenRealFile(di->filename, "wb", false);
-			FS_Close(di->stream);
+			CLEAR_AND_RETRY();
+	}
+	else if(ok && di->loadtype == LOADTYPE_CACHEPIC)
+	{
+		const char *p;
+		unsigned char *pixels = NULL;
 
-			if(di->startpos && !di->callback)
-			{
-				// this was a resume?
-				// then try to redownload it without reporting the error
-				Curl_Begin(di->url, di->extraheaders, di->maxspeed, di->filename, di->ispak, di->forthismap, di->post_content_type, di->postbuf, di->postbufsize, NULL, 0, NULL, NULL);
-				di->forthismap = false; // don't count the error
-			}
-		}
+		p = di->filename;
+#ifdef WE_ARE_EVIL
+		if(!strncmp(p, "dlcache/", 8))
+			p += 8;
+#endif
+
+		pixels = decode_image(di, content_type);
+		if(pixels)
+			Draw_NewPic(p, image_width, image_height, true, pixels);
+		else
+			CLEAR_AND_RETRY();
+	}
+	else if(ok && di->loadtype == LOADTYPE_SKINFRAME)
+	{
+		const char *p;
+		unsigned char *pixels = NULL;
+
+		p = di->filename;
+#ifdef WE_ARE_EVIL
+		if(!strncmp(p, "dlcache/", 8))
+			p += 8;
+#endif
+
+		pixels = decode_image(di, content_type);
+		if(pixels)
+			R_SkinFrame_LoadInternalBGRA(p, TEXF_FORCE_RELOAD | TEXF_MIPMAP | TEXF_ALPHA, pixels, image_width, image_height, false); // TODO what sRGB argument to put here?
+		else
+			CLEAR_AND_RETRY();
 	}
 
 	if(di->prev)
@@ -618,7 +696,7 @@ static void CheckPendingDownloads(void)
 					if(!di->stream)
 					{
 						Con_Printf("\nFAILED: Could not open output file %s\n", di->filename);
-						Curl_EndDownload(di, CURL_DOWNLOAD_FAILED, CURLE_OK);
+						Curl_EndDownload(di, CURL_DOWNLOAD_FAILED, CURLE_OK, NULL);
 						return;
 					}
 					FS_Seek(di->stream, 0, SEEK_END);
@@ -637,7 +715,27 @@ static void CheckPendingDownloads(void)
 				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);
@@ -748,6 +846,24 @@ 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, NULL);
+			di = downloads;
+		}
+		else
+			di = di->next;
+	}
+}
+
 /*
 ====================
 Curl_Begin
@@ -756,9 +872,13 @@ Starts a download of a given URL to the file name portion of this URL (or name
 if given) in the "dlcache/" folder.
 ====================
 */
-static qboolean Curl_Begin(const char *URL, const char *extraheaders, double maxspeed, const char *name, qboolean ispak, qboolean forthismap, const char *post_content_type, const unsigned char *postbuf, size_t postbufsize, unsigned char *buf, size_t bufsize, curl_callback_t callback, void *cbdata)
+static qboolean Curl_Begin(const char *URL, const char *extraheaders, double maxspeed, const char *name, int loadtype, qboolean forthismap, const char *post_content_type, const unsigned char *postbuf, size_t postbufsize, unsigned char *buf, size_t bufsize, curl_callback_t callback, void *cbdata)
 {
-	if(!curl_dll)
+	if(buf)
+		if(loadtype != LOADTYPE_NONE)
+			Host_Error("Curl_Begin: loadtype and buffer are both set");
+
+	if(!curl_dll || !cl_curl_enabled.integer)
 	{
 		return false;
 	}
@@ -816,18 +936,28 @@ 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, urlbuf, sizeof(urlbuf));
-
 		if (curl_mutex) Thread_LockMutex(curl_mutex);
 
-		if(!buf)
+		if(buf)
+		{
+			if(!name)
+				name = CleanURL(URL, urlbuf, sizeof(urlbuf));
+		}
+		else
 		{
-			p = strrchr(name, '/');
-			p = p ? (p+1) : name;
-			q = strchr(p, '?');
-			length = q ? (size_t)(q - p) : strlen(p);
-			dpsnprintf(fn, sizeof(fn), "dlcache/%.*s", (int)length, p);
+			if(!name)
+			{
+				name = CleanURL(URL, urlbuf, sizeof(urlbuf));
+				p = strrchr(name, '/');
+				p = p ? (p+1) : name;
+				q = strchr(p, '?');
+				length = q ? (size_t)(q - p) : strlen(p);
+				dpsnprintf(fn, sizeof(fn), "dlcache/%.*s", (int)length, p);
+			}
+			else
+			{
+				dpsnprintf(fn, sizeof(fn), "dlcache/%s", name);
+			}
 
 			name = fn; // make it point back
 
@@ -851,48 +981,58 @@ static qboolean Curl_Begin(const char *URL, const char *extraheaders, double max
 				}
 			}
 
-			if(ispak && FS_FileExists(fn))
+			if(FS_FileExists(fn))
 			{
-				qboolean already_loaded;
-				if(FS_AddPack(fn, &already_loaded, true))
+				if(loadtype == LOADTYPE_PAK)
 				{
-					Con_DPrintf("%s already exists, not downloading!\n", fn);
-					if(already_loaded)
-						Con_DPrintf("(pak was already loaded)\n");
-					else
+					qboolean already_loaded;
+					if(FS_AddPack(fn, &already_loaded, true))
 					{
-						if(forthismap)
+						Con_DPrintf("%s already exists, not downloading!\n", fn);
+						if(already_loaded)
+							Con_DPrintf("(pak was already loaded)\n");
+						else
 						{
-							++numdownloads_added;
-							++numdownloads_success;
+							if(forthismap)
+							{
+								++numdownloads_added;
+								++numdownloads_success;
+							}
 						}
-					}
 
-					return false;
-				}
-				else
-				{
-					qfile_t *f = FS_OpenRealFile(fn, "rb", false);
-					if(f)
+						return false;
+					}
+					else
 					{
-						char buf[4] = {0};
-						FS_Read(f, buf, sizeof(buf)); // no "-1", I will use memcmp
-
-						if(memcmp(buf, "PK\x03\x04", 4) && memcmp(buf, "PACK", 4))
+						qfile_t *f = FS_OpenRealFile(fn, "rb", false);
+						if(f)
 						{
-							Con_DPrintf("Detected non-PAK %s, clearing and NOT resuming.\n", fn);
-							FS_Close(f);
-							f = FS_OpenRealFile(fn, "wb", false);
-							if(f)
+							char buf[4] = {0};
+							FS_Read(f, buf, sizeof(buf)); // no "-1", I will use memcmp
+
+							if(memcmp(buf, "PK\x03\x04", 4) && memcmp(buf, "PACK", 4))
+							{
+								Con_DPrintf("Detected non-PAK %s, clearing and NOT resuming.\n", fn);
 								FS_Close(f);
-						}
-						else
-						{
-							// OK
-							FS_Close(f);
+								f = FS_OpenRealFile(fn, "wb", false);
+								if(f)
+									FS_Close(f);
+							}
+							else
+							{
+								// OK
+								FS_Close(f);
+							}
 						}
 					}
 				}
+				else
+				{
+					// never resume these
+					qfile_t *f = FS_OpenRealFile(fn, "wb", false);
+					if(f)
+						FS_Close(f);
+				}
 			}
 		}
 
@@ -916,7 +1056,7 @@ static qboolean Curl_Begin(const char *URL, const char *extraheaders, double max
 		di->startpos = 0;
 		di->curle = NULL;
 		di->started = false;
-		di->ispak = (ispak && !buf);
+		di->loadtype = loadtype;
 		di->maxspeed = maxspeed;
 		di->bytes_received = 0;
 		di->bytes_received_curl = 0;
@@ -959,9 +1099,9 @@ static qboolean Curl_Begin(const char *URL, const char *extraheaders, double max
 	}
 }
 
-qboolean Curl_Begin_ToFile(const char *URL, double maxspeed, const char *name, qboolean ispak, qboolean forthismap)
+qboolean Curl_Begin_ToFile(const char *URL, double maxspeed, const char *name, int loadtype, qboolean forthismap)
 {
-	return Curl_Begin(URL, NULL, maxspeed, name, ispak, forthismap, NULL, NULL, 0, NULL, 0, NULL, NULL);
+	return Curl_Begin(URL, NULL, maxspeed, name, loadtype, forthismap, NULL, NULL, 0, NULL, 0, NULL, NULL);
 }
 qboolean Curl_Begin_ToMemory(const char *URL, double maxspeed, unsigned char *buf, size_t bufsize, curl_callback_t callback, void *cbdata)
 {
@@ -1040,6 +1180,7 @@ void Curl_Run(void)
 				break;
 			if(msg->msg == CURLMSG_DONE)
 			{
+				const char *ct = NULL;
 				CurlStatus failed = CURL_DOWNLOAD_SUCCESS;
 				CURLcode result;
 				qcurl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &di);
@@ -1060,9 +1201,10 @@ void Curl_Run(void)
 							result = (CURLcode) code;
 							break;
 					}
+					qcurl_easy_getinfo(msg->easy_handle, CURLINFO_CONTENT_TYPE, &ct);
 				}
 
-				Curl_EndDownload(di, failed, result);
+				Curl_EndDownload(di, failed, result, ct);
 			}
 		}
 	}
@@ -1084,7 +1226,7 @@ void Curl_Run(void)
 	if(maxspeed > 0)
 	{
 		double bytes = bytes_sent + bytes_received; // maybe smoothen a bit?
-		curltime = realtime + bytes / (cl_curl_maxspeed.value * 1024.0);
+		curltime = realtime + bytes / (maxspeed * 1024.0);
 		bytes_sent = 0;
 		bytes_received = 0;
 	}
@@ -1110,7 +1252,7 @@ void Curl_CancelAll(void)
 
 	while(downloads)
 	{
-		Curl_EndDownload(downloads, CURL_DOWNLOAD_ABORTED, CURLE_OK);
+		Curl_EndDownload(downloads, CURL_DOWNLOAD_ABORTED, CURLE_OK, NULL);
 		// INVARIANT: downloads will point to the next download after that!
 	}
 
@@ -1246,7 +1388,7 @@ static void Curl_Curl_f(void)
 	double maxspeed = 0;
 	int i;
 	int end;
-	qboolean pak = false;
+	int loadtype = LOADTYPE_NONE;
 	qboolean forthismap = false;
 	const char *url;
 	const char *name = 0;
@@ -1288,7 +1430,7 @@ static void Curl_Curl_f(void)
 			{
 				downloadinfo *di = Curl_Find(url);
 				if(di)
-					Curl_EndDownload(di, CURL_DOWNLOAD_ABORTED, CURLE_OK);
+					Curl_EndDownload(di, CURL_DOWNLOAD_ABORTED, CURLE_OK, NULL);
 				else
 					Con_Print("download not found\n");
 			}
@@ -1296,7 +1438,15 @@ static void Curl_Curl_f(void)
 		}
 		else if(!strcmp(a, "--pak"))
 		{
-			pak = true;
+			loadtype = LOADTYPE_PAK;
+		}
+		else if(!strcmp(a, "--cachepic"))
+		{
+			loadtype = LOADTYPE_CACHEPIC;
+		}
+		else if(!strcmp(a, "--skinframe"))
+		{
+			loadtype = LOADTYPE_SKINFRAME;
 		}
 		else if(!strcmp(a, "--for")) // must be last option
 		{
@@ -1361,7 +1511,7 @@ static void Curl_Curl_f(void)
 	}
 
 needthefile:
-	Curl_Begin_ToFile(url, maxspeed, name, pak, forthismap);
+	Curl_Begin_ToFile(url, maxspeed, name, loadtype, forthismap);
 }
 
 /*
@@ -1395,6 +1545,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)");
 }
@@ -1663,7 +1815,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)