X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=libcurl.c;h=deba3b357229a31407dcad409b2a0f44b655f1dd;hb=c9224df6b5391897c23a5f1ca33714b9390e8c87;hp=f97946fe1bd2b365c1fe399d429837574eab03dc;hpb=ad0206e3d383e1f61887081b9dc80ba7a5a6cdb0;p=xonotic%2Fdarkplaces.git

diff --git a/libcurl.c b/libcurl.c
index f97946fe..deba3b35 100644
--- a/libcurl.c
+++ b/libcurl.c
@@ -53,8 +53,13 @@ typedef enum
 	CINIT(PRIVATE, OBJECTPOINT, 103),
 	CINIT(LOW_SPEED_LIMIT, LONG , 19),
 	CINIT(LOW_SPEED_TIME, LONG, 20),
+	CINIT(PROTOCOLS, LONG, 181),
+	CINIT(REDIR_PROTOCOLS, LONG, 182),
 }
 CURLoption;
+#define CURLPROTO_HTTP   (1<<0)
+#define CURLPROTO_HTTPS  (1<<1)
+#define CURLPROTO_FTP    (1<<2)
 typedef enum
 {
 	CURLINFO_TEXT = 0,
@@ -128,15 +133,15 @@ typedef struct
 CURLMsg;
 
 static void (*qcurl_global_init) (long flags);
-static void (*qcurl_global_cleanup) ();
+static void (*qcurl_global_cleanup) (void);
 
-static CURL * (*qcurl_easy_init) ();
+static CURL * (*qcurl_easy_init) (void);
 static void (*qcurl_easy_cleanup) (CURL *handle);
 static CURLcode (*qcurl_easy_setopt) (CURL *handle, CURLoption option, ...);
 static CURLcode (*qcurl_easy_getinfo) (CURL *handle, CURLINFO info, ...);
 static const char * (*qcurl_easy_strerror) (CURLcode);
 
-static CURLM * (*qcurl_multi_init) ();
+static CURLM * (*qcurl_multi_init) (void);
 static CURLMcode (*qcurl_multi_perform) (CURLM *multi_handle, int *running_handles);
 static CURLMcode (*qcurl_multi_add_handle) (CURLM *multi_handle, CURL *easy_handle);
 static CURLMcode (*qcurl_multi_remove_handle) (CURLM *multi_handle, CURL *easy_handle);
@@ -169,8 +174,8 @@ static dllhandle_t curl_dll = NULL;
 
 typedef struct downloadinfo_s
 {
-	char filename[MAX_QPATH];
-	char url[256];
+	char filename[MAX_OSPATH];
+	char url[1024];
 	char referer[256];
 	qfile_t *stream;
 	fs_offset_t startpos;
@@ -240,7 +245,7 @@ Curl_Clear_forthismap
 Clears the "will disconnect on failure" flags.
 ====================
 */
-void Curl_Clear_forthismap()
+void Curl_Clear_forthismap(void)
 {
 	downloadinfo *di;
 	if(noclear)
@@ -261,12 +266,12 @@ Curl_Have_forthismap
 Returns true if a download needed for the current game is running.
 ====================
 */
-qboolean Curl_Have_forthismap()
+qboolean Curl_Have_forthismap(void)
 {
-	return numdownloads_added;
+	return numdownloads_added != 0;
 }
 
-void Curl_Register_predownload()
+void Curl_Register_predownload(void)
 {
 	Curl_CommandWhenDone("cl_begindownloads");
 	Curl_CommandWhenError("cl_begindownloads");
@@ -280,7 +285,7 @@ Checks if a "done command" is to be executed.
 All downloads finished, at least one success since connect, no single failure
 -> execute the command.
 */
-static void Curl_CheckCommandWhenDone()
+static void Curl_CheckCommandWhenDone(void)
 {
 	if(!curl_dll)
 		return;
@@ -313,9 +318,7 @@ static qboolean CURL_OpenLibrary (void)
 {
 	const char* dllnames [] =
 	{
-#if defined(WIN64)
-		"libcurl64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
 		"libcurl-4.dll",
 		"libcurl-3.dll",
 #elif defined(MACOSX)
@@ -406,30 +409,29 @@ static void curl_default_callback(int status, size_t length_received, unsigned c
 	switch(status)
 	{
 		case CURLCBSTATUS_OK:
-			Con_Printf("Download of %s: OK\n", di->filename);
+			Con_DPrintf("Download of %s: OK\n", di->filename);
 			break;
 		case CURLCBSTATUS_FAILED:
-			Con_Printf("Download of %s: FAILED\n", di->filename);
+			Con_DPrintf("Download of %s: FAILED\n", di->filename);
 			break;
 		case CURLCBSTATUS_ABORTED:
-			Con_Printf("Download of %s: ABORTED\n", di->filename);
+			Con_DPrintf("Download of %s: ABORTED\n", di->filename);
 			break;
 		case CURLCBSTATUS_SERVERERROR:
-			Con_Printf("Download of %s: (unknown server error)\n", di->filename);
+			Con_DPrintf("Download of %s: (unknown server error)\n", di->filename);
 			break;
 		case CURLCBSTATUS_UNKNOWN:
-			Con_Printf("Download of %s: (unknown client error)\n", di->filename);
+			Con_DPrintf("Download of %s: (unknown client error)\n", di->filename);
 			break;
 		default:
-			Con_Printf("Download of %s: %d\n", di->filename, status);
+			Con_DPrintf("Download of %s: %d\n", di->filename, status);
 			break;
 	}
 }
 
 static void curl_quiet_callback(int status, size_t length_received, unsigned char *buffer, void *cbdata)
 {
-	if(developer.integer)
-		curl_default_callback(status, length_received, buffer, cbdata);
+	curl_default_callback(status, length_received, buffer, cbdata);
 }
 
 /*
@@ -441,6 +443,7 @@ 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 *name, qboolean ispak, qboolean forthismap, unsigned char *buf, size_t bufsize, curl_callback_t callback, void *cbdata);
 static void Curl_EndDownload(downloadinfo *di, CurlStatus status, CURLcode error)
 {
 	qboolean ok = false;
@@ -481,7 +484,7 @@ static void Curl_EndDownload(downloadinfo *di, CurlStatus status, CURLcode error
 		qcurl_easy_cleanup(di->curle);
 	}
 
-	if(ok && !di->bytes_received)
+	if(!di->callback && ok && !di->bytes_received)
 	{
 		Con_Printf("ERROR: empty file\n");
 		ok = false;
@@ -491,7 +494,25 @@ static void Curl_EndDownload(downloadinfo *di, CurlStatus status, CURLcode error
 		FS_Close(di->stream);
 
 	if(ok && di->ispak)
+	{
 		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);
+
+			if(di->startpos && !di->callback)
+			{
+				// this was a resume?
+				// then try to redownload it without reporting the error
+				Curl_Begin(di->url, di->filename, di->ispak, di->forthismap, NULL, 0, NULL, NULL);
+				di->forthismap = false; // don't count the error
+			}
+		}
+	}
 
 	if(di->prev)
 		di->prev->next = di->next;
@@ -520,7 +541,7 @@ To not start too many downloads at once, only one download is added at a time,
 up to a maximum number of cl_curl_maxdownloads are running.
 ====================
 */
-static void CheckPendingDownloads()
+static void CheckPendingDownloads(void)
 {
 	if(!curl_dll)
 		return;
@@ -566,6 +587,13 @@ static void CheckPendingDownloads()
 				qcurl_easy_setopt(di->curle, CURLOPT_LOW_SPEED_TIME, (long) 45);
 				qcurl_easy_setopt(di->curle, CURLOPT_WRITEDATA, (void *) di);
 				qcurl_easy_setopt(di->curle, CURLOPT_PRIVATE, (void *) di);
+				qcurl_easy_setopt(di->curle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS | CURLPROTO_FTP);
+				if(qcurl_easy_setopt(di->curle, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS | CURLPROTO_FTP) != CURLE_OK)
+				{
+					Con_Printf("^1WARNING:^7 for security reasons, please upgrade to libcurl 7.19.4 or above. In a later version of DarkPlaces, HTTP redirect support will be disabled for this libcurl version.\n");
+					//qcurl_easy_setopt(di->curle, CURLOPT_FOLLOWLOCATION, 0);
+				}
+				
 				qcurl_multi_add_handle(curlm, di->curle);
 				di->started = true;
 				++numdownloads;
@@ -584,7 +612,7 @@ this function MUST be called before using anything else in this file.
 On Win32, this must be called AFTER WSAStartup has been done!
 ====================
 */
-void Curl_Init()
+void Curl_Init(void)
 {
 	CURL_OpenLibrary();
 	if(!curl_dll)
@@ -600,8 +628,8 @@ Curl_Shutdown
 Surprise... closes all the stuff. Please do this BEFORE shutting down LHNET.
 ====================
 */
-void Curl_ClearRequirements();
-void Curl_Shutdown()
+void Curl_ClearRequirements(void);
+void Curl_Shutdown(void)
 {
 	if(!curl_dll)
 		return;
@@ -663,11 +691,32 @@ static qboolean Curl_Begin(const char *URL, const char *name, qboolean ispak, qb
 	}
 	else
 	{
-		char fn[MAX_QPATH];
+		char fn[MAX_OSPATH];
+		char urlbuf[1024];
 		const char *p, *q;
 		size_t length;
 		downloadinfo *di;
 
+		// if URL is protocol:///* or protocol://:port/*, insert the IP of the current server
+		p = strchr(URL, ':');
+		if(p)
+		{
+			if(!strncmp(p, ":///", 4) || !strncmp(p, "://:", 4))
+			{
+				char addressstring[128];
+				*addressstring = 0;
+				InfoString_GetValue(cls.userinfo, "*ip", addressstring, sizeof(addressstring));
+				q = strchr(addressstring, ':');
+				if(!q)
+					q = addressstring + strlen(addressstring);
+				if(*addressstring)
+				{
+					dpsnprintf(urlbuf, sizeof(urlbuf), "%.*s://%.*s%s", (int) (p - URL), URL, (int) (q - addressstring), addressstring, URL + (p - URL) + 3);
+					URL = urlbuf;
+				}
+			}
+		}
+
 		// Note: This extraction of the file name portion is NOT entirely correct.
 		//
 		// It does the following:
@@ -748,7 +797,7 @@ static qboolean Curl_Begin(const char *URL, const char *name, qboolean ispak, qb
 				}
 				else
 				{
-					qfile_t *f = FS_OpenVirtualFile(fn, false);
+					qfile_t *f = FS_OpenRealFile(fn, "rb", false);
 					if(f)
 					{
 						char buf[4] = {0};
@@ -776,7 +825,7 @@ static qboolean Curl_Begin(const char *URL, const char *name, qboolean ispak, qb
 		// URL scheme (so one can't read local files using file://)
 		if(strncmp(URL, "http://", 7) && strncmp(URL, "ftp://", 6) && strncmp(URL, "https://", 8))
 		{
-			Con_Printf("Curl_Begin(\"%s\")): nasty URL scheme rejected\n", URL);
+			Con_Printf("Curl_Begin(\"%s\"): nasty URL scheme rejected\n", URL);
 			return false;
 		}
 
@@ -791,7 +840,7 @@ static qboolean Curl_Begin(const char *URL, const char *name, qboolean ispak, qb
 		di->startpos = 0;
 		di->curle = NULL;
 		di->started = false;
-		di->ispak = ispak;
+		di->ispak = (ispak && !buf);
 		di->bytes_received = 0;
 		di->next = downloads;
 		di->prev = NULL;
@@ -833,7 +882,7 @@ call this regularily as this will always download as much as possible without
 blocking.
 ====================
 */
-void Curl_Run()
+void Curl_Run(void)
 {
 	noclear = FALSE;
 
@@ -886,7 +935,7 @@ void Curl_Run()
 						case 4: // e.g. 404?
 						case 5: // e.g. 500?
 							failed = CURL_DOWNLOAD_SERVERERROR;
-							result = code;
+							result = (CURLcode) code;
 							break;
 					}
 				}
@@ -918,7 +967,7 @@ Curl_CancelAll
 Stops ALL downloads.
 ====================
 */
-void Curl_CancelAll()
+void Curl_CancelAll(void)
 {
 	if(!curl_dll)
 		return;
@@ -937,7 +986,7 @@ Curl_Running
 returns true iff there is a download running.
 ====================
 */
-qboolean Curl_Running()
+qboolean Curl_Running(void)
 {
 	if(!curl_dll)
 		return false;
@@ -962,7 +1011,7 @@ static double Curl_GetDownloadAmount(downloadinfo *di)
 		double length;
 		qcurl_easy_getinfo(di->curle, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &length);
 		if(length > 0)
-			return di->bytes_received / length;
+			return (di->startpos + di->bytes_received) / (di->startpos + length);
 		else
 			return 0;
 	}
@@ -999,7 +1048,7 @@ prints the download list
 ====================
 */
 // TODO rewrite using Curl_GetDownloadInfo?
-static void Curl_Info_f()
+static void Curl_Info_f(void)
 {
 	downloadinfo *di;
 	if(!curl_dll)
@@ -1307,7 +1356,7 @@ this file for obvious reasons.
 */
 static const char *Curl_FindPackURL(const char *filename)
 {
-	static char foundurl[256];
+	static char foundurl[1024];
 	fs_offset_t filesize;
 	char *buf = (char *) FS_LoadFile("curl_urls.txt", tempmempool, true, &filesize);
 	if(buf && filesize)
@@ -1370,7 +1419,7 @@ static const char *Curl_FindPackURL(const char *filename)
 typedef struct requirement_s
 {
 	struct requirement_s *next;
-	char filename[MAX_QPATH];
+	char filename[MAX_OSPATH];
 }
 requirement;
 static requirement *requirements = NULL;
@@ -1399,7 +1448,7 @@ Clears the list of required files for playing on the current map.
 This should be called at every map change.
 ====================
 */
-void Curl_ClearRequirements()
+void Curl_ClearRequirements(void)
 {
 	const char *p;
 	while(requirements)
@@ -1429,7 +1478,7 @@ This is done by sending him the following console commands:
 	curl --finish_autodownload
 ====================
 */
-void Curl_SendRequirements()
+void Curl_SendRequirements(void)
 {
 	// for each requirement, find the pack name
 	char sendbuffer[4096] = "";