Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add XMLRPC support to LLHTTPClient and that instead of LLXMLRPCTransaction

Browse Source
This commit is contained in:
Aleric Inglewood
2012-10-22 01:59:17 +02:00
parent c35bc71334
commit 7f50b2ba7b
12 changed files with 479 additions and 716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
indra/newview/lluserauth.cpp
View File

@@ -42,8 +42,9 @@
#include "llappviewer.h"
#include "llviewerbuild.h"
#include "llviewercontrol.h"
#include "llxmlrpctransaction.h"
#include "llxmlrpcresponder.h"
#include "llsdutil.h"
#include "llhttpclient.h"
#include "stringize.h"
// NOTE: MUST include these after otherincludes since queue gets redefined!?!!
@@ -73,7 +74,6 @@ static const char* PLATFORM_STRING = "Sol";
LLUserAuth::LLUserAuth() :
mTransaction(NULL),
mLastTransferRateBPS(0),
mResult(LLSD())
{
@@ -87,13 +87,11 @@ LLUserAuth::~LLUserAuth()
void LLUserAuth::reset()
{
delete mTransaction;
mTransaction = NULL;
mResponder = NULL;
mResponses.clear();
mResult.clear();
}
void LLUserAuth::authenticate(
const std::string& auth_uri,
const std::string& method,
@@ -168,15 +166,13 @@ void LLUserAuth::authenticate(
// put the parameters on the request
XMLRPC_RequestSetData(request, params);
mTransaction = new LLXMLRPCTransaction(auth_uri, request);
XMLRPC_RequestFree(request, 1);
mResponder = new XMLRPCResponder;
LLHTTPClient::postXMLRPC(auth_uri, request, mResponder);
LL_INFOS2("AppInit", "Authentication") << "LLUserAuth::authenticate: uri=" << auth_uri << LL_ENDL;
}
// Legacy version of constructor
// passwd is already MD5 hashed by the time we get to it.
@@ -258,25 +254,25 @@ void LLUserAuth::authenticate(
// put the parameters on the request
XMLRPC_RequestSetData(request, params);
mTransaction = new LLXMLRPCTransaction(auth_uri, request);
// Post the XML RPC.
mResponder = new XMLRPCResponder;
LLHTTPClient::postXMLRPC(auth_uri, request, mResponder);
XMLRPC_RequestFree(request, 1);
LL_INFOS2("AppInit", "Authentication") << "LLUserAuth::authenticate: uri=" << auth_uri << LL_ENDL;
}
LLUserAuth::UserAuthcode LLUserAuth::authResponse()
{
if (!mTransaction)
if (!mResponder)
{
return mAuthResponse;
}
bool done = mTransaction->is_finished();
bool done = mResponder->is_finished();
if (!done) {
if (LLXMLRPCTransaction::StatusDownloading == mTransaction->status(0))
if (mResponder->is_downloading())
{
mAuthResponse = E_DOWNLOADING;
}
@@ -284,14 +280,11 @@ LLUserAuth::UserAuthcode LLUserAuth::authResponse()
return mAuthResponse;
}
mLastTransferRateBPS = mTransaction->transferRate();
mLastTransferRateBPS = mResponder->transferRate();
mErrorMessage = mResponder->reason();
int result;
mTransaction->status(&result);
mErrorMessage = mTransaction->statusMessage();
// if curl was ok, parse the download area.
CURLcode result = mResponder->result_code();
switch (result)
{
case CURLE_OK:
@@ -313,12 +306,12 @@ LLUserAuth::UserAuthcode LLUserAuth::authResponse()
mAuthResponse = E_UNHANDLED_ERROR;
break;
}
LL_INFOS2("AppInit", "Authentication") << "Processed response: " << result << LL_ENDL;
delete mTransaction;
mTransaction = NULL;
// We're done with this data.
mResponder = NULL;
return mAuthResponse;
}
@@ -329,7 +322,7 @@ LLUserAuth::UserAuthcode LLUserAuth::parseResponse()
// mOptions. For now, we will only be looking at mResponses, which
// will all be string => string pairs.
UserAuthcode rv = E_UNHANDLED_ERROR;
XMLRPC_REQUEST response = mTransaction->response();
XMLRPC_REQUEST response = mResponder->response();
if(!response) return rv;
// clear out any old parsing