X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=libcurl.c;h=26cb7a4914de0cc915f19fa813d73fe056d80422;hp=b8f36dc24156731f44e9bde176e56848beb6c444;hb=c6fe51c93d8d1216aa6aa924937fdf768e6304cc;hpb=5225f7ec9697b2a65a524956d6ee95c267d88145

diff --git a/libcurl.c b/libcurl.c
index b8f36dc2..26cb7a49 100644
--- a/libcurl.c
+++ b/libcurl.c
@@ -2,19 +2,19 @@
 #include "fs.h"
 #include "libcurl.h"
 #include "thread.h"
-
+#include "com_list.h"
 #include "image.h"
 #include "jpeg.h"
 #include "image_png.h"
 
-static cvar_t cl_curl_maxdownloads = {CVAR_CLIENT | CVAR_SAVE, "cl_curl_maxdownloads","1", "maximum number of concurrent HTTP/FTP downloads"};
-static cvar_t cl_curl_maxspeed = {CVAR_CLIENT | CVAR_SAVE, "cl_curl_maxspeed","300", "maximum download speed (KiB/s)"};
-static cvar_t sv_curl_defaulturl = {CVAR_SERVER | CVAR_SAVE, "sv_curl_defaulturl","", "default autodownload source URL"};
-static cvar_t sv_curl_serverpackages = {CVAR_SERVER | CVAR_SAVE, "sv_curl_serverpackages","", "list of required files for the clients, separated by spaces"};
-static cvar_t sv_curl_maxspeed = {CVAR_SERVER | 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_CLIENT | CVAR_SAVE, "cl_curl_enabled","1", "whether client's download support is enabled"};
-static cvar_t cl_curl_useragent = {CVAR_CLIENT, "cl_curl_useragent","1", "send the User-Agent string (note: turning this off may break stuff)"};
-static cvar_t cl_curl_useragent_append = {CVAR_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 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)"};
 
 /*
 =================================================================
@@ -204,13 +204,13 @@ typedef struct downloadinfo_s
 	qfile_t *stream;
 	fs_offset_t startpos;
 	CURL *curle;
-	qboolean started;
+	qbool started;
 	int loadtype;
 	size_t bytes_received; // for buffer
 	double bytes_received_curl; // for throttling
 	double bytes_sent_curl; // for throttling
-	struct downloadinfo_s *next, *prev;
-	qboolean forthismap;
+	llist_t list;
+	qbool forthismap;
 	double maxspeed;
 	curl_slist *slist; // http headers
 
@@ -225,10 +225,10 @@ typedef struct downloadinfo_s
 	const char *extraheaders;
 }
 downloadinfo;
-static downloadinfo *downloads = NULL;
+LIST_HEAD(downloads);
 static int numdownloads = 0;
 
-static qboolean noclear = false;
+static qbool noclear = false;
 
 static int numdownloads_fail = 0;
 static int numdownloads_success = 0;
@@ -284,7 +284,7 @@ void Curl_Clear_forthismap(void)
 	if(noclear)
 		return;
 	if (curl_mutex) Thread_LockMutex(curl_mutex);
-	for(di = downloads; di; di = di->next)
+	List_For_Each_Entry(di, &downloads, downloadinfo, list)
 		di->forthismap = false;
 	Curl_CommandWhenError(NULL);
 	Curl_CommandWhenDone(NULL);
@@ -301,7 +301,7 @@ Curl_Have_forthismap
 Returns true if a download needed for the current game is running.
 ====================
 */
-qboolean Curl_Have_forthismap(void)
+qbool Curl_Have_forthismap(void)
 {
 	return numdownloads_added != 0;
 }
@@ -331,16 +331,16 @@ static void Curl_CheckCommandWhenDone(void)
 		if(numdownloads_fail == 0)
 		{
 			Con_DPrintf("cURL downloads occurred, executing %s\n", command_when_done);
-			Cbuf_AddText(&cmd_client, "\n");
-			Cbuf_AddText(&cmd_client, command_when_done);
-			Cbuf_AddText(&cmd_client, "\n");
+			Cbuf_AddText(cmd_local, "\n");
+			Cbuf_AddText(cmd_local, command_when_done);
+			Cbuf_AddText(cmd_local, "\n");
 		}
 		else
 		{
 			Con_DPrintf("cURL downloads FAILED, executing %s\n", command_when_error);
-			Cbuf_AddText(&cmd_client, "\n");
-			Cbuf_AddText(&cmd_client, command_when_error);
-			Cbuf_AddText(&cmd_client, "\n");
+			Cbuf_AddText(cmd_local, "\n");
+			Cbuf_AddText(cmd_local, command_when_error);
+			Cbuf_AddText(cmd_local, "\n");
 		}
 		Curl_Clear_forthismap();
 	}
@@ -353,7 +353,7 @@ CURL_CloseLibrary
 Load the cURL DLL
 ====================
 */
-static qboolean CURL_OpenLibrary (void)
+static qbool CURL_OpenLibrary (void)
 {
 	const char* dllnames [] =
 	{
@@ -377,7 +377,7 @@ static qboolean CURL_OpenLibrary (void)
 		return true;
 
 	// Load the DLL
-	return Sys_LoadLibrary (dllnames, &curl_dll, curlfuncs);
+	return Sys_LoadDependency (dllnames, &curl_dll, curlfuncs);
 }
 
 
@@ -390,7 +390,7 @@ Unload the cURL DLL
 */
 static void CURL_CloseLibrary (void)
 {
-	Sys_UnloadLibrary (&curl_dll);
+	Sys_FreeLibrary (&curl_dll);
 }
 
 
@@ -509,11 +509,11 @@ 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, 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 qbool Curl_Begin(const char *URL, const char *extraheaders, double maxspeed, const char *name, int loadtype, qbool 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;
+	qbool ok = false;
 	if(!curl_dll)
 		return;
 	switch(status)
@@ -620,12 +620,7 @@ static void Curl_EndDownload(downloadinfo *di, CurlStatus status, CURLcode error
 			CLEAR_AND_RETRY();
 	}
 
-	if(di->prev)
-		di->prev->next = di->next;
-	else
-		downloads = di->next;
-	if(di->next)
-		di->next->prev = di->prev;
+	List_Delete(&di->list);
 
 	--numdownloads;
 	if(di->forthismap)
@@ -687,7 +682,7 @@ static void CheckPendingDownloads(void)
 	if(numdownloads < cl_curl_maxdownloads.integer)
 	{
 		downloadinfo *di;
-		for(di = downloads; di; di = di->next)
+		List_For_Each_Entry(di, &downloads, downloadinfo, list)
 		{
 			if(!di->started)
 			{
@@ -843,7 +838,7 @@ static downloadinfo *Curl_Find(const char *filename)
 	downloadinfo *di;
 	if(!curl_dll)
 		return NULL;
-	for(di = downloads; di; di = di->next)
+	List_For_Each_Entry(di, &downloads, downloadinfo, list)
 		if(!strcasecmp(di->filename, filename))
 			return di;
 	return NULL;
@@ -851,19 +846,16 @@ static downloadinfo *Curl_Find(const char *filename)
 
 void Curl_Cancel_ToMemory(curl_callback_t callback, void *cbdata)
 {
-	downloadinfo *di;
+	downloadinfo *di, *ndi;
 	if(!curl_dll)
 		return;
-	for(di = downloads; di; )
+	List_For_Each_Entry_Safe(di, ndi, &downloads, downloadinfo, list)
 	{
 		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;
 	}
 }
 
@@ -875,7 +867,7 @@ 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, 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 qbool Curl_Begin(const char *URL, const char *extraheaders, double maxspeed, const char *name, int loadtype, qbool 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(buf)
 		if(loadtype != LOADTYPE_NONE)
@@ -989,7 +981,7 @@ static qboolean Curl_Begin(const char *URL, const char *extraheaders, double max
 			{
 				if(loadtype == LOADTYPE_PAK)
 				{
-					qboolean already_loaded;
+					qbool already_loaded;
 					if(FS_AddPack(fn, &already_loaded, true))
 					{
 						Con_DPrintf("%s already exists, not downloading!\n", fn);
@@ -1067,11 +1059,6 @@ static qboolean Curl_Begin(const char *URL, const char *extraheaders, double max
 		di->bytes_received_curl = 0;
 		di->bytes_sent_curl = 0;
 		di->extraheaders = extraheaders;
-		di->next = downloads;
-		di->prev = NULL;
-		if(di->next)
-			di->next->prev = di;
-
 		di->buffer = buf;
 		di->buffersize = bufsize;
 		if(callback == NULL)
@@ -1098,34 +1085,37 @@ static qboolean Curl_Begin(const char *URL, const char *extraheaders, double max
 			di->postbufsize = 0;
 		}
 
-		downloads = di;
-		if (curl_mutex) Thread_UnlockMutex(curl_mutex);
+		List_Add(&di->list, &downloads);
+
+		if (curl_mutex)
+			Thread_UnlockMutex(curl_mutex);
+
 		return true;
 	}
 }
 
-qboolean Curl_Begin_ToFile(const char *URL, double maxspeed, const char *name, int loadtype, qboolean forthismap)
+qbool Curl_Begin_ToFile(const char *URL, double maxspeed, const char *name, int loadtype, qbool forthismap)
 {
 	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)
+qbool Curl_Begin_ToMemory(const char *URL, double maxspeed, unsigned char *buf, size_t bufsize, curl_callback_t callback, void *cbdata)
 {
 	return Curl_Begin(URL, NULL, maxspeed, NULL, false, false, NULL, NULL, 0, buf, bufsize, callback, cbdata);
 }
-qboolean Curl_Begin_ToMemory_POST(const char *URL, const char *extraheaders, double maxspeed, const char *post_content_type, const unsigned char *postbuf, size_t postbufsize, unsigned char *buf, size_t bufsize, curl_callback_t callback, void *cbdata)
+qbool Curl_Begin_ToMemory_POST(const char *URL, const char *extraheaders, double maxspeed, const char *post_content_type, const unsigned char *postbuf, size_t postbufsize, unsigned char *buf, size_t bufsize, curl_callback_t callback, void *cbdata)
 {
 	return Curl_Begin(URL, extraheaders, maxspeed, NULL, false, false, post_content_type, postbuf, postbufsize, buf, bufsize, callback, cbdata);
 }
 
 /*
 ====================
-Curl_Run
+Curl_Frame
 
 call this regularily as this will always download as much as possible without
 blocking.
 ====================
 */
-void Curl_Run(void)
+void Curl_Frame(void)
 {
 	double maxspeed;
 	downloadinfo *di;
@@ -1142,13 +1132,13 @@ void Curl_Run(void)
 
 	Curl_CheckCommandWhenDone();
 
-	if(!downloads)
+	if(List_Is_Empty(&downloads))
 	{
 		if (curl_mutex) Thread_UnlockMutex(curl_mutex);
 		return;
 	}
 
-	if(realtime < curltime) // throttle
+	if(host.realtime < curltime) // throttle
 	{
 		if (curl_mutex) Thread_UnlockMutex(curl_mutex);
 		return;
@@ -1164,7 +1154,7 @@ void Curl_Run(void)
 		}
 		while(mc == CURLM_CALL_MULTI_PERFORM);
 
-		for(di = downloads; di; di = di->next)
+		List_For_Each_Entry(di, &downloads, downloadinfo, list)
 		{
 			double b = 0;
 			if(di->curle)
@@ -1223,7 +1213,7 @@ void Curl_Run(void)
 	// use the slowest allowing download to derive the maxspeed... this CAN
 	// be done better, but maybe later
 	maxspeed = cl_curl_maxspeed.value;
-	for(di = downloads; di; di = di->next)
+	List_For_Each_Entry(di, &downloads, downloadinfo, list)
 		if(di->maxspeed > 0)
 			if(di->maxspeed < maxspeed || maxspeed <= 0)
 				maxspeed = di->maxspeed;
@@ -1231,12 +1221,12 @@ void Curl_Run(void)
 	if(maxspeed > 0)
 	{
 		double bytes = bytes_sent + bytes_received; // maybe smoothen a bit?
-		curltime = realtime + bytes / (maxspeed * 1024.0);
+		curltime = host.realtime + bytes / (maxspeed * 1024.0);
 		bytes_sent = 0;
 		bytes_received = 0;
 	}
 	else
-		curltime = realtime;
+		curltime = host.realtime;
 
 	if (curl_mutex) Thread_UnlockMutex(curl_mutex);
 }
@@ -1255,9 +1245,9 @@ void Curl_CancelAll(void)
 
 	if (curl_mutex) Thread_LockMutex(curl_mutex);
 
-	while(downloads)
+	while(!List_Is_Empty(&downloads))
 	{
-		Curl_EndDownload(downloads, CURL_DOWNLOAD_ABORTED, CURLE_OK, NULL);
+		Curl_EndDownload(List_First_Entry(&downloads, downloadinfo, list), CURL_DOWNLOAD_ABORTED, CURLE_OK, NULL);
 		// INVARIANT: downloads will point to the next download after that!
 	}
 
@@ -1268,15 +1258,15 @@ void Curl_CancelAll(void)
 ====================
 Curl_Running
 
-returns true iff there is a download running.
+returns true if there is a download running.
 ====================
 */
-qboolean Curl_Running(void)
+qbool Curl_Running(void)
 {
 	if(!curl_dll)
 		return false;
 
-	return downloads != NULL;
+	return !List_Is_Empty(&downloads);
 }
 
 /*
@@ -1343,7 +1333,7 @@ static void Curl_Info_f(cmd_state_t *cmd)
 	{
 		if (curl_mutex) Thread_LockMutex(curl_mutex);
 		Con_Print("Currently running downloads:\n");
-		for(di = downloads; di; di = di->next)
+		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 +1384,7 @@ static void Curl_Curl_f(cmd_state_t *cmd)
 	int i;
 	int end;
 	int loadtype = LOADTYPE_NONE;
-	qboolean forthismap = false;
+	qbool forthismap = false;
 	const char *url;
 	const char *name = 0;
 
@@ -1552,9 +1542,8 @@ void Curl_Init_Commands(void)
 	Cvar_RegisterVariable (&sv_curl_maxspeed);
 	Cvar_RegisterVariable (&cl_curl_useragent);
 	Cvar_RegisterVariable (&cl_curl_useragent_append);
-	Cmd_AddCommand(&cmd_client, "curl", Curl_Curl_f, "download data from an URL and add to search path");
-	Cmd_AddCommand(&cmd_clientfromserver, "curl", Curl_Curl_f, "download data from an URL and add to search path");
-	//Cmd_AddCommand(&cmd_client, "curlcat", Curl_CurlCat_f, "display data from an URL (debugging command)");
+	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)");
 }
 
 /*
@@ -1585,12 +1574,12 @@ Curl_downloadinfo_t *Curl_GetDownloadInfo(int *nDownloads, const char **addition
 	if (curl_mutex) Thread_LockMutex(curl_mutex);
 
 	i = 0;
-	for(di = downloads; di; di = di->next)
+	List_For_Each_Entry(di, &downloads, downloadinfo, list)
 		++i;
 
 	downinfo = (Curl_downloadinfo_t *) Z_Malloc(sizeof(*downinfo) * i);
 	i = 0;
-	for(di = downloads; di; di = di->next)
+	List_For_Each_Entry(di, &downloads, downloadinfo, list)
 	{
 		// do not show infobars for background downloads
 		if(developer.integer <= 0)
@@ -1667,7 +1656,7 @@ static const char *Curl_FindPackURL(const char *filename)
 		// read lines of format "pattern url"
 		char *p = buf;
 		char *pattern = NULL, *patternend = NULL, *url = NULL, *urlend = NULL;
-		qboolean eof = false;
+		qbool eof = false;
 
 		pattern = p;
 		while(!eof)
@@ -1773,7 +1762,7 @@ This is done by sending him the following console commands:
 	curl --finish_autodownload
 ====================
 */
-static qboolean Curl_SendRequirement(const char *filename, qboolean foundone, char *sendbuffer, size_t sendbuffer_len)
+static qbool Curl_SendRequirement(const char *filename, qbool foundone, char *sendbuffer, size_t sendbuffer_len)
 {
 	const char *p;
 	const char *thispack = FS_WhichPack(filename);
@@ -1814,7 +1803,7 @@ void Curl_SendRequirements(void)
 	// for each requirement, find the pack name
 	char sendbuffer[4096] = "";
 	requirement *req;
-	qboolean foundone = false;
+	qbool foundone = false;
 	const char *p;
 
 	for(req = requirements; req; req = req->next)
@@ -1828,7 +1817,7 @@ void Curl_SendRequirements(void)
 		strlcat(sendbuffer, "curl --finish_autodownload\n", sizeof(sendbuffer));
 
 	if(strlen(sendbuffer) + 1 < sizeof(sendbuffer))
-		Host_ClientCommands("%s", sendbuffer);
+		SV_ClientCommands("%s", sendbuffer);
 	else
 		Con_Printf("Could not initiate autodownload due to URL buffer overflow\n");
 }