X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=libcurl.c;h=0efac5e87591b8e026603700024dcccec3ea280a;hb=625c75ef5d167e769b8b65c8d47238c4b0710872;hp=58c017857fe9fa9d2dd7eba9c7b6f29ff51bc693;hpb=1e567a7423084174478da3dca53b4d86251d449a;p=xonotic%2Fdarkplaces.git diff --git a/libcurl.c b/libcurl.c index 58c01785..0efac5e8 100644 --- a/libcurl.c +++ b/libcurl.c @@ -3,9 +3,10 @@ #include "libcurl.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","100", "maximum download speed (KiB/s)"}; +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"}; /* @@ -53,8 +54,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 +134,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,7 +175,7 @@ static dllhandle_t curl_dll = NULL; typedef struct downloadinfo_s { - char filename[MAX_QPATH]; + char filename[MAX_OSPATH]; char url[1024]; char referer[256]; qfile_t *stream; @@ -180,6 +186,7 @@ typedef struct downloadinfo_s unsigned long bytes_received; struct downloadinfo_s *next, *prev; qboolean forthismap; + double maxspeed; unsigned char *buffer; size_t buffersize; @@ -240,7 +247,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 +268,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 +287,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 +320,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 +411,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 +445,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, double maxspeed, 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 +486,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; @@ -500,6 +505,14 @@ static void Curl_EndDownload(downloadinfo *di, CurlStatus status, CURLcode error // 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->maxspeed, di->filename, di->ispak, di->forthismap, NULL, 0, NULL, NULL); + di->forthismap = false; // don't count the error + } } } @@ -530,7 +543,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; @@ -576,6 +589,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; @@ -594,7 +614,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) @@ -610,8 +630,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; @@ -665,7 +685,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 *name, qboolean ispak, qboolean forthismap, unsigned char *buf, size_t bufsize, curl_callback_t callback, void *cbdata) +static qboolean Curl_Begin(const char *URL, double maxspeed, const char *name, qboolean ispak, qboolean forthismap, unsigned char *buf, size_t bufsize, curl_callback_t callback, void *cbdata) { if(!curl_dll) { @@ -673,11 +693,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: @@ -786,7 +827,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; } @@ -801,7 +842,8 @@ 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->maxspeed = maxspeed; di->bytes_received = 0; di->next = downloads; di->prev = NULL; @@ -826,13 +868,13 @@ static qboolean Curl_Begin(const char *URL, const char *name, qboolean ispak, qb } } -qboolean Curl_Begin_ToFile(const char *URL, const char *name, qboolean ispak, qboolean forthismap) +qboolean Curl_Begin_ToFile(const char *URL, double maxspeed, const char *name, qboolean ispak, qboolean forthismap) { - return Curl_Begin(URL, name, ispak, forthismap, NULL, 0, NULL, NULL); + return Curl_Begin(URL, maxspeed, name, ispak, forthismap, NULL, 0, NULL, NULL); } -qboolean Curl_Begin_ToMemory(const char *URL, unsigned char *buf, size_t bufsize, curl_callback_t callback, void *cbdata) +qboolean 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, false, false, buf, bufsize, callback, cbdata); + return Curl_Begin(URL, maxspeed, NULL, false, false, buf, bufsize, callback, cbdata); } /* @@ -843,8 +885,11 @@ call this regularily as this will always download as much as possible without blocking. ==================== */ -void Curl_Run() +void Curl_Run(void) { + double maxspeed; + downloadinfo *di; + noclear = FALSE; if(!cl_curl_enabled.integer) @@ -878,7 +923,6 @@ void Curl_Run() break; if(msg->msg == CURLMSG_DONE) { - downloadinfo *di; CurlStatus failed = CURL_DOWNLOAD_SUCCESS; CURLcode result; qcurl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &di); @@ -911,7 +955,16 @@ void Curl_Run() // when will we curl the next time? // we will wait a bit to ensure our download rate is kept. // we now know that realtime >= curltime... so set up a new curltime - if(cl_curl_maxspeed.value > 0) + + // 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) + if(di->maxspeed > 0) + if(di->maxspeed < maxspeed || maxspeed <= 0) + maxspeed = di->maxspeed; + + if(maxspeed > 0) { unsigned long bytes = bytes_received; // maybe smoothen a bit? curltime = realtime + bytes / (cl_curl_maxspeed.value * 1024.0); @@ -928,7 +981,7 @@ Curl_CancelAll Stops ALL downloads. ==================== */ -void Curl_CancelAll() +void Curl_CancelAll(void) { if(!curl_dll) return; @@ -947,7 +1000,7 @@ Curl_Running returns true iff there is a download running. ==================== */ -qboolean Curl_Running() +qboolean Curl_Running(void) { if(!curl_dll) return false; @@ -1009,7 +1062,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) @@ -1063,6 +1116,7 @@ curl --finish_autodownload */ void Curl_Curl_f(void) { + double maxspeed = 0; int i; int end; qboolean pak = false; @@ -1121,7 +1175,7 @@ void Curl_Curl_f(void) { pak = true; } - else if(!strcmp(a, "--for")) + else if(!strcmp(a, "--for")) // must be last option { for(i = i + 1; i != end - 1; ++i) { @@ -1172,15 +1226,19 @@ void Curl_Curl_f(void) } return; } + else if(!strncmp(a, "--maxspeed=", 11)) + { + maxspeed = atof(a + 11); + } else if(*a == '-') { - Con_Printf("invalid option %s\n", a); - return; + Con_Printf("curl: invalid option %s\n", a); + // but we ignore the option } } needthefile: - Curl_Begin_ToFile(url, name, pak, forthismap); + Curl_Begin_ToFile(url, maxspeed, name, pak, forthismap); } /* @@ -1213,6 +1271,7 @@ void Curl_Init_Commands(void) Cvar_RegisterVariable (&cl_curl_maxspeed); Cvar_RegisterVariable (&sv_curl_defaulturl); Cvar_RegisterVariable (&sv_curl_serverpackages); + Cvar_RegisterVariable (&sv_curl_maxspeed); 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)"); } @@ -1252,7 +1311,7 @@ Curl_downloadinfo_t *Curl_GetDownloadInfo(int *nDownloads, const char **addition for(di = downloads; di; di = di->next) { // do not show infobars for background downloads - if(!developer.integer) + if(developer.integer <= 0) if(di->buffer) continue; strlcpy(downinfo[i].filename, di->filename, sizeof(downinfo[i].filename)); @@ -1380,7 +1439,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; @@ -1409,7 +1468,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) @@ -1439,7 +1498,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] = ""; @@ -1468,6 +1527,8 @@ void Curl_SendRequirements() strlcat(sendbuffer, "curl --pak --forthismap --as ", sizeof(sendbuffer)); strlcat(sendbuffer, thispack, sizeof(sendbuffer)); + if(sv_curl_maxspeed.value > 0) + dpsnprintf(sendbuffer + strlen(sendbuffer), sizeof(sendbuffer) - strlen(sendbuffer), " --maxspeed=%.1f", sv_curl_maxspeed.value); strlcat(sendbuffer, " --for ", sizeof(sendbuffer)); strlcat(sendbuffer, req->filename, sizeof(sendbuffer)); strlcat(sendbuffer, " ", sizeof(sendbuffer));