X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=libcurl.c;h=31e331a1170e1faadf75f915a4e3d1c3f084ce77;hb=ca44a5ca4c29145daf3c73a3657cd88b45d09eec;hp=5c5f127295ab7810c613f758338fa6df0a677503;hpb=6c526650ca4c8150e53214dab39104f2065765cf;p=xonotic%2Fdarkplaces.git

diff --git a/libcurl.c b/libcurl.c
index 5c5f1272..31e331a1 100644
--- a/libcurl.c
+++ b/libcurl.c
@@ -7,14 +7,17 @@
 #include "jpeg.h"
 #include "image_png.h"
 
-static cvar_t cl_curl_maxdownloads = {CF_CLIENT | CF_ARCHIVE, "cl_curl_maxdownloads","1", "maximum number of concurrent HTTP/FTP downloads"};
-static cvar_t cl_curl_maxspeed = {CF_CLIENT | CF_ARCHIVE, "cl_curl_maxspeed","300", "maximum download speed (KiB/s)"};
-static cvar_t sv_curl_defaulturl = {CF_SERVER | CF_ARCHIVE, "sv_curl_defaulturl","", "default autodownload source URL"};
-static cvar_t sv_curl_serverpackages = {CF_SERVER | CF_ARCHIVE, "sv_curl_serverpackages","", "list of required files for the clients, separated by spaces"};
-static cvar_t sv_curl_maxspeed = {CF_SERVER | CF_ARCHIVE, "sv_curl_maxspeed","0", "maximum download speed for clients downloading from sv_curl_defaulturl (KiB/s)"};
-static cvar_t cl_curl_enabled = {CF_CLIENT | CF_ARCHIVE, "cl_curl_enabled","1", "whether client's download support is enabled"};
-static cvar_t cl_curl_useragent = {CF_CLIENT, "cl_curl_useragent","1", "send the User-Agent string (note: turning this off may break stuff)"};
-static cvar_t cl_curl_useragent_append = {CF_CLIENT, "cl_curl_useragent_append","", "a string to append to the User-Agent string (useful for name and version number of your mod)"};
+static cvar_t curl_enabled = {CF_SHARED | CF_ARCHIVE, "curl_enabled","1", "whether libcurl may be used to GET files or POST data"};
+static cvar_t curl_maxdownloads = {CF_SHARED | CF_ARCHIVE, "curl_maxdownloads","3", "maximum number of concurrent HTTP/FTP downloads"};
+static cvar_t curl_maxspeed = {CF_SHARED | CF_ARCHIVE, "curl_maxspeed","0", "maximum download speed (KiB/s)"};
+static cvar_t curl_useragent = {CF_SHARED, "curl_useragent","1", "send the User-Agent string (note: turning this off may break stuff)"};
+static cvar_t curl_useragent_append = {CF_SHARED, "curl_useragent_append","", "a string to append to the User-Agent string (useful for name and version number of your mod)"};
+
+static cvar_t sv_curl_defaulturl = {CF_SERVER, "sv_curl_defaulturl","", "default autodownload source URL"};
+static cvar_t sv_curl_serverpackages = {CF_SERVER, "sv_curl_serverpackages","", "list of required files for the clients, separated by spaces"};
+static cvar_t sv_curl_maxspeed = {CF_SERVER, "sv_curl_maxspeed","0", "maximum download speed for clients downloading from sv_curl_defaulturl (KiB/s)"};
+
+static cvar_t developer_curl = {CF_SHARED, "developer_curl","0", "whether verbose libcurl output should be printed to stderr"};
 
 /*
 =================================================================
@@ -62,6 +65,7 @@ typedef enum
 	CINIT(LOW_SPEED_TIME, LONG, 20),
 	CINIT(RESUME_FROM, LONG, 21),
 	CINIT(HTTPHEADER, OBJECTPOINT, 23),
+	CINIT(VERBOSE, LONG, 41),
 	CINIT(POST, LONG, 47),         /* HTTP POST method */
 	CINIT(FOLLOWLOCATION, LONG, 52),  /* use Location: Luke! */
 	CINIT(POSTFIELDSIZE, LONG, 60),
@@ -156,6 +160,7 @@ static const char * (*qcurl_easy_strerror) (CURLcode);
 
 static CURLM * (*qcurl_multi_init) (void);
 static CURLMcode (*qcurl_multi_perform) (CURLM *multi_handle, int *running_handles);
+static CURLMcode (*qcurl_multi_poll) (CURLM *multi_handle, void*, unsigned int extra_nfds, int timeout_ms, int *ret);
 static CURLMcode (*qcurl_multi_add_handle) (CURLM *multi_handle, CURL *easy_handle);
 static CURLMcode (*qcurl_multi_remove_handle) (CURLM *multi_handle, CURL *easy_handle);
 static CURLMsg * (*qcurl_multi_info_read) (CURLM *multi_handle, int *msgs_in_queue);
@@ -175,6 +180,7 @@ static dllfunction_t curlfuncs[] =
 	{"curl_easy_getinfo",		(void **) &qcurl_easy_getinfo},
 	{"curl_multi_init",			(void **) &qcurl_multi_init},
 	{"curl_multi_perform",		(void **) &qcurl_multi_perform},
+	{"curl_multi_poll",		(void **) &qcurl_multi_poll},
 	{"curl_multi_add_handle",	(void **) &qcurl_multi_add_handle},
 	{"curl_multi_remove_handle",(void **) &qcurl_multi_remove_handle},
 	{"curl_multi_info_read",	(void **) &qcurl_multi_info_read},
@@ -284,7 +290,7 @@ void Curl_Clear_forthismap(void)
 	if(noclear)
 		return;
 	if (curl_mutex) Thread_LockMutex(curl_mutex);
-	List_For_Each_Entry(di, &downloads, list)
+	List_For_Each_Entry(di, &downloads, downloadinfo, list)
 		di->forthismap = false;
 	Curl_CommandWhenError(NULL);
 	Curl_CommandWhenDone(NULL);
@@ -430,6 +436,8 @@ static size_t CURL_fwrite(void *data, size_t size, size_t nmemb, void *vdi)
 
 	di->bytes_received += bytes;
 
+	//Con_Printf("CURL_fwrite callback timestamp: %f bytes: %ld\n", host.realtime, ret);
+
 	return ret;
 	// Why not ret / nmemb?
 	// Because CURLOPT_WRITEFUNCTION docs say to return the number of bytes.
@@ -581,7 +589,7 @@ static void Curl_EndDownload(downloadinfo *di, CurlStatus status, CURLcode error
 
 	if(ok && di->loadtype == LOADTYPE_PAK)
 	{
-		ok = FS_AddPack(di->filename, NULL, true);
+		ok = FS_AddPack(di->filename, NULL, true, true);
 		if(!ok)
 			CLEAR_AND_RETRY();
 	}
@@ -679,10 +687,10 @@ static void CheckPendingDownloads(void)
 	char vabuf[1024];
 	if(!curl_dll)
 		return;
-	if(numdownloads < cl_curl_maxdownloads.integer)
+	if(numdownloads < curl_maxdownloads.integer)
 	{
 		downloadinfo *di;
-		List_For_Each_Entry(di, &downloads, list)
+		List_For_Each_Entry(di, &downloads, downloadinfo, list)
 		{
 			if(!di->started)
 			{
@@ -713,7 +721,7 @@ static void CheckPendingDownloads(void)
 				di->curle = qcurl_easy_init();
 				di->slist = NULL;
 				qcurl_easy_setopt(di->curle, CURLOPT_URL, di->url);
-				if(cl_curl_useragent.integer)
+				if(curl_useragent.integer)
 				{
 					const char *ua
 #ifdef HTTP_USER_AGENT
@@ -723,17 +731,19 @@ static void CheckPendingDownloads(void)
 #endif
 					if(!ua)
 						ua = "";
-					if(*cl_curl_useragent_append.string)
+					if(*curl_useragent_append.string)
 						ua = va(vabuf, sizeof(vabuf), "%s%s%s",
 							ua,
 							(ua[0] && ua[strlen(ua)-1] != ' ')
 								? " "
 								: "",
-							cl_curl_useragent_append.string);
+							curl_useragent_append.string);
 					qcurl_easy_setopt(di->curle, CURLOPT_USERAGENT, ua);
 				}
 				else
 					qcurl_easy_setopt(di->curle, CURLOPT_USERAGENT, "");
+				if(developer_curl.integer) 
+					qcurl_easy_setopt(di->curle, CURLOPT_VERBOSE, (long) 1);
 				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);
@@ -782,7 +792,7 @@ static void CheckPendingDownloads(void)
 				qcurl_multi_add_handle(curlm, di->curle);
 				di->started = true;
 				++numdownloads;
-				if(numdownloads >= cl_curl_maxdownloads.integer)
+				if(numdownloads >= curl_maxdownloads.integer)
 					break;
 			}
 		}
@@ -803,7 +813,7 @@ void Curl_Init(void)
 	if(!curl_dll)
 		return;
 	if (Thread_HasThreads()) curl_mutex = Thread_CreateMutex();
-	qcurl_global_init(CURL_GLOBAL_NOTHING);
+	qcurl_global_init(CURL_GLOBAL_SSL);
 	curlm = qcurl_multi_init();
 }
 
@@ -826,6 +836,12 @@ void Curl_Shutdown(void)
 	curl_dll = NULL;
 }
 
+// for VM_checkextension()
+qbool Curl_Available(void)
+{
+	return curl_dll ? true : false;
+}
+
 /*
 ====================
 Curl_Find
@@ -838,7 +854,7 @@ static downloadinfo *Curl_Find(const char *filename)
 	downloadinfo *di;
 	if(!curl_dll)
 		return NULL;
-	List_For_Each_Entry(di, &downloads, list)
+	List_For_Each_Entry(di, &downloads, downloadinfo, list)
 		if(!strcasecmp(di->filename, filename))
 			return di;
 	return NULL;
@@ -849,7 +865,7 @@ void Curl_Cancel_ToMemory(curl_callback_t callback, void *cbdata)
 	downloadinfo *di, *ndi;
 	if(!curl_dll)
 		return;
-	List_For_Each_Entry_Safe(di, ndi, &downloads, list)
+	List_For_Each_Entry_Safe(di, ndi, &downloads, downloadinfo, list)
 	{
 		if(di->callback == callback && di->callback_data == cbdata)
 		{
@@ -873,7 +889,7 @@ static qbool Curl_Begin(const char *URL, const char *extraheaders, double maxspe
 		if(loadtype != LOADTYPE_NONE)
 			Host_Error("Curl_Begin: loadtype and buffer are both set");
 
-	if(!curl_dll || !cl_curl_enabled.integer)
+	if(!curl_dll || !curl_enabled.integer)
 	{
 		return false;
 	}
@@ -982,7 +998,7 @@ static qbool Curl_Begin(const char *URL, const char *extraheaders, double maxspe
 				if(loadtype == LOADTYPE_PAK)
 				{
 					qbool already_loaded;
-					if(FS_AddPack(fn, &already_loaded, true))
+					if(FS_AddPack(fn, &already_loaded, true, true))
 					{
 						Con_DPrintf("%s already exists, not downloading!\n", fn);
 						if(already_loaded)
@@ -1122,7 +1138,7 @@ void Curl_Frame(void)
 
 	noclear = false;
 
-	if(!cl_curl_enabled.integer)
+	if(!curl_enabled.integer && cls.state != ca_dedicated)
 		return;
 
 	if(!curl_dll)
@@ -1154,7 +1170,7 @@ void Curl_Frame(void)
 		}
 		while(mc == CURLM_CALL_MULTI_PERFORM);
 
-		List_For_Each_Entry(di, &downloads, list)
+		List_For_Each_Entry(di, &downloads, downloadinfo, list)
 		{
 			double b = 0;
 			if(di->curle)
@@ -1212,8 +1228,8 @@ void Curl_Frame(void)
 
 	// use the slowest allowing download to derive the maxspeed... this CAN
 	// be done better, but maybe later
-	maxspeed = cl_curl_maxspeed.value;
-	List_For_Each_Entry(di, &downloads, list)
+	maxspeed = curl_maxspeed.value;
+	List_For_Each_Entry(di, &downloads, downloadinfo, list)
 		if(di->maxspeed > 0)
 			if(di->maxspeed < maxspeed || maxspeed <= 0)
 				maxspeed = di->maxspeed;
@@ -1231,6 +1247,25 @@ void Curl_Frame(void)
 	if (curl_mutex) Thread_UnlockMutex(curl_mutex);
 }
 
+/*
+====================
+Curl_Select
+
+Sleeps until there's some transfer progress or a timeout is reached,
+unfortunately the timeout is only in milliseconds.
+This allows good throughput even at very low FPS.
+====================
+*/
+void Curl_Select(double *microseconds)
+{
+	if (List_Is_Empty(&downloads))
+		return;
+	if (qcurl_multi_poll(curlm, NULL, 0, *microseconds / 1000, NULL) == CURLM_OK)
+		*microseconds = 0; // either we finished waiting or a transfer progressed
+	else
+		Con_Print("There's an emergency going on!\nIt's still going on!\nMaybe you need to upgrade libcurl?\n");
+}
+
 /*
 ====================
 Curl_CancelAll
@@ -1333,7 +1368,7 @@ static void Curl_Info_f(cmd_state_t *cmd)
 	{
 		if (curl_mutex) Thread_LockMutex(curl_mutex);
 		Con_Print("Currently running downloads:\n");
-		List_For_Each_Entry(di, &downloads, list)
+		List_For_Each_Entry(di, &downloads, downloadinfo, list)
 		{
 			double speed, percent;
 			Con_Printf("  %s -> %s ",  CleanURL(di->url, urlbuf, sizeof(urlbuf)), di->filename);
@@ -1394,7 +1429,7 @@ static void Curl_Curl_f(cmd_state_t *cmd)
 		return;
 	}
 
-	if(!cl_curl_enabled.integer)
+	if(!curl_enabled.integer)
 	{
 		Con_Print("curl support not enabled. Set cl_curl_enabled to 1 to enable.\n");
 		return;
@@ -1484,7 +1519,7 @@ static void Curl_Curl_f(cmd_state_t *cmd)
 						dpsnprintf(donecommand, sizeof(donecommand), "connect %s", cls.netcon->address);
 						Curl_CommandWhenDone(donecommand);
 						noclear = true;
-						CL_Disconnect(false, NULL);
+						CL_Disconnect();
 						noclear = false;
 						Curl_CheckCommandWhenDone();
 					}
@@ -1534,14 +1569,23 @@ loads the commands and cvars this library uses
 */
 void Curl_Init_Commands(void)
 {
-	Cvar_RegisterVariable (&cl_curl_enabled);
-	Cvar_RegisterVariable (&cl_curl_maxdownloads);
-	Cvar_RegisterVariable (&cl_curl_maxspeed);
+	Cvar_RegisterVariable (&curl_enabled);
+	Cvar_RegisterVariable (&curl_maxdownloads);
+	Cvar_RegisterVariable (&curl_maxspeed);
+	Cvar_RegisterVariable (&curl_useragent);
+	Cvar_RegisterVariable (&curl_useragent_append);
+	Cvar_RegisterVirtual  (&curl_enabled,          "cl_curl_enabled");
+	Cvar_RegisterVirtual  (&curl_maxdownloads,     "cl_curl_maxdownloads");
+	Cvar_RegisterVirtual  (&curl_maxspeed,         "cl_curl_maxspeed");
+	Cvar_RegisterVirtual  (&curl_useragent,        "cl_curl_useragent");
+	Cvar_RegisterVirtual  (&curl_useragent_append, "cl_curl_useragent_append");
+
 	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);
+
+	Cvar_RegisterVariable (&developer_curl);
+
 	Cmd_AddCommand(CF_CLIENT | CF_CLIENT_FROM_SERVER, "curl", Curl_Curl_f, "download data from an URL and add to search path");
 	//Cmd_AddCommand(cmd_local, "curlcat", Curl_CurlCat_f, "display data from an URL (debugging command)");
 }
@@ -1574,12 +1618,12 @@ Curl_downloadinfo_t *Curl_GetDownloadInfo(int *nDownloads, const char **addition
 	if (curl_mutex) Thread_LockMutex(curl_mutex);
 
 	i = 0;
-	List_For_Each_Entry(di, &downloads, list)
+	List_For_Each_Entry(di, &downloads, downloadinfo, list)
 		++i;
 
 	downinfo = (Curl_downloadinfo_t *) Z_Malloc(sizeof(*downinfo) * i);
 	i = 0;
-	List_For_Each_Entry(di, &downloads, list)
+	List_For_Each_Entry(di, &downloads, downloadinfo, list)
 	{
 		// do not show infobars for background downloads
 		if(developer.integer <= 0)