#include "fs.h"
#include "libcurl.h"
-static cvar_t cl_curl_maxdownloads = {1, "cl_curl_maxdownloads","1", "maximum number of concurrent HTTP/FTP downloads"};
-static cvar_t cl_curl_maxspeed = {1, "cl_curl_maxspeed","100", "maximum download speed (KiB/s)"};
-static cvar_t sv_curl_defaulturl = {1, "sv_curl_defaulturl","", "default autodownload source URL"};
-static cvar_t sv_curl_serverpackages = {1, "sv_curl_serverpackages","", "list of required files for the clients, separated by spaces"};
-static cvar_t cl_curl_enabled = {1, "cl_curl_enabled","0", "whether client's download support is enabled"};
+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 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 cl_curl_enabled = {CVAR_SAVE, "cl_curl_enabled","1", "whether client's download support is enabled"};
/*
=================================================================
typedef struct downloadinfo_s
{
char filename[MAX_QPATH];
- char url[256];
+ char url[1024];
char referer[256];
qfile_t *stream;
fs_offset_t startpos;
unsigned long bytes_received;
struct downloadinfo_s *next, *prev;
qboolean forthismap;
+
+ unsigned char *buffer;
+ size_t buffersize;
+ curl_callback_t callback;
+ void *callback_data;
}
downloadinfo;
static downloadinfo *downloads = NULL;
static int numdownloads = 0;
+static qboolean noclear = FALSE;
+
static int numdownloads_fail = 0;
static int numdownloads_success = 0;
static int numdownloads_added = 0;
void Curl_Clear_forthismap()
{
downloadinfo *di;
+ if(noclear)
+ return;
for(di = downloads; di; di = di->next)
di->forthismap = false;
Curl_CommandWhenError(NULL);
numdownloads_added = 0;
}
-/* obsolete: numdownloads_added contains the same
-static qboolean Curl_Have_forthismap()
+/*
+====================
+Curl_Have_forthismap
+
+Returns true if a download needed for the current game is running.
+====================
+*/
+qboolean Curl_Have_forthismap()
{
- downloadinfo *di;
- for(di = downloads; di; di = di->next)
- if(di->forthismap)
- return true;
- return false;
+ return numdownloads_added;
+}
+
+void Curl_Register_predownload()
+{
+ Curl_CommandWhenDone("cl_begindownloads");
+ Curl_CommandWhenError("cl_begindownloads");
}
-*/
/*
====================
return;
if(numdownloads_added && (numdownloads_success == numdownloads_added) && *command_when_done)
{
- Con_DPrintf("Map downloads occurred, executing %s\n", command_when_done);
+ Con_DPrintf("cURL downloads occurred, executing %s\n", command_when_done);
Cbuf_AddText("\n");
Cbuf_AddText(command_when_done);
Cbuf_AddText("\n");
- Curl_Clear_forthismap(NULL);
+ Curl_Clear_forthismap();
}
else if(numdownloads_added && numdownloads_fail && *command_when_error)
{
- Con_DPrintf("Map downloads FAILED, executing %s\n", command_when_error);
+ Con_DPrintf("cURL downloads FAILED, executing %s\n", command_when_error);
Cbuf_AddText("\n");
Cbuf_AddText(command_when_error);
Cbuf_AddText("\n");
- Curl_Clear_forthismap(NULL);
+ Curl_Clear_forthismap();
}
}
#if defined(WIN64)
"libcurl64.dll",
#elif defined(WIN32)
+ "libcurl-4.dll",
"libcurl-3.dll",
#elif defined(MACOSX)
+ "libcurl.4.dylib", // Mac OS X Notyetreleased
"libcurl.3.dylib", // Mac OS X Tiger
"libcurl.2.dylib", // Mac OS X Panther
#else
+ "libcurl.so.4",
"libcurl.so.3",
+ "libcurl.so", // FreeBSD
#endif
NULL
};
return true;
// Load the DLL
- if (! Sys_LoadLibrary (dllnames, &curl_dll, curlfuncs))
- {
- Con_Printf ("cURL support disabled\n");
- return false;
- }
-
- Con_Printf ("cURL support enabled\n");
- return true;
+ return Sys_LoadLibrary (dllnames, &curl_dll, curlfuncs);
}
*/
static size_t CURL_fwrite(void *data, size_t size, size_t nmemb, void *vdi)
{
- fs_offset_t ret;
+ fs_offset_t ret = -1;
size_t bytes = size * nmemb;
downloadinfo *di = (downloadinfo *) vdi;
+ if(di->buffer)
+ {
+ if(di->bytes_received + bytes <= di->buffersize)
+ {
+ memcpy(di->buffer + di->bytes_received, data, bytes);
+ ret = bytes;
+ }
+ // otherwise: buffer overrun, ret stays -1
+ }
+
+ if(di->stream)
+ {
+ ret = FS_Write(di->stream, data, bytes);
+ }
+
bytes_received += bytes;
di->bytes_received += bytes;
- ret = FS_Write(di->stream, data, bytes);
-
return ret; // why not ret / nmemb?
}
}
CurlStatus;
+static void curl_default_callback(int status, size_t length_received, unsigned char *buffer, void *cbdata)
+{
+ downloadinfo *di = (downloadinfo *) cbdata;
+ switch(status)
+ {
+ case CURLCBSTATUS_OK:
+ Con_Printf("Download of %s: OK\n", di->filename);
+ break;
+ case CURLCBSTATUS_FAILED:
+ Con_Printf("Download of %s: FAILED\n", di->filename);
+ break;
+ case CURLCBSTATUS_ABORTED:
+ Con_Printf("Download of %s: ABORTED\n", di->filename);
+ break;
+ case CURLCBSTATUS_SERVERERROR:
+ Con_Printf("Download of %s: (unknown server error)\n", di->filename);
+ break;
+ case CURLCBSTATUS_UNKNOWN:
+ Con_Printf("Download of %s: (unknown client error)\n", di->filename);
+ break;
+ default:
+ Con_Printf("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_EndDownload
switch(status)
{
case CURL_DOWNLOAD_SUCCESS:
- Con_Printf("Download of %s: OK\n", di->filename);
ok = true;
+ di->callback(CURLCBSTATUS_OK, di->bytes_received, di->buffer, di->callback_data);
break;
case CURL_DOWNLOAD_FAILED:
- Con_Printf("Download of %s: FAILED\n", di->filename);
- if(error)
- Con_Printf("Reason given by libcurl: %s\n", qcurl_easy_strerror(error));
+ di->callback(CURLCBSTATUS_FAILED, di->bytes_received, di->buffer, di->callback_data);
break;
case CURL_DOWNLOAD_ABORTED:
- Con_Printf("Download of %s: ABORTED\n", di->filename);
+ di->callback(CURLCBSTATUS_ABORTED, di->bytes_received, di->buffer, di->callback_data);
break;
case CURL_DOWNLOAD_SERVERERROR:
- Con_Printf("Download of %s: %d\n", di->filename, (int) error);
-
// reopen to enforce it to have zero bytes again
- FS_Close(di->stream);
- di->stream = FS_Open(di->filename, "w", false, false);
+ if(di->stream)
+ {
+ FS_Close(di->stream);
+ di->stream = FS_OpenRealFile(di->filename, "wb", false);
+ }
+ if(di->callback)
+ di->callback(error ? (int) error : CURLCBSTATUS_SERVERERROR, di->bytes_received, di->buffer, di->callback_data);
+ break;
+ default:
+ if(di->callback)
+ di->callback(CURLCBSTATUS_UNKNOWN, di->bytes_received, di->buffer, di->callback_data);
break;
}
++numdownloads_fail;
}
Z_Free(di);
-
- Curl_CheckCommandWhenDone();
}
/*
{
if(!di->started)
{
- Con_Printf("Downloading %s -> %s", di->url, di->filename);
+ if(!di->buffer)
+ {
+ Con_Printf("Downloading %s -> %s", di->url, di->filename);
- di->stream = FS_Open(di->filename, "ab", false, false);
- if(!di->stream)
+ di->stream = FS_OpenRealFile(di->filename, "ab", false);
+ if(!di->stream)
+ {
+ Con_Printf("\nFAILED: Could not open output file %s\n", di->filename);
+ Curl_EndDownload(di, CURL_DOWNLOAD_FAILED, CURLE_OK);
+ return;
+ }
+ FS_Seek(di->stream, 0, SEEK_END);
+ di->startpos = FS_Tell(di->stream);
+
+ if(di->startpos > 0)
+ Con_Printf(", resuming from position %ld", (long) di->startpos);
+ Con_Print("...\n");
+ }
+ else
{
- Con_Printf("\nFAILED: Could not open output file %s\n", di->filename);
- Curl_EndDownload(di, CURL_DOWNLOAD_FAILED, CURLE_OK);
- return;
+ Con_DPrintf("Downloading %s -> memory\n", di->url);
+ di->startpos = 0;
}
- FS_Seek(di->stream, 0, SEEK_END);
- di->startpos = FS_Tell(di->stream);
- if(di->startpos > 0)
- Con_Printf(", resuming from position %ld", (long) di->startpos);
- Con_Print("...\n");
-
di->curle = qcurl_easy_init();
qcurl_easy_setopt(di->curle, CURLOPT_URL, di->url);
qcurl_easy_setopt(di->curle, CURLOPT_USERAGENT, engineversion);
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);
+ di = downloads;
+ }
+ else
+ di = di->next;
+ }
+}
+
/*
====================
Curl_Begin
if given) in the "dlcache/" folder.
====================
*/
-void Curl_Begin(const char *URL, const char *name, qboolean ispak, qboolean forthismap)
+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)
{
if(!curl_dll)
- return;
+ {
+ return false;
+ }
else
{
char fn[MAX_QPATH];
if(!name)
name = URL;
- 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);
-
- // already downloading the file?
+ if(!buf)
{
- downloadinfo *di = Curl_Find(fn);
- if(di)
- {
- Con_Printf("Can't download %s, already getting it from %s!\n", fn, di->url);
+ 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);
- // however, if it was not for this map yet...
- if(forthismap && !di->forthismap)
- {
- di->forthismap = true;
- // this "fakes" a download attempt so the client will wait for
- // the download to finish and then reconnect
- ++numdownloads_added;
- }
+ name = fn; // make it point back
- return;
- }
- }
-
- if(ispak && FS_FileExists(fn))
- {
- qboolean already_loaded;
- if(FS_AddPack(fn, &already_loaded, true))
+ // already downloading the file?
{
- Con_DPrintf("%s already exists, not downloading!\n", fn);
- if(already_loaded)
- Con_DPrintf("(pak was already loaded)\n");
- else
+ downloadinfo *di = Curl_Find(fn);
+ if(di)
{
- if(forthismap)
+ Con_Printf("Can't download %s, already getting it from %s!\n", fn, di->url);
+
+ // however, if it was not for this map yet...
+ if(forthismap && !di->forthismap)
{
+ di->forthismap = true;
+ // this "fakes" a download attempt so the client will wait for
+ // the download to finish and then reconnect
++numdownloads_added;
- ++numdownloads_success;
}
+
+ return false;
}
- return;
}
- else
+
+ if(ispak && FS_FileExists(fn))
{
- qfile_t *f = FS_Open(fn, "rb", false, false);
- if(f)
+ qboolean already_loaded;
+ if(FS_AddPack(fn, &already_loaded, true))
{
- 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("%s already exists, not downloading!\n", fn);
+ if(already_loaded)
+ Con_DPrintf("(pak was already loaded)\n");
+ else
{
- Con_DPrintf("Detected non-PAK %s, clearing and NOT resuming.\n", fn);
- FS_Close(f);
- f = FS_Open(fn, "w", false, false);
- if(f)
- FS_Close(f);
+ if(forthismap)
+ {
+ ++numdownloads_added;
+ ++numdownloads_success;
+ }
}
- else
+
+ return false;
+ }
+ else
+ {
+ qfile_t *f = FS_OpenVirtualFile(fn, false);
+ if(f)
{
- // OK
- FS_Close(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);
+ f = FS_OpenRealFile(fn, "wb", false);
+ if(f)
+ FS_Close(f);
+ }
+ else
+ {
+ // OK
+ FS_Close(f);
+ }
}
}
}
}
+ // if we get here, we actually want to download... so first verify the
+ // 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);
+ return false;
+ }
+
if(forthismap)
++numdownloads_added;
di = (downloadinfo *) Z_Malloc(sizeof(*di));
- strlcpy(di->filename, fn, sizeof(di->filename));
+ strlcpy(di->filename, name, sizeof(di->filename));
strlcpy(di->url, URL, sizeof(di->url));
dpsnprintf(di->referer, sizeof(di->referer), "dp://%s/", cls.netcon ? cls.netcon->address : "notconnected.invalid");
di->forthismap = forthismap;
di->prev = NULL;
if(di->next)
di->next->prev = di;
+
+ di->buffer = buf;
+ di->buffersize = bufsize;
+ if(callback == NULL)
+ {
+ di->callback = curl_default_callback;
+ di->callback_data = di;
+ }
+ else
+ {
+ di->callback = callback;
+ di->callback_data = cbdata;
+ }
+
downloads = di;
+ return true;
}
}
+qboolean Curl_Begin_ToFile(const char *URL, const char *name, qboolean ispak, qboolean forthismap)
+{
+ return Curl_Begin(URL, 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)
+{
+ return Curl_Begin(URL, NULL, false, false, buf, bufsize, callback, cbdata);
+}
/*
====================
*/
void Curl_Run()
{
+ noclear = FALSE;
+
if(!cl_curl_enabled.integer)
return;
if(!curl_dll)
return;
+ Curl_CheckCommandWhenDone();
+
if(!downloads)
return;
{
int remaining;
CURLMcode mc;
-
+
do
{
mc = qcurl_multi_perform(curlm, &remaining);
case 4: // e.g. 404?
case 5: // e.g. 500?
failed = CURL_DOWNLOAD_SERVERERROR;
- result = code;
+ result = (CURLcode) code;
break;
}
}
-
+
Curl_EndDownload(di, failed, result);
}
}
else
{
downloadinfo *di = Curl_Find(url);
- Curl_EndDownload(di, CURL_DOWNLOAD_ABORTED, CURLE_OK);
+ if(di)
+ Curl_EndDownload(di, CURL_DOWNLOAD_ABORTED, CURLE_OK);
+ else
+ Con_Print("download not found\n");
}
return;
}
char donecommand[256];
if(cls.netcon)
{
- dpsnprintf(donecommand, sizeof(donecommand), "connect %s", cls.netcon->address);
- Curl_CommandWhenDone(donecommand);
+ if(cl.loadbegun) // curling won't inhibit loading the map any more when at this stage, so bail out and force a reconnect
+ {
+ dpsnprintf(donecommand, sizeof(donecommand), "connect %s", cls.netcon->address);
+ Curl_CommandWhenDone(donecommand);
+ noclear = TRUE;
+ CL_Disconnect();
+ noclear = FALSE;
+ Curl_CheckCommandWhenDone();
+ }
+ else
+ Curl_Register_predownload();
}
- CL_Disconnect();
-
- Curl_CheckCommandWhenDone();
}
return;
}
}
needthefile:
- Curl_Begin(url, name, pak, forthismap);
+ Curl_Begin_ToFile(url, name, pak, forthismap);
+}
+
+/*
+static void curl_curlcat_callback(int code, size_t length_received, unsigned char *buffer, void *cbdata)
+{
+ Con_Printf("Received %d bytes (status %d):\n%.*s\n", (int) length_received, code, (int) length_received, buffer);
+ Z_Free(buffer);
}
+void Curl_CurlCat_f(void)
+{
+ unsigned char *buf;
+ const char *url = Cmd_Argv(1);
+ buf = Z_Malloc(16384);
+ Curl_Begin_ToMemory(url, buf, 16384, curl_curlcat_callback, NULL);
+}
+*/
+
/*
====================
Curl_Init_Commands
Cvar_RegisterVariable (&sv_curl_defaulturl);
Cvar_RegisterVariable (&sv_curl_serverpackages);
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)");
}
/*
*/
Curl_downloadinfo_t *Curl_GetDownloadInfo(int *nDownloads, const char **additional_info)
{
- int n, i;
+ int i;
downloadinfo *di;
Curl_downloadinfo_t *downinfo;
static char addinfo[128];
return NULL;
}
- n = 0;
+ i = 0;
for(di = downloads; di; di = di->next)
- ++n;
+ ++i;
- downinfo = (Curl_downloadinfo_t *) Z_Malloc(sizeof(*downinfo) * n);
+ downinfo = (Curl_downloadinfo_t *) Z_Malloc(sizeof(*downinfo) * i);
i = 0;
for(di = downloads; di; di = di->next)
{
+ // do not show infobars for background downloads
+ if(!developer.integer)
+ if(di->buffer)
+ continue;
strlcpy(downinfo[i].filename, di->filename, sizeof(downinfo[i].filename));
if(di->curle)
{
}
++i;
}
-
+
if(additional_info)
{
// TODO: can I clear command_when_done as soon as the first download fails?
if(*command_when_done && !numdownloads_fail && numdownloads_added)
{
- if(strncmp(command_when_done, "connect ", 8))
- dpsnprintf(addinfo, sizeof(addinfo), "(will do '%s' when done)", command_when_done);
- else
+ if(!strncmp(command_when_done, "connect ", 8))
dpsnprintf(addinfo, sizeof(addinfo), "(will join %s when done)", command_when_done + 8);
+ else if(!strcmp(command_when_done, "cl_begindownloads"))
+ dpsnprintf(addinfo, sizeof(addinfo), "(will enter the game when done)");
+ else
+ dpsnprintf(addinfo, sizeof(addinfo), "(will do '%s' when done)", command_when_done);
*additional_info = addinfo;
}
else
*additional_info = NULL;
}
- *nDownloads = n;
+ *nDownloads = i;
return downinfo;
}
*/
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)
char *p = buf;
char *pattern = NULL, *patternend = NULL, *url = NULL, *urlend = NULL;
qboolean eof = false;
-
+
pattern = p;
while(!eof)
{
}
p = sv_curl_serverpackages.string;
Con_DPrintf("Require all of: %s\n", p);
- while(COM_ParseTokenConsole(&p))
+ while(COM_ParseToken_Simple(&p, false, false))
{
Con_DPrintf("Require: %s\n", com_token);
Curl_RequireFile(com_token);
projects / xonotic / darkplaces.git / blobdiff