2005-02-28 07:16:19 +00:00
|
|
|
#include "quakedef.h"
|
2004-08-23 01:40:25 +00:00
|
|
|
|
|
|
|
#include "iweb.h"
|
|
|
|
|
2005-11-29 13:14:15 +00:00
|
|
|
#include "netinc.h"
|
2013-06-23 02:17:02 +00:00
|
|
|
#include "fs.h"
|
2004-08-23 01:40:25 +00:00
|
|
|
|
2013-03-12 23:09:25 +00:00
|
|
|
#if defined(WEBCLIENT)
|
2013-04-04 08:08:49 +00:00
|
|
|
|
|
|
|
#if defined(FTE_TARGET_WEB)
|
2013-05-14 18:38:42 +00:00
|
|
|
|
|
|
|
|
|
|
|
#define MYJS 1
|
|
|
|
#if MYJS
|
|
|
|
#include "web/ftejslib.h"
|
|
|
|
#else
|
2013-04-04 08:08:49 +00:00
|
|
|
#include <emscripten/emscripten.h>
|
2013-05-14 18:38:42 +00:00
|
|
|
#endif
|
2013-04-04 08:08:49 +00:00
|
|
|
|
|
|
|
static void DL_Abort(struct dl_download *dl)
|
|
|
|
{
|
|
|
|
dl->ctx = NULL;
|
|
|
|
}
|
|
|
|
static void DL_OnLoad(void *c, void *data, int datasize)
|
|
|
|
{
|
|
|
|
struct dl_download *dl = c;
|
|
|
|
|
|
|
|
//make sure the file is 'open'.
|
|
|
|
if (!dl->file)
|
|
|
|
{
|
|
|
|
if (*dl->localname)
|
|
|
|
{
|
|
|
|
FS_CreatePath(dl->localname, FS_GAME);
|
|
|
|
dl->file = FS_OpenVFS(dl->localname, "w+b", FS_GAME);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
//emscripten does not close the file. plus we seem to end up with infinite loops.
|
2013-08-07 14:20:24 +00:00
|
|
|
dl->file = FS_OpenTemp();
|
2013-04-04 08:08:49 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dl->file)
|
|
|
|
{
|
|
|
|
VFS_WRITE(dl->file, data, datasize);
|
2013-08-07 14:20:24 +00:00
|
|
|
VFS_SEEK(dl->file, 0);
|
|
|
|
dl->status = DL_FINISHED;
|
2013-04-04 08:08:49 +00:00
|
|
|
}
|
2013-08-07 14:20:24 +00:00
|
|
|
else
|
|
|
|
dl->status = DL_FAILED;
|
2013-04-04 08:08:49 +00:00
|
|
|
|
|
|
|
dl->replycode = 200;
|
2013-05-14 18:38:42 +00:00
|
|
|
#if !MYJS
|
2013-04-04 08:08:49 +00:00
|
|
|
dl->completed += datasize;
|
2013-05-14 18:38:42 +00:00
|
|
|
#endif
|
2013-04-04 08:08:49 +00:00
|
|
|
}
|
2013-05-14 18:38:42 +00:00
|
|
|
#if MYJS
|
|
|
|
static void DL_OnError(void *c, int ecode)
|
|
|
|
#else
|
2013-04-04 08:08:49 +00:00
|
|
|
static void DL_OnError(void *c)
|
2013-05-14 18:38:42 +00:00
|
|
|
#endif
|
2013-04-04 08:08:49 +00:00
|
|
|
{
|
|
|
|
struct dl_download *dl = c;
|
|
|
|
|
2013-05-14 18:38:42 +00:00
|
|
|
#if MYJS
|
|
|
|
dl->replycode = ecode;
|
|
|
|
#else
|
2013-04-04 08:08:49 +00:00
|
|
|
dl->replycode = 404; //we don't actually know. should we not do this?
|
2013-05-14 18:38:42 +00:00
|
|
|
#endif
|
2013-08-07 14:20:24 +00:00
|
|
|
Con_Printf("download %p: error %i\n", dl, dl->replycode);
|
2013-04-04 08:08:49 +00:00
|
|
|
dl->status = DL_FAILED;
|
|
|
|
}
|
2013-05-14 18:38:42 +00:00
|
|
|
static void DL_OnProgress(void *c, int position, int totalsize)
|
|
|
|
{
|
|
|
|
struct dl_download *dl = c;
|
|
|
|
dl->completed = position;
|
|
|
|
dl->totalsize = totalsize;
|
|
|
|
}
|
2013-04-04 08:08:49 +00:00
|
|
|
|
|
|
|
//this becomes a poll function. the main thread will call this once a frame or so.
|
2013-06-23 20:11:58 +00:00
|
|
|
qboolean DL_Decide(struct dl_download *dl)
|
2013-04-04 08:08:49 +00:00
|
|
|
{
|
|
|
|
const char *url = dl->redir;
|
|
|
|
if (!*url)
|
|
|
|
url = dl->url;
|
|
|
|
|
2013-10-08 14:28:11 +00:00
|
|
|
if (dl->postdata)
|
|
|
|
{
|
|
|
|
DL_Abort(dl);
|
|
|
|
return false; //safe to destroy it now
|
|
|
|
}
|
|
|
|
|
2013-04-04 08:08:49 +00:00
|
|
|
if (dl->ctx)
|
|
|
|
{
|
|
|
|
if (dl->status == DL_FAILED || dl->status == DL_FINISHED)
|
|
|
|
{
|
|
|
|
DL_Abort(dl);
|
|
|
|
return false; //safe to destroy it now
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
dl->status = DL_ACTIVE;
|
|
|
|
dl->abort = DL_Abort;
|
|
|
|
dl->ctx = dl;
|
|
|
|
|
2013-05-14 18:38:42 +00:00
|
|
|
#if MYJS
|
|
|
|
emscriptenfte_async_wget_data2(url, dl, DL_OnLoad, DL_OnError, DL_OnProgress);
|
|
|
|
#else
|
|
|
|
//annoyingly, emscripten doesn't provide an onprogress callback, unlike firefox etc, so we can't actually tell how far its got.
|
|
|
|
//we'd need to provide our own js library to fix this. it can be done, I'm just lazy.
|
2013-04-04 08:08:49 +00:00
|
|
|
emscripten_async_wget_data(url, dl, DL_OnLoad, DL_OnError);
|
2013-05-14 18:38:42 +00:00
|
|
|
#endif
|
2013-04-04 08:08:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
#elif defined(NACL)
|
2013-03-12 23:09:25 +00:00
|
|
|
#include <ppapi/c/pp_errors.h>
|
|
|
|
#include <ppapi/c/ppb_core.h>
|
|
|
|
#include <ppapi/c/pp_file_info.h>
|
|
|
|
#include <ppapi/c/ppb_file_system.h>
|
|
|
|
#include <ppapi/c/ppb_file_ref.h>
|
|
|
|
#include <ppapi/c/ppb_url_request_info.h>
|
|
|
|
#include <ppapi/c/ppb_url_response_info.h>
|
|
|
|
#include <ppapi/c/pp_var.h>
|
|
|
|
#include <ppapi/c/ppb_var.h>
|
|
|
|
#include <ppapi/c/ppb_file_io.h>
|
|
|
|
#include <ppapi/c/ppb_url_loader.h>
|
|
|
|
|
|
|
|
extern PPB_Core *ppb_core;
|
|
|
|
extern PPB_URLRequestInfo *urlrequestinfo;
|
|
|
|
extern PPB_URLLoader *urlloader;
|
|
|
|
extern PP_Instance pp_instance;
|
|
|
|
extern PPB_Var *ppb_var_interface;
|
|
|
|
|
|
|
|
struct nacl_dl {
|
|
|
|
char buffer[65536];
|
|
|
|
PP_Resource req;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void readfinished(void* user_data, int32_t result)
|
|
|
|
{
|
|
|
|
struct dl_download *f = user_data;
|
|
|
|
struct nacl_dl *ctx = f->ctx;
|
|
|
|
struct PP_CompletionCallback ccb = {readfinished, f, PP_COMPLETIONCALLBACK_FLAG_NONE};
|
|
|
|
|
|
|
|
//trying to clean up
|
|
|
|
if (!ctx)
|
|
|
|
return;
|
|
|
|
|
|
|
|
// Sys_Printf("lastresult: %i\n", result);
|
|
|
|
|
|
|
|
if (result == PP_OK)
|
|
|
|
{
|
|
|
|
// Sys_Printf("%s completed\n", f->url);
|
|
|
|
ppb_core->ReleaseResource(ctx->req);
|
|
|
|
ctx->req = 0;
|
|
|
|
|
|
|
|
f->status = DL_FINISHED;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (; result > 0; result = urlloader->ReadResponseBody(ctx->req, ctx->buffer, sizeof(ctx->buffer), ccb))
|
|
|
|
{
|
|
|
|
//make sure the file is 'open'.
|
|
|
|
if (!f->file)
|
|
|
|
{
|
|
|
|
if (*f->localname)
|
|
|
|
{
|
|
|
|
FS_CreatePath(f->localname, FS_GAME);
|
|
|
|
f->file = FS_OpenVFS(f->localname, "w+b", FS_GAME);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
f->file = FS_OpenTemp();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Sys_Printf("write: %i\n", result);
|
|
|
|
VFS_WRITE(f->file, ctx->buffer, result);
|
|
|
|
|
|
|
|
f->completed += result;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Sys_Printf("result: %i\n", result);
|
|
|
|
if (result != PP_OK_COMPLETIONPENDING)
|
|
|
|
{
|
|
|
|
Sys_Printf("file %s failed or something\n", f->url);
|
|
|
|
ppb_core->ReleaseResource(ctx->req);
|
|
|
|
ctx->req = 0;
|
|
|
|
f->status = DL_FAILED;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//urloader->open completed
|
|
|
|
static void dlstarted(void* user_data, int32_t result)
|
|
|
|
{
|
|
|
|
struct dl_download *f = user_data;
|
|
|
|
struct nacl_dl *ctx = f->ctx;
|
|
|
|
|
|
|
|
struct PP_CompletionCallback ccb = {readfinished, f, PP_COMPLETIONCALLBACK_FLAG_NONE};
|
|
|
|
readfinished(user_data, urlloader->ReadResponseBody(ctx->req, ctx->buffer, sizeof(ctx->buffer), ccb));
|
|
|
|
}
|
|
|
|
|
2013-11-06 21:55:56 +00:00
|
|
|
static void nadl_cleanup_cb(void* user_data, int32_t result)
|
2013-03-12 23:09:25 +00:00
|
|
|
{
|
|
|
|
struct nacl_dl *ctx = user_data;
|
|
|
|
|
|
|
|
if (ctx->req)
|
|
|
|
ppb_core->ReleaseResource(ctx->req);
|
|
|
|
free(ctx);
|
|
|
|
}
|
|
|
|
|
|
|
|
void NADL_Cleanup(struct dl_download *dl)
|
|
|
|
{
|
|
|
|
struct nacl_dl *ctx = dl->ctx;
|
|
|
|
|
|
|
|
//we can't free the ctx memory etc, in case the browser still has requests pending on it before it handles our close.
|
|
|
|
//so set up a callback to do it later
|
|
|
|
|
|
|
|
dl->ctx = NULL; //orphan
|
2013-11-06 21:55:56 +00:00
|
|
|
struct PP_CompletionCallback ccb = {nadl_cleanup_cb, ctx, PP_COMPLETIONCALLBACK_FLAG_NONE};
|
2013-03-12 23:09:25 +00:00
|
|
|
ppb_core->CallOnMainThread(1000, ccb, 0);
|
|
|
|
}
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
qboolean DL_Decide(struct dl_download *dl)
|
2013-03-12 23:09:25 +00:00
|
|
|
{
|
|
|
|
const char *url = dl->redir;
|
|
|
|
struct nacl_dl *ctx;
|
|
|
|
if (!*url)
|
|
|
|
url = dl->url;
|
|
|
|
|
2013-10-08 14:28:11 +00:00
|
|
|
if (dl->postdata)
|
|
|
|
{
|
2013-11-06 21:55:56 +00:00
|
|
|
NADL_Cleanup(dl);
|
2013-10-08 14:28:11 +00:00
|
|
|
return false; //safe to destroy it now
|
|
|
|
}
|
|
|
|
|
2013-03-12 23:09:25 +00:00
|
|
|
if (dl->ctx)
|
|
|
|
{
|
|
|
|
if (dl->status == DL_FAILED || dl->status == DL_FINISHED)
|
|
|
|
{
|
|
|
|
NADL_Cleanup(dl);
|
|
|
|
return false; //safe to destroy it now
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
PP_Resource dlri;
|
|
|
|
|
|
|
|
dl->status = DL_ACTIVE;
|
|
|
|
dl->abort = NADL_Cleanup;
|
|
|
|
dl->ctx = ctx = Z_Malloc(sizeof(*ctx));
|
|
|
|
|
|
|
|
/*everything goes via nacl, so we might as well just init that here*/
|
|
|
|
ctx->req = urlloader->Create(pp_instance);
|
|
|
|
dlri = urlrequestinfo->Create(pp_instance);
|
|
|
|
urlrequestinfo->SetProperty(dlri, PP_URLREQUESTPROPERTY_ALLOWCROSSORIGINREQUESTS, ppb_var_interface->VarFromUtf8(url, strlen(url)));
|
|
|
|
urlrequestinfo->SetProperty(dlri, PP_URLREQUESTPROPERTY_URL, ppb_var_interface->VarFromUtf8(url, strlen(url)));
|
|
|
|
|
|
|
|
struct PP_CompletionCallback ccb = {dlstarted, dl, PP_COMPLETIONCALLBACK_FLAG_NONE};
|
|
|
|
urlloader->Open(ctx->req, dlri, ccb);
|
|
|
|
ppb_core->ReleaseResource(dlri);
|
|
|
|
}
|
2010-03-14 14:35:56 +00:00
|
|
|
|
2013-03-12 23:09:25 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
#else
|
2013-06-23 02:17:02 +00:00
|
|
|
qboolean DL_Decide(struct dl_download *dl);
|
2010-05-01 22:47:47 +00:00
|
|
|
|
2004-08-23 01:40:25 +00:00
|
|
|
/*
|
|
|
|
This file does one thing. Connects to servers and grabs the specified file. It doesn't do any uploading whatsoever. Live with it.
|
|
|
|
It doesn't use persistant connections.
|
|
|
|
|
|
|
|
*/
|
2010-03-14 14:35:56 +00:00
|
|
|
|
|
|
|
struct http_dl_ctx_s {
|
|
|
|
struct dl_download *dlctx;
|
|
|
|
|
2013-10-08 14:28:11 +00:00
|
|
|
SOCKET sock; //FIXME: support https.
|
2010-03-14 14:35:56 +00:00
|
|
|
|
|
|
|
char *buffer;
|
|
|
|
|
|
|
|
int bufferused;
|
|
|
|
int bufferlen;
|
|
|
|
|
|
|
|
int totalreceived; //useful when we're just dumping to a file.
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
struct vfsfile_s *file; //if gzipping, this is a temporary file. we'll write to the real file from this after the transfer is complete.
|
|
|
|
qboolean gzip;
|
2010-03-14 14:35:56 +00:00
|
|
|
qboolean chunking;
|
|
|
|
int chunksize;
|
|
|
|
int chunked;
|
|
|
|
|
2013-06-23 03:59:48 +00:00
|
|
|
enum {HC_REQUESTING, HC_GETTINGHEADER, HC_GETTING} state;
|
2010-03-14 14:35:56 +00:00
|
|
|
|
|
|
|
int contentlength;
|
|
|
|
};
|
|
|
|
|
|
|
|
void HTTP_Cleanup(struct dl_download *dl)
|
|
|
|
{
|
|
|
|
struct http_dl_ctx_s *con = dl->ctx;
|
|
|
|
dl->ctx = NULL;
|
|
|
|
|
|
|
|
if (con->sock != INVALID_SOCKET)
|
|
|
|
closesocket(con->sock);
|
|
|
|
con->sock = INVALID_SOCKET;
|
|
|
|
free(con->buffer);
|
|
|
|
free(con);
|
|
|
|
|
2012-11-27 03:23:19 +00:00
|
|
|
dl->abort = NULL;
|
2010-03-14 14:35:56 +00:00
|
|
|
dl->status = DL_PENDING;
|
|
|
|
dl->completed = 0;
|
|
|
|
dl->totalsize = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ExpandBuffer(struct http_dl_ctx_s *con, int quant)
|
|
|
|
{
|
|
|
|
int newlen;
|
|
|
|
newlen = con->bufferlen + quant;
|
|
|
|
con->buffer = realloc(con->buffer, newlen);
|
|
|
|
con->bufferlen = newlen;
|
|
|
|
}
|
|
|
|
|
|
|
|
static qboolean HTTP_DL_Work(struct dl_download *dl)
|
|
|
|
{
|
|
|
|
struct http_dl_ctx_s *con = dl->ctx;
|
|
|
|
char buffer[256];
|
|
|
|
char Location[256];
|
2013-11-28 00:45:22 +00:00
|
|
|
char mimetype[256];
|
2010-03-14 14:35:56 +00:00
|
|
|
char *nl;
|
|
|
|
char *msg;
|
|
|
|
int ammount;
|
|
|
|
switch(con->state)
|
|
|
|
{
|
|
|
|
case HC_REQUESTING:
|
|
|
|
ammount = send(con->sock, con->buffer, con->bufferused, 0);
|
|
|
|
if (!ammount)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (ammount < 0)
|
|
|
|
{
|
2014-02-07 08:38:40 +00:00
|
|
|
if (neterrno() != NET_EWOULDBLOCK)
|
2010-03-14 14:35:56 +00:00
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
con->bufferused -= ammount;
|
|
|
|
memmove(con->buffer, con->buffer+ammount, con->bufferused);
|
|
|
|
if (!con->bufferused) //that's it, all sent.
|
|
|
|
con->state = HC_GETTINGHEADER;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case HC_GETTINGHEADER:
|
|
|
|
if (con->bufferlen - con->bufferused < 1530)
|
|
|
|
ExpandBuffer(con, 1530);
|
|
|
|
|
|
|
|
ammount = recv(con->sock, con->buffer+con->bufferused, con->bufferlen-con->bufferused-15, 0);
|
|
|
|
if (!ammount)
|
|
|
|
return false;
|
|
|
|
if (ammount < 0)
|
|
|
|
{
|
2014-02-07 08:38:40 +00:00
|
|
|
if (neterrno() != NET_EWOULDBLOCK)
|
2010-03-14 14:35:56 +00:00
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
con->bufferused+=ammount;
|
|
|
|
con->buffer[con->bufferused] = '\0';
|
|
|
|
//have we got the entire thing yet?
|
|
|
|
|
|
|
|
msg = con->buffer;
|
|
|
|
con->chunking = false;
|
2013-11-28 00:45:22 +00:00
|
|
|
con->contentlength = 0;
|
|
|
|
con->gzip = false;
|
|
|
|
*mimetype = 0;
|
|
|
|
*Location = 0;
|
2010-03-14 14:35:56 +00:00
|
|
|
if (strnicmp(msg, "HTTP/", 5))
|
|
|
|
{ //pre version 1. (lame servers.
|
|
|
|
con->state = HC_GETTING;
|
2010-05-01 22:47:47 +00:00
|
|
|
dl->status = DL_ACTIVE;
|
2010-03-14 14:35:56 +00:00
|
|
|
con->contentlength = -1; //meaning end of stream.
|
2013-06-23 02:17:02 +00:00
|
|
|
dl->replycode = 200;
|
2010-03-14 14:35:56 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
qboolean hcomplete = false;
|
2010-03-14 14:35:56 +00:00
|
|
|
while(*msg)
|
|
|
|
{
|
|
|
|
if (*msg == '\n')
|
|
|
|
{
|
|
|
|
if (msg[1] == '\n')
|
|
|
|
{ //tut tut, not '\r'? that's not really allowed...
|
2013-06-23 02:17:02 +00:00
|
|
|
msg+=2;
|
|
|
|
hcomplete = true;
|
2010-03-14 14:35:56 +00:00
|
|
|
break;
|
|
|
|
}
|
2013-06-23 02:17:02 +00:00
|
|
|
if (msg[1] == '\r' && msg[2] == '\n')
|
2010-03-14 14:35:56 +00:00
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
msg+=3;
|
|
|
|
hcomplete = true;
|
2010-03-14 14:35:56 +00:00
|
|
|
break;
|
|
|
|
}
|
2013-06-23 02:17:02 +00:00
|
|
|
msg++;
|
2010-03-14 14:35:56 +00:00
|
|
|
}
|
2013-06-23 02:17:02 +00:00
|
|
|
while (*msg == ' ' || *msg == '\t')
|
|
|
|
msg++;
|
|
|
|
|
|
|
|
nl = strchr(msg, '\n');
|
|
|
|
if (!nl)
|
|
|
|
break;//not complete, don't bother trying to parse it.
|
2010-03-14 14:35:56 +00:00
|
|
|
if (!strnicmp(msg, "Content-Length: ", 16))
|
|
|
|
con->contentlength = atoi(msg+16);
|
2013-11-28 00:45:22 +00:00
|
|
|
else if (!strnicmp(msg, "Content-Type:", 13))
|
|
|
|
{
|
|
|
|
*nl = '\0';
|
|
|
|
Q_strncpyz(mimetype, COM_TrimString(msg+13), sizeof(mimetype));
|
|
|
|
*nl = '\n';
|
|
|
|
}
|
2010-03-14 14:35:56 +00:00
|
|
|
else if (!strnicmp(msg, "Location: ", 10))
|
|
|
|
{
|
2013-06-23 02:17:02 +00:00
|
|
|
*nl = '\0';
|
|
|
|
Q_strncpyz(Location, COM_TrimString(msg+10), sizeof(Location));
|
|
|
|
*nl = '\n';
|
|
|
|
}
|
|
|
|
else if (!strnicmp(msg, "Content-Encoding: ", 18))
|
|
|
|
{
|
|
|
|
char *chunk = strstr(msg, "gzip");
|
|
|
|
if (chunk < nl)
|
|
|
|
con->gzip = true;
|
2010-03-14 14:35:56 +00:00
|
|
|
}
|
|
|
|
else if (!strnicmp(msg, "Transfer-Encoding: ", 19))
|
|
|
|
{
|
|
|
|
char *chunk = strstr(msg, "chunked");
|
2013-06-23 02:17:02 +00:00
|
|
|
if (chunk < nl)
|
|
|
|
con->chunking = true;
|
2010-03-14 14:35:56 +00:00
|
|
|
}
|
2013-06-23 02:17:02 +00:00
|
|
|
msg = nl;
|
2010-03-14 14:35:56 +00:00
|
|
|
}
|
2013-06-23 02:17:02 +00:00
|
|
|
if (!hcomplete)
|
|
|
|
break;//headers not complete. break out of switch
|
2010-03-14 14:35:56 +00:00
|
|
|
|
|
|
|
ammount = msg - con->buffer;
|
|
|
|
|
|
|
|
msg = COM_ParseOut(con->buffer, buffer, sizeof(buffer));
|
|
|
|
msg = COM_ParseOut(msg, buffer, sizeof(buffer));
|
2012-11-27 03:23:19 +00:00
|
|
|
|
|
|
|
dl->replycode = atoi(buffer);
|
|
|
|
|
2010-03-14 14:35:56 +00:00
|
|
|
if (!stricmp(buffer, "100"))
|
|
|
|
{ //http/1.1 servers can give this. We ignore it.
|
|
|
|
con->bufferused -= ammount;
|
|
|
|
memmove(con->buffer, con->buffer+ammount, con->bufferused);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!stricmp(buffer, "301") || !stricmp(buffer, "302") || !stricmp(buffer, "303"))
|
|
|
|
{
|
|
|
|
nl = strchr(msg, '\n');
|
|
|
|
if (nl)
|
|
|
|
*nl = '\0';
|
|
|
|
Con_Printf("HTTP: %s %s\n", buffer, COM_TrimString(msg));
|
|
|
|
if (!*Location)
|
|
|
|
Con_Printf("Server redirected to null location\n");
|
|
|
|
else
|
|
|
|
{
|
|
|
|
HTTP_Cleanup(dl);
|
2010-05-01 22:47:47 +00:00
|
|
|
if (*Location == '/')
|
|
|
|
{
|
|
|
|
char *cur = *dl->redir?dl->redir:dl->url;
|
|
|
|
char *curserver = cur;
|
|
|
|
char *curpath;
|
|
|
|
/*same server+protocol*/
|
|
|
|
if (!strncmp(curserver, "http://", 7))
|
|
|
|
curserver += 7;
|
|
|
|
curpath = strchr(curserver, '/');
|
|
|
|
if (!curpath)
|
|
|
|
curpath = curserver + strlen(curserver);
|
|
|
|
if (cur == dl->redir)
|
|
|
|
*curpath = 0;
|
|
|
|
else
|
|
|
|
Q_strncpyz(dl->redir, cur, (curpath-cur) + 1);
|
|
|
|
Q_strncatz(dl->redir, Location, sizeof(dl->redir));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
Q_strncpyz(dl->redir, Location, sizeof(dl->redir));
|
2013-06-23 02:17:02 +00:00
|
|
|
dl->poll = DL_Decide;
|
2010-05-01 22:47:47 +00:00
|
|
|
dl->status = DL_PENDING;
|
2010-03-14 14:35:56 +00:00
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (stricmp(buffer, "200"))
|
|
|
|
{
|
|
|
|
nl = strchr(msg, '\n');
|
|
|
|
if (!nl)
|
|
|
|
return false; //eh?
|
|
|
|
if (nl>msg&&nl[-1] == '\r')
|
|
|
|
nl--;
|
|
|
|
*nl = '\0';
|
|
|
|
Con_Printf("HTTP: %s%s\n", buffer, msg);
|
|
|
|
return false; //something went wrong.
|
|
|
|
}
|
|
|
|
|
|
|
|
con->bufferused -= ammount;
|
|
|
|
|
2010-05-01 22:47:47 +00:00
|
|
|
dl->totalsize = con->contentlength;
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
memmove(con->buffer, con->buffer+ammount, con->bufferused);
|
|
|
|
}
|
|
|
|
|
2013-11-28 00:45:22 +00:00
|
|
|
if (dl->notifystarted)
|
|
|
|
dl->notifystarted(dl, *mimetype?mimetype:NULL);
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
if (!dl->file)
|
|
|
|
{
|
2012-11-27 03:23:19 +00:00
|
|
|
#ifndef NPFTE
|
2013-06-23 02:17:02 +00:00
|
|
|
if (*dl->localname)
|
|
|
|
{
|
|
|
|
FS_CreatePath(dl->localname, FS_GAME);
|
|
|
|
dl->file = FS_OpenVFS(dl->localname, "w+b", FS_GAME);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
dl->file = FS_OpenTemp();
|
2012-11-27 03:23:19 +00:00
|
|
|
#endif
|
2013-06-23 02:17:02 +00:00
|
|
|
if (!dl->file)
|
|
|
|
{
|
2013-12-03 15:15:50 +00:00
|
|
|
if (*dl->localname)
|
|
|
|
Con_Printf("HTTP: Couldn't open file \"%s\"\n", dl->localname);
|
|
|
|
else
|
|
|
|
Con_Printf("HTTP: Couldn't open temporary file\n");
|
2013-06-23 02:17:02 +00:00
|
|
|
dl->status = DL_FAILED;
|
|
|
|
return false;
|
2010-03-14 14:35:56 +00:00
|
|
|
}
|
2013-06-23 02:17:02 +00:00
|
|
|
}
|
2010-03-14 14:35:56 +00:00
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
if (con->gzip)
|
|
|
|
{
|
2013-11-21 23:02:28 +00:00
|
|
|
#if !defined(NPFTE) && defined(AVAIL_ZLIB)
|
2013-06-23 02:17:02 +00:00
|
|
|
con->file = FS_OpenTemp();
|
2013-11-21 23:02:28 +00:00
|
|
|
#else
|
|
|
|
Con_Printf("HTTP: no support for gzipped files \"%s\"\n", dl->localname);
|
2013-11-28 00:45:22 +00:00
|
|
|
dl->status = DL_FAILED;
|
|
|
|
return false;
|
2013-06-23 02:17:02 +00:00
|
|
|
#endif
|
2010-03-14 14:35:56 +00:00
|
|
|
}
|
2013-06-23 02:17:02 +00:00
|
|
|
else
|
|
|
|
con->file = dl->file;
|
|
|
|
con->state = HC_GETTING;
|
|
|
|
dl->status = DL_ACTIVE;
|
2010-03-14 14:35:56 +00:00
|
|
|
//Fall through
|
|
|
|
case HC_GETTING:
|
|
|
|
if (con->bufferlen - con->bufferused < 1530)
|
|
|
|
ExpandBuffer(con, 1530);
|
|
|
|
|
|
|
|
ammount = recv(con->sock, con->buffer+con->bufferused, con->bufferlen-con->bufferused-1, 0);
|
|
|
|
if (ammount < 0)
|
|
|
|
{
|
2014-02-07 08:38:40 +00:00
|
|
|
if (neterrno() != NET_EWOULDBLOCK)
|
2010-03-14 14:35:56 +00:00
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
con->bufferused+=ammount;
|
|
|
|
|
|
|
|
if (con->chunking) //FIXME: NEEDS TESTING!!!
|
|
|
|
{
|
|
|
|
int trim;
|
|
|
|
char *nl;
|
|
|
|
con->buffer[con->bufferused] = '\0';
|
|
|
|
for(;;)
|
|
|
|
{ //work out as we go.
|
|
|
|
if (con->chunksize)//we are trying to parse a chunk.
|
|
|
|
{
|
|
|
|
trim = con->bufferused - con->chunked;
|
|
|
|
if (trim > con->chunksize)
|
|
|
|
trim = con->chunksize; //don't go into the next size field.
|
|
|
|
con->chunksize -= trim;
|
|
|
|
con->chunked += trim;
|
|
|
|
|
|
|
|
if (!con->chunksize)
|
|
|
|
{ //we need to find the next \n and trim it.
|
|
|
|
nl = strchr(con->buffer+con->chunked, '\n');
|
|
|
|
if (!nl)
|
|
|
|
break;
|
|
|
|
nl++;
|
|
|
|
trim = nl - (con->buffer+con->chunked);
|
|
|
|
memmove(con->buffer + con->chunked, nl, con->buffer+con->bufferused-nl+1);
|
|
|
|
con->bufferused -= trim;
|
|
|
|
}
|
|
|
|
if (!(con->bufferused - con->chunked))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
nl = strchr(con->buffer+con->chunked, '\n');
|
|
|
|
if (!nl)
|
|
|
|
break;
|
|
|
|
con->chunksize = strtol(con->buffer+con->chunked, NULL, 16); //it's hex.
|
|
|
|
nl++;
|
|
|
|
trim = nl - (con->buffer+con->chunked);
|
|
|
|
memmove(con->buffer + con->chunked, nl, con->buffer+con->bufferused-nl+1);
|
|
|
|
con->bufferused -= trim;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
con->totalreceived+=con->chunked;
|
2013-06-23 02:17:02 +00:00
|
|
|
if (con->file && con->chunked) //we've got a chunk in the buffer
|
2010-03-14 14:35:56 +00:00
|
|
|
{ //write it
|
2013-06-23 02:17:02 +00:00
|
|
|
if (VFS_WRITE(con->file, con->buffer, con->chunked) != con->chunked)
|
2010-03-14 14:35:56 +00:00
|
|
|
{
|
|
|
|
Con_Printf("Write error whilst downloading %s\nDisk full?\n", dl->localname);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
//and move the unparsed chunk to the front.
|
|
|
|
con->bufferused -= con->chunked;
|
|
|
|
memmove(con->buffer, con->buffer+con->chunked, con->bufferused);
|
|
|
|
con->chunked = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
con->totalreceived+=ammount;
|
2013-06-23 02:17:02 +00:00
|
|
|
if (con->file) //we've got a chunk in the buffer
|
2010-03-14 14:35:56 +00:00
|
|
|
{ //write it
|
2013-06-23 02:17:02 +00:00
|
|
|
if (VFS_WRITE(con->file, con->buffer, con->bufferused) != con->bufferused)
|
2010-03-14 14:35:56 +00:00
|
|
|
{
|
|
|
|
Con_Printf("Write error whilst downloading %s\nDisk full?\n", dl->localname);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
con->bufferused = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!ammount)
|
|
|
|
{ //server closed off the connection.
|
|
|
|
if (con->chunksize)
|
|
|
|
dl->status = DL_FAILED;
|
|
|
|
else
|
2013-06-23 02:17:02 +00:00
|
|
|
{
|
2013-11-21 23:02:28 +00:00
|
|
|
#if !defined(NPFTE) && defined(AVAIL_ZLIB)
|
2013-06-23 02:17:02 +00:00
|
|
|
if (con->gzip)
|
|
|
|
{
|
|
|
|
VFS_SEEK(con->file, 0);
|
|
|
|
dl->file = FS_DecompressGZip(con->file, dl->file);
|
|
|
|
con->file = NULL;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
dl->status = (dl->replycode == 200)?DL_FINISHED:DL_FAILED;
|
|
|
|
}
|
2010-03-14 14:35:56 +00:00
|
|
|
return false;
|
|
|
|
}
|
2010-05-01 22:47:47 +00:00
|
|
|
dl->completed = con->totalreceived;
|
2010-03-14 14:35:56 +00:00
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void HTTPDL_Establish(struct dl_download *dl)
|
|
|
|
{
|
|
|
|
unsigned long _true = true;
|
2012-11-27 03:23:19 +00:00
|
|
|
struct sockaddr_qstorage serveraddr;
|
2010-03-14 14:35:56 +00:00
|
|
|
struct http_dl_ctx_s *con;
|
2012-11-27 03:23:19 +00:00
|
|
|
int addressfamily;
|
|
|
|
int addresssize;
|
2010-03-14 14:35:56 +00:00
|
|
|
|
|
|
|
char server[128];
|
|
|
|
char uri[MAX_OSPATH];
|
|
|
|
char *slash;
|
|
|
|
const char *url = dl->redir;
|
|
|
|
if (!*url)
|
|
|
|
url = dl->url;
|
|
|
|
|
|
|
|
if (!strnicmp(url, "http://", 7))
|
|
|
|
url+=7;
|
|
|
|
|
|
|
|
slash = strchr(url, '/');
|
|
|
|
if (!slash)
|
|
|
|
{
|
|
|
|
Q_strncpyz(server, url, sizeof(server));
|
|
|
|
Q_strncpyz(uri, "/", sizeof(uri));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
Q_strncpyz(uri, slash, sizeof(uri));
|
|
|
|
Q_strncpyz(server, url, sizeof(server));
|
|
|
|
server[slash-url] = '\0';
|
|
|
|
}
|
|
|
|
|
|
|
|
con = malloc(sizeof(*con));
|
|
|
|
memset(con, 0, sizeof(*con));
|
|
|
|
dl->ctx = con;
|
2012-11-27 03:23:19 +00:00
|
|
|
dl->abort = HTTP_Cleanup;
|
|
|
|
|
|
|
|
dl->status = DL_RESOLVING;
|
2010-03-14 14:35:56 +00:00
|
|
|
|
2012-11-27 03:23:19 +00:00
|
|
|
if (!NET_StringToSockaddr(server, 80, &serveraddr, &addressfamily, &addresssize))
|
2010-03-14 14:35:56 +00:00
|
|
|
{
|
|
|
|
dl->status = DL_FAILED;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
dl->status = DL_QUERY;
|
|
|
|
|
2012-11-27 03:23:19 +00:00
|
|
|
if ((con->sock = socket (addressfamily, SOCK_STREAM, IPPROTO_TCP)) == -1)
|
|
|
|
{
|
|
|
|
dl->status = DL_FAILED;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
//don't bother binding. its optional.
|
|
|
|
|
2010-03-14 14:35:56 +00:00
|
|
|
//not yet blocking.
|
2012-11-27 03:23:19 +00:00
|
|
|
if (connect(con->sock, (struct sockaddr *)&serveraddr, addresssize) == -1)
|
2010-03-14 14:35:56 +00:00
|
|
|
{
|
2014-03-30 08:55:06 +00:00
|
|
|
int err = neterrno();
|
|
|
|
switch(err)
|
|
|
|
{
|
|
|
|
case NET_EACCES:
|
|
|
|
Con_Printf("HTTP: connect(%s): access denied. Check firewall.\n", server);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
Con_Printf("HTTP: connect(%s): %s", server, strerror(neterrno()));
|
|
|
|
break;
|
|
|
|
}
|
2010-03-14 14:35:56 +00:00
|
|
|
dl->status = DL_FAILED;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ioctlsocket (con->sock, FIONBIO, &_true) == -1) //now make it non blocking.
|
|
|
|
{
|
|
|
|
dl->status = DL_FAILED;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-10-08 14:28:11 +00:00
|
|
|
if (dl->postdata)
|
|
|
|
{
|
|
|
|
ExpandBuffer(con, 1024 + strlen(uri) + strlen(server) + strlen(con->dlctx->postmimetype) + dl->postlen);
|
|
|
|
Q_snprintfz(con->buffer, con->bufferlen,
|
|
|
|
"POST %s HTTP/1.1\r\n"
|
|
|
|
"Host: %s\r\n"
|
2014-03-30 00:39:37 +00:00
|
|
|
"Content-Length: %u\r\n"
|
2013-10-08 14:28:11 +00:00
|
|
|
"Content-Type: %s\r\n"
|
|
|
|
"Connection: close\r\n"
|
2013-11-21 23:02:28 +00:00
|
|
|
#if !defined(NPFTE) && defined(AVAIL_ZLIB)
|
2013-10-08 14:28:11 +00:00
|
|
|
"Accept-Encoding: gzip\r\n"
|
|
|
|
#endif
|
|
|
|
"User-Agent: "FULLENGINENAME"\r\n"
|
2014-03-30 00:39:37 +00:00
|
|
|
"\r\n", uri, server, (unsigned int)dl->postlen, dl->postmimetype);
|
2013-10-08 14:28:11 +00:00
|
|
|
con->bufferused = strlen(con->buffer);
|
|
|
|
memcpy(con->buffer + con->bufferused, dl->postdata, dl->postlen);
|
|
|
|
con->bufferused += dl->postlen;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ExpandBuffer(con, 512*1024);
|
|
|
|
Q_snprintfz(con->buffer, con->bufferlen,
|
|
|
|
"GET %s HTTP/1.1\r\n"
|
|
|
|
"Host: %s\r\n"
|
|
|
|
"Connection: close\r\n"
|
2013-11-21 23:02:28 +00:00
|
|
|
#if !defined(NPFTE) && defined(AVAIL_ZLIB)
|
2013-10-08 14:28:11 +00:00
|
|
|
"Accept-Encoding: gzip\r\n"
|
|
|
|
#endif
|
|
|
|
"User-Agent: "FULLENGINENAME"\r\n"
|
|
|
|
"\r\n", uri, server);
|
|
|
|
con->bufferused = strlen(con->buffer);
|
|
|
|
}
|
2010-03-14 14:35:56 +00:00
|
|
|
con->contentlength = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
qboolean HTTPDL_Poll(struct dl_download *dl)
|
|
|
|
{
|
|
|
|
/*failed previously*/
|
|
|
|
if (dl->status == DL_FAILED)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (!dl->ctx)
|
|
|
|
{
|
|
|
|
HTTPDL_Establish(dl);
|
|
|
|
if (dl->status == DL_FAILED)
|
|
|
|
{
|
|
|
|
HTTP_Cleanup(dl);
|
2010-03-25 22:56:11 +00:00
|
|
|
dl->status = DL_FAILED;
|
2010-03-14 14:35:56 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dl->ctx)
|
|
|
|
{
|
2010-05-01 22:47:47 +00:00
|
|
|
if (!HTTP_DL_Work(dl))
|
|
|
|
if (dl->status != DL_FINISHED)
|
|
|
|
dl->status = DL_FAILED;
|
2010-03-14 14:35:56 +00:00
|
|
|
if (dl->status == DL_FAILED)
|
|
|
|
{
|
|
|
|
HTTP_Cleanup(dl);
|
2010-03-25 22:56:11 +00:00
|
|
|
dl->status = DL_FAILED;
|
2010-03-14 14:35:56 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (dl->status == DL_FINISHED)
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2013-06-23 02:17:02 +00:00
|
|
|
qboolean DL_Decide(struct dl_download *dl)
|
2010-03-14 14:35:56 +00:00
|
|
|
{
|
|
|
|
const char *url = dl->redir;
|
|
|
|
if (!*url)
|
|
|
|
url = dl->url;
|
|
|
|
|
|
|
|
if (!strnicmp(url, "http://", 7))
|
|
|
|
dl->poll = HTTPDL_Poll;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
dl->status = DL_FAILED;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
2013-03-12 23:09:25 +00:00
|
|
|
#endif /*!defined(NACL)*/
|
2010-03-14 14:35:56 +00:00
|
|
|
|
|
|
|
#ifdef MULTITHREAD
|
|
|
|
static int DL_Thread_Work(void *arg)
|
|
|
|
{
|
|
|
|
struct dl_download *dl = arg;
|
|
|
|
|
|
|
|
while (!dl->threaddie)
|
|
|
|
{
|
|
|
|
if (!dl->poll(dl))
|
|
|
|
{
|
2012-11-27 03:23:19 +00:00
|
|
|
#ifdef NPFTE
|
|
|
|
//the plugin doesn't have a download loop
|
2013-11-28 00:45:22 +00:00
|
|
|
if (dl->notifycomplete)
|
|
|
|
dl->notifycomplete(dl);
|
2010-03-14 14:35:56 +00:00
|
|
|
if (dl->file)
|
|
|
|
VFS_CLOSE(dl->file);
|
2012-11-27 03:23:19 +00:00
|
|
|
#else
|
|
|
|
if (dl->status != DL_FAILED && dl->status != DL_FINISHED)
|
|
|
|
dl->status = DL_FAILED;
|
|
|
|
#endif
|
2010-03-14 14:35:56 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*create a thread to perform the given download
|
|
|
|
to use: call DL_Create (not HTTP_CL_Get!) to get a context, then call this.
|
|
|
|
note that you need to call DL_Close from another thread, NOT IN THE NOTIFY FUNC.
|
|
|
|
the file handle must be safe to write to in threads.
|
|
|
|
*/
|
|
|
|
qboolean DL_CreateThread(struct dl_download *dl, vfsfile_t *file, void (*NotifyFunction)(struct dl_download *dl))
|
|
|
|
{
|
|
|
|
if (!dl)
|
|
|
|
return false;
|
|
|
|
|
------------------------------------------------------------------------
r4169 | acceptthis | 2013-01-17 08:55:12 +0000 (Thu, 17 Jan 2013) | 31 lines
removed MAX_VISEDICTS limit.
PEXT2_REPLACEMENTDELTAS tweaked, now has 4 million entity limit. still not enabled by default.
TE_BEAM now maps to a separate TEQW_BEAM to avoid conflicts with QW.
added android multitouch emulation for windows/rawinput (in_simulatemultitouch).
split topcolor/bottomcolor from scoreboard, for dp's colormap|1024 feature.
now using utf-8 for windows consoles.
qcc warnings/errors now give clickable console links for quick+easy editing.
disabled menutint when the currently active item changes contrast or gamma (for OneManClan).
Added support for drawfont/drawfontscale.
tweaked the qcvm a little to reduce the number of pointers.
.doll file loading. still experimental and will likely crash. requires csqc active, even if its a dummy progs. this will be fixed in time. Still other things that need cleaning up.
windows: gl_font "?" shows the standard windows font-selection dialog, and can be used to select windows fonts. not all work. and you probably don't want to use windings.
fixed splitscreen support when playing mvds. added mini-scoreboards to splitscreen.
editor/debugger now shows asm if there's no linenumber info. also, pressing f1 for help shows the shortcuts.
Added support for .framegroups files for psk(psa) and iqm formats.
True support for ezquake's colour codes. Mutually exclusive with background colours.
path command output slightly more readable.
added support for digest_hex (MD4, SHA1, CRC16).
skingroups now colourmap correctly.
Fix terrain colour hints, and litdata from the wrong bsp.
fix ftp dual-homed issue. support epsv command, and enable ipv6 (eprt still not supported).
remove d3d11 compilation from the makefile. the required headers are not provided by mingw, and are not available to the build bot, so don't bother.
fix v *= v.x and similar opcodes.
fteqcc: fixed support for áéÃóú type chars in names. utf-8 files now properly supported (even with the utf-8 bom/identifier). utf-16 also supported.
fteqcc: fixed '#if 1 == 3 && 4' parsing.
fteqcc: -Werror acts on the warning, rather than as a separate error. Line numbers are thus more readable.
fteqcc: copyright message now includes compile date instead.
fteqccgui: the treeview control is now coloured depending on whether there were warnings/errors in the last compile.
fteqccgui: the output window is now focused and scrolls down as compilation progresses.
pr_dumpplatform command dumps out some pragmas to convert more serious warnings to errors. This is to avoid the infamous 'fteqcc sucks cos my code sucks' issue.
rewrote prespawn/modelist/soundlist code. server tracks progress now.
------------------------------------------------------------------------
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4167 fc73d0e0-1445-4013-8a0c-d673dee63da5
2013-03-12 22:29:40 +00:00
|
|
|
if (file)
|
|
|
|
dl->file = file;
|
|
|
|
if (NotifyFunction)
|
2013-11-28 00:45:22 +00:00
|
|
|
dl->notifycomplete = NotifyFunction;
|
2010-03-14 14:35:56 +00:00
|
|
|
|
2012-11-29 13:37:48 +00:00
|
|
|
dl->threadctx = Sys_CreateThread("download", DL_Thread_Work, dl, THREADP_NORMAL, 0);
|
2010-03-14 14:35:56 +00:00
|
|
|
if (!dl->threadctx)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*create a standalone download context*/
|
|
|
|
struct dl_download *DL_Create(const char *url)
|
|
|
|
{
|
|
|
|
struct dl_download *newdl;
|
|
|
|
newdl = malloc(sizeof(*newdl));
|
|
|
|
if (!newdl)
|
|
|
|
return NULL;
|
|
|
|
memset(newdl, 0, sizeof(*newdl));
|
|
|
|
Q_strncpyz(newdl->url, url, sizeof(newdl->url));
|
2013-06-23 02:17:02 +00:00
|
|
|
newdl->poll = DL_Decide;
|
2010-03-14 14:35:56 +00:00
|
|
|
|
2013-05-03 04:28:08 +00:00
|
|
|
if (!newdl->poll(newdl))
|
|
|
|
{
|
|
|
|
free(newdl);
|
|
|
|
newdl = NULL;
|
|
|
|
}
|
|
|
|
|
2010-03-14 14:35:56 +00:00
|
|
|
return newdl;
|
|
|
|
}
|
2013-03-12 23:09:25 +00:00
|
|
|
static struct dl_download *showndownload;
|
|
|
|
|
2010-03-14 14:35:56 +00:00
|
|
|
/*destroys an entire download context*/
|
|
|
|
void DL_Close(struct dl_download *dl)
|
|
|
|
{
|
2013-03-12 23:09:25 +00:00
|
|
|
#ifndef NPFTE
|
|
|
|
if (showndownload == dl)
|
|
|
|
{
|
|
|
|
if (cls.downloadmethod == DL_HTTP)
|
|
|
|
{
|
|
|
|
cls.downloadmethod = DL_NONE;
|
|
|
|
*cls.downloadlocalname = *cls.downloadremotename = 0;
|
|
|
|
}
|
|
|
|
showndownload = NULL;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2010-03-14 14:35:56 +00:00
|
|
|
#ifdef MULTITHREAD
|
|
|
|
dl->threaddie = true;
|
|
|
|
if (dl->threadctx)
|
|
|
|
Sys_WaitOnThread(dl->threadctx);
|
|
|
|
#endif
|
|
|
|
if (dl->abort)
|
|
|
|
dl->abort(dl);
|
|
|
|
if (dl->file)
|
|
|
|
VFS_CLOSE(dl->file);
|
2013-10-08 14:28:11 +00:00
|
|
|
if (dl->postdata)
|
|
|
|
BZ_Free(dl->postdata);
|
2010-03-14 14:35:56 +00:00
|
|
|
free(dl);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-11-27 03:23:19 +00:00
|
|
|
/*updates pending downloads*/
|
|
|
|
#ifndef NPFTE
|
|
|
|
|
2010-03-14 14:35:56 +00:00
|
|
|
static struct dl_download *activedownloads;
|
2012-11-27 03:23:19 +00:00
|
|
|
unsigned int shownbytestart;
|
2013-11-28 00:45:22 +00:00
|
|
|
/*create a download context and add it to the list, for lazy people. not threaded*/
|
2010-03-14 14:35:56 +00:00
|
|
|
struct dl_download *HTTP_CL_Get(const char *url, const char *localfile, void (*NotifyFunction)(struct dl_download *dl))
|
|
|
|
{
|
|
|
|
struct dl_download *newdl = DL_Create(url);
|
|
|
|
if (!newdl)
|
|
|
|
return newdl;
|
|
|
|
|
2013-11-28 00:45:22 +00:00
|
|
|
newdl->notifycomplete = NotifyFunction;
|
2010-03-25 22:56:11 +00:00
|
|
|
if (localfile)
|
|
|
|
Q_strncpyz(newdl->localname, localfile, sizeof(newdl->localname));
|
2010-03-14 14:35:56 +00:00
|
|
|
|
|
|
|
newdl->next = activedownloads;
|
|
|
|
activedownloads = newdl;
|
2012-11-27 03:23:19 +00:00
|
|
|
|
2010-03-14 14:35:56 +00:00
|
|
|
return newdl;
|
|
|
|
}
|
|
|
|
|
2013-10-08 14:28:11 +00:00
|
|
|
struct dl_download *HTTP_CL_Put(const char *url, const char *mime, const char *data, size_t datalen, void (*NotifyFunction)(struct dl_download *dl))
|
|
|
|
{
|
|
|
|
struct dl_download *dl;
|
|
|
|
if (!*mime)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
dl = HTTP_CL_Get(url, NULL, NotifyFunction);
|
|
|
|
Q_strncpyz(dl->postmimetype, mime, sizeof(dl->postmimetype));
|
|
|
|
dl->postdata = BZ_Malloc(datalen);
|
|
|
|
memcpy(dl->postdata, data, datalen);
|
|
|
|
dl->postlen = datalen;
|
|
|
|
return dl;
|
|
|
|
}
|
|
|
|
|
2010-03-14 14:35:56 +00:00
|
|
|
void HTTP_CL_Think(void)
|
|
|
|
{
|
2013-03-12 23:09:25 +00:00
|
|
|
struct dl_download *dl = activedownloads;
|
2010-03-14 14:35:56 +00:00
|
|
|
struct dl_download **link = NULL;
|
|
|
|
|
|
|
|
link = &activedownloads;
|
|
|
|
while (*link)
|
|
|
|
{
|
2013-03-12 23:09:25 +00:00
|
|
|
dl = *link;
|
2012-11-27 03:23:19 +00:00
|
|
|
#ifdef MULTITHREAD
|
2013-03-12 23:09:25 +00:00
|
|
|
if (dl->threadctx)
|
2012-11-27 03:23:19 +00:00
|
|
|
{
|
2013-03-12 23:09:25 +00:00
|
|
|
if (dl->status == DL_FINISHED || dl->status == DL_FAILED)
|
2012-11-27 03:23:19 +00:00
|
|
|
{
|
2013-03-12 23:09:25 +00:00
|
|
|
Sys_WaitOnThread(dl->threadctx);
|
|
|
|
dl->threadctx = NULL;
|
2012-11-27 03:23:19 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
2013-03-12 23:09:25 +00:00
|
|
|
if (!dl->poll(dl))
|
2010-03-14 14:35:56 +00:00
|
|
|
{
|
2013-03-12 23:09:25 +00:00
|
|
|
*link = dl->next;
|
2013-11-28 00:45:22 +00:00
|
|
|
if (dl->file && dl->file->Seek)
|
2013-03-12 23:09:25 +00:00
|
|
|
VFS_SEEK(dl->file, 0);
|
2013-11-28 00:45:22 +00:00
|
|
|
if (dl->notifycomplete)
|
|
|
|
dl->notifycomplete(dl);
|
2013-03-12 23:09:25 +00:00
|
|
|
DL_Close(dl);
|
2010-03-14 14:35:56 +00:00
|
|
|
continue;
|
|
|
|
}
|
2013-03-12 23:09:25 +00:00
|
|
|
link = &dl->next;
|
2010-03-14 14:35:56 +00:00
|
|
|
|
2013-03-12 23:09:25 +00:00
|
|
|
if (!cls.downloadmethod)
|
2010-03-14 14:35:56 +00:00
|
|
|
{
|
|
|
|
cls.downloadmethod = DL_HTTP;
|
2013-03-12 23:09:25 +00:00
|
|
|
showndownload = dl;
|
|
|
|
if (*dl->localname)
|
|
|
|
strcpy(cls.downloadlocalname, dl->localname);
|
|
|
|
else
|
|
|
|
strcpy(cls.downloadlocalname, dl->url);
|
|
|
|
strcpy(cls.downloadremotename, dl->url);
|
2012-11-27 03:23:19 +00:00
|
|
|
cls.downloadstarttime = Sys_DoubleTime();
|
|
|
|
cls.downloadedbytes = 0;
|
2013-03-12 23:09:25 +00:00
|
|
|
shownbytestart = dl->completed;
|
2010-03-14 14:35:56 +00:00
|
|
|
}
|
|
|
|
if (cls.downloadmethod == DL_HTTP)
|
|
|
|
{
|
2013-03-12 23:09:25 +00:00
|
|
|
if (showndownload == dl)
|
2010-03-14 14:35:56 +00:00
|
|
|
{
|
2013-03-12 23:09:25 +00:00
|
|
|
if (dl->status == DL_FINISHED)
|
2010-03-14 14:35:56 +00:00
|
|
|
cls.downloadpercent = 100;
|
2013-03-12 23:09:25 +00:00
|
|
|
else if (dl->status != DL_ACTIVE)
|
2010-03-14 14:35:56 +00:00
|
|
|
cls.downloadpercent = 0;
|
2013-03-12 23:09:25 +00:00
|
|
|
else if (dl->totalsize <= 0)
|
2010-03-14 14:35:56 +00:00
|
|
|
cls.downloadpercent = 50;
|
|
|
|
else
|
2013-03-12 23:09:25 +00:00
|
|
|
cls.downloadpercent = dl->completed*100.0f/dl->totalsize;
|
|
|
|
cls.downloadedbytes = dl->completed;
|
2010-03-14 14:35:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-11-27 03:23:19 +00:00
|
|
|
#endif
|
2010-03-14 14:35:56 +00:00
|
|
|
#endif /*WEBCLIENT*/
|
2013-11-28 00:45:22 +00:00
|
|
|
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
vfsfile_t funcs;
|
|
|
|
|
|
|
|
char *data;
|
|
|
|
int maxlen;
|
|
|
|
int writepos;
|
|
|
|
int readpos;
|
|
|
|
} vfspipe_t;
|
|
|
|
|
2014-03-30 08:55:06 +00:00
|
|
|
static qboolean QDECL VFSPIPE_Close(vfsfile_t *f)
|
2013-11-28 00:45:22 +00:00
|
|
|
{
|
|
|
|
vfspipe_t *p = (vfspipe_t*)f;
|
|
|
|
free(p->data);
|
|
|
|
free(p);
|
2014-03-30 08:55:06 +00:00
|
|
|
return true;
|
2013-11-28 00:45:22 +00:00
|
|
|
}
|
2014-03-30 08:55:06 +00:00
|
|
|
static qofs_t QDECL VFSPIPE_GetLen(vfsfile_t *f)
|
2013-11-28 00:45:22 +00:00
|
|
|
{
|
|
|
|
vfspipe_t *p = (vfspipe_t*)f;
|
|
|
|
return p->writepos - p->readpos;
|
|
|
|
}
|
2014-03-30 08:55:06 +00:00
|
|
|
//static unsigned long QDECL VFSPIPE_Tell(vfsfile_t *f)
|
2013-11-28 00:45:22 +00:00
|
|
|
//{
|
|
|
|
// return 0;
|
|
|
|
//}
|
2014-03-30 08:55:06 +00:00
|
|
|
//static qboolean QDECL VFSPIPE_Seek(vfsfile_t *f, unsigned long offset)
|
2013-11-28 00:45:22 +00:00
|
|
|
//{
|
|
|
|
// Con_Printf("Seeking is a bad plan, mmkay?\n");
|
|
|
|
// return false;
|
|
|
|
//}
|
2014-03-30 08:55:06 +00:00
|
|
|
static int QDECL VFSPIPE_ReadBytes(vfsfile_t *f, void *buffer, int len)
|
2013-11-28 00:45:22 +00:00
|
|
|
{
|
|
|
|
vfspipe_t *p = (vfspipe_t*)f;
|
|
|
|
if (len > p->writepos - p->readpos)
|
|
|
|
len = p->writepos - p->readpos;
|
|
|
|
memcpy(buffer, p->data+p->readpos, len);
|
|
|
|
p->readpos += len;
|
|
|
|
|
|
|
|
if (p->readpos > 8192)
|
|
|
|
{
|
|
|
|
//shift the memory down periodically
|
|
|
|
//fixme: use cyclic buffer? max size, etc?
|
|
|
|
memmove(p->data, p->data+p->readpos, p->writepos-p->readpos);
|
|
|
|
|
|
|
|
p->writepos -= p->readpos;
|
|
|
|
p->readpos = 0;
|
|
|
|
}
|
|
|
|
return len;
|
|
|
|
}
|
2014-03-30 08:55:06 +00:00
|
|
|
static int QDECL VFSPIPE_WriteBytes(vfsfile_t *f, const void *buffer, int len)
|
2013-11-28 00:45:22 +00:00
|
|
|
{
|
|
|
|
vfspipe_t *p = (vfspipe_t*)f;
|
|
|
|
if (p->writepos + len > p->maxlen)
|
|
|
|
{
|
|
|
|
p->maxlen = p->writepos + len;
|
|
|
|
p->data = realloc(p->data, p->maxlen);
|
|
|
|
}
|
|
|
|
memcpy(p->data+p->writepos, buffer, len);
|
|
|
|
p->writepos += len;
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
vfsfile_t *VFSPIPE_Open(void)
|
|
|
|
{
|
|
|
|
vfspipe_t *newf;
|
|
|
|
newf = malloc(sizeof(*newf));
|
|
|
|
newf->data = NULL;
|
|
|
|
newf->maxlen = 0;
|
|
|
|
newf->readpos = 0;
|
|
|
|
newf->writepos = 0;
|
|
|
|
newf->funcs.Close = VFSPIPE_Close;
|
|
|
|
newf->funcs.Flush = NULL;
|
|
|
|
newf->funcs.GetLen = VFSPIPE_GetLen;
|
|
|
|
newf->funcs.ReadBytes = VFSPIPE_ReadBytes;
|
|
|
|
newf->funcs.Seek = NULL;//VFSPIPE_Seek;
|
|
|
|
newf->funcs.Tell = NULL;//VFSPIPE_Tell;
|
|
|
|
newf->funcs.WriteBytes = VFSPIPE_WriteBytes;
|
|
|
|
newf->funcs.seekingisabadplan = true;
|
|
|
|
|
|
|
|
return &newf->funcs;
|
|
|
|
}
|