update to bank's libcurl integration

Make sure you've already installed bank's libcurl integration from here. This resource compiles many of the fixes noted in the comments of that resource, plus adds my own fixes to deal with the Torque Memory Manager and enable use of cookies and form post data from script. I *strongly* recommend the use of Harold "Labrat" Brown's Torquescript urlencode function when working with form data.

[Edit: I should mention that these changes have been tested with TGE 1.5. If you have a different engine version there might be slight differences in how you should go about implementing these. It's probably worth reading through the comment thread for inspiration]

In simCurl.h, find

S32 perform();
		bool isEOF() const;
		void setCancelDownload();

before this add

void setCookieJar(const char *filename);
		void loadCookieFile(const char *filename);
		void addPostField(const char* fieldname, const char* fielddata);

Find,

char url[256];
		char pbuf[64];
		char login[32];
		char password[32];
		char cbProgress[128];
		char cbFinish[128];
		char cbFailed[128];

before this add

bool post;
		struct curl_httppost *formpost;
		struct curl_httppost *lastptr;

Next, in simCurl.cc, find

if(ptr != simcurl->storagedesc.mem.ptr)
		{
			((MemStream*)(s))->~MemStream();
			new(s) MemStream(nsz, ptr);
			s->setPosition(p);
		}

and replace it with

if(ptr != simcurl->storagedesc.mem.ptr)
		{
			((MemStream*)(s))->~MemStream();
			#undef new
			new(s) MemStream(nsz, ptr);
			#if !defined(TORQUE_DISABLE_MEMORY_MANAGER)
			#define new new(__FILE__, __LINE__)
			#endif
			s->setPosition(p);
		}

This will save you blood, sweat, and tears while trying to compile the libcurl integration in MANY environments when Torque Memory Manager is enabled.

Next, ensure that your SimCurl::threadFunction looks like this

void SimCurl::threadFunction(S32 n)
{
	(void)n;
	while(_G.head)
	{
		_G.head->perform();
		Mutex::lockMutex(_G.mutex);
		if (_G.head) 
			_G.head = _G.head->next;
		Mutex::unlockMutex(_G.mutex);
	}
}

Next, find

url[0] = 0;
	pbuf[0] = 0;
	login[0] = 0;
	password[0] = 0;

before it, add

post = false

Find

resumeFrom = 0;
	status = false;
	next = NULL;

After it, add

formpost = NULL;	//added by thomas
	lastptr = NULL;		//added by thomas

Find SimCurl::~SimCurl and replace it with this

SimCurl::~SimCurl()
{
	curl_formfree(formpost);

	
	if(storagedesc.mem.ptr && SIMCURL_STORAGE_BUFFER)
		dFree(storagedesc.mem.ptr);
	
	if (_G.head)  
		_G.head = NULL; 
}

Next, find

void SimCurl::setFileName(const char *filename)

Before it, add

void SimCurl::setCookieJar(const char *filename){
	if(isRunning()) { Con::errorf("Already running:");
		return;
	}
	curl_easy_setopt(curl, CURLOPT_COOKIEJAR, filename);
}

void SimCurl::loadCookieFile(const char *filename){
	if(isRunning()) { Con::errorf("Already running:");
		return;
	}
	curl_easy_setopt(curl, CURLOPT_COOKIEFILE, filename);
}

Find

void SimCurl::setUploadFlag(bool flag)
{
	if(isRunning()) { Con::errorf("Already running:");
		return;
	}
	upload = flag;
}

before it, add

void SimCurl::addPostField(const char *fieldname, const char *fielddata){
	if(isRunning()) { Con::errorf("Already running:");
		return;
	}
	post = true;
	curl_formadd(&formpost, &lastptr, CURLFORM_COPYNAME,  fieldname, CURLFORM_COPYCONTENTS, fielddata, CURLFORM_CONTENTSLENGTH, dStrlen(fielddata), CURLFORM_END);
}

find and replace all instances of

ret = CURLE_OBSOLETE4;

with

CURLE_URL_MALFORMAT_USER;

and all instance of

ret = CURLE_OBSOLETE10;

with

ret = CURLE_FTP_USER_PASSWORD_INCORRECT;

Find

if(resumeFrom>0)
         curl_easy_setopt(curl, CURLOPT_RESUME_FROM, resumeFrom);
      curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false);
      curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, &curl_progress_callback);
      curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, this);

after it, add

if(post) curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);

If your *SimCurl::readLine begins like this

const U8 *SimCurl::readLine()
{
	U8 *tokPos = storagedesc.mem.c;
	U8 *b = tokPos;

change it to begin like this

const U8 *SimCurl::readLine()
{
	if(!storagedesc.mem.ptr)  
    {  
       static U8 retBuf[1] = "";  
       storagedesc.mem.ptr = NULL;  
       storagedesc.mem.size = 0;  
       storagedesc.mem.c = NULL;  
       storagedesc.mem.rsize = 0;  
       return &retBuf[0];  
    }  
	storagedesc.mem.c[storagedesc.mem.rsize] = 0;
	
	U8 *tokPos = storagedesc.mem.c;
	U8 *b = tokPos;

Finally, find

ConsoleMethod(SimCurl, setUploadFlag, void, 3, 3, "") { object->setUploadFlag( dAtob(argv[2])); }
ConsoleMethod(SimCurl, perform, S32, 2, 2, "") { return object->perform(); }
ConsoleMethod(SimCurl, start, void, 2, 2, "") { object->start(); }

and before it, add this

ConsoleMethod(SimCurl, addPostField, void, 4, 4, "") {  object->addPostField(argv[2], argv[3]);	}
ConsoleMethod(SimCurl, setCookieJar, void, 3, 3, "") {  object->setCookieJar (argv[2]);	}
ConsoleMethod(SimCurl, loadCookieFile, void, 3, 3, "") {  object->loadCookieFile (argv[2]);	}