FS-2746 --resolve large xmlrpc update thanks garmt

This commit is contained in:
Jeff Lenk committed 2012-10-13 11:37:25 -05:00
1 parent 37ecad9903
commit 6b6c83a718
397 files changed
+41821 -33840

No files matched your search

+142 -13
View File
@@ -21,14 +21,38 @@ class cValueWrapper {
/*----------------------------------------------------------------------------
Use an object of this class to set up to remove a reference to an
xmlrpc_value object (a C object with manual reference management)
at then end of a scope -- even if the scope ends with a throw.
at the end of a scope -- even if the scope ends with a throw.
-----------------------------------------------------------------------------*/
public:
xmlrpc_value * valueP;
xmlrpc_value * const valueP;
cValueWrapper(xmlrpc_value * valueP) : valueP(valueP) {}
~cValueWrapper() { xmlrpc_DECREF(valueP); }
};
class cStringWrapper {
public:
const char * const cString;
cStringWrapper(const char * const cString) : cString(cString) {}
~cStringWrapper() { xmlrpc_strfree(cString); }
};
class memblockWrapper {
xmlrpc_mem_block * const memblockP;
public:
memblockWrapper(xmlrpc_mem_block * const memblockP) :
memblockP(memblockP) {}
~memblockWrapper() {
XMLRPC_MEMBLOCK_FREE(char, memblockP);
}
};
xmlrpc_value *
cArrayFromParamList(paramList const& paramList) {
@@ -53,6 +77,42 @@ cArrayFromParamList(paramList const& paramList) {
return paramArrayP;
}
paramList const
paramListFromCArray(xmlrpc_value * const cArrayP) {
paramList retval;
env_wrap env;
unsigned int const nParam(xmlrpc_array_size(&env.env_c, cArrayP));
if (!env.env_c.fault_occurred) {
for (unsigned int i = 0;
i < nParam && !env.env_c.fault_occurred;
++i) {
xmlrpc_value * cParamP;
xmlrpc_array_read_item(&env.env_c, cArrayP, i, &cParamP);
if (!env.env_c.fault_occurred) {
cValueWrapper const paramAuto(cParamP);
// Causes xmlrpc_DECREF(cParamP) at end of scope
retval.add(cParamP);
}
}
}
if (env.env_c.fault_occurred)
throw(error(env.env_c.fault_string));
return retval;
}
} // namespace
@@ -71,17 +131,6 @@ generateCall(string const& methodName,
Use dialect 'dialect' of XML-RPC.
-----------------------------------------------------------------------------*/
class memblockWrapper {
xmlrpc_mem_block * const memblockP;
public:
memblockWrapper(xmlrpc_mem_block * const memblockP) :
memblockP(memblockP) {}
~memblockWrapper() {
XMLRPC_MEMBLOCK_FREE(char, memblockP);
}
};
xmlrpc_mem_block * callXmlMP;
env_wrap env;
@@ -117,6 +166,86 @@ generateCall(string const& methodName,
void
parseCall(string const& callXml,
string * const methodNameP,
paramList * const paramListP) {
env_wrap env;
const char * c_methodName;
xmlrpc_value * c_paramArrayP;
xmlrpc_parse_call(&env.env_c, callXml.c_str(), callXml.size(),
&c_methodName, &c_paramArrayP);
if (env.env_c.fault_occurred)
throw(error(env.env_c.fault_string));
else {
cValueWrapper const paramListAuto(c_paramArrayP);
// Causes XMLRPC_decref(c_paramArrayP) at end of scope
cStringWrapper const methodNameAuto(c_methodName);
// Causes xmlrpc_strfree(c_methodName) at end of scope
*paramListP = paramListFromCArray(c_paramArrayP);
*methodNameP = string(c_methodName);
}
}
void
generateResponse(rpcOutcome const& outcome,
xmlrpc_dialect const dialect,
string * const respXmlP) {
/*----------------------------------------------------------------------------
Generate the XML for an XML-RPC resp, given the RPC outcome.
Use dialect 'dialect' of XML-RPC.
-----------------------------------------------------------------------------*/
xmlrpc_mem_block * respXmlMP;
env_wrap env;
respXmlMP = XMLRPC_MEMBLOCK_NEW(char, &env.env_c, 0);
if (!env.env_c.fault_occurred) {
memblockWrapper respXmlAuto(respXmlMP);
// Makes respXmlMP get freed at end of scope
if (outcome.succeeded()) {
cValueWrapper cResult(outcome.getResult().cValue());
xmlrpc_serialize_response2(&env.env_c, respXmlMP,
cResult.valueP, dialect);
*respXmlP = string(XMLRPC_MEMBLOCK_CONTENTS(char, respXmlMP),
XMLRPC_MEMBLOCK_SIZE(char, respXmlMP));
} else {
env_wrap cFault;
xmlrpc_env_set_fault(&cFault.env_c, outcome.getFault().getCode(),
outcome.getFault().getDescription().c_str());
xmlrpc_serialize_fault(&env.env_c, respXmlMP, &cFault.env_c);
*respXmlP = string(XMLRPC_MEMBLOCK_CONTENTS(char, respXmlMP),
XMLRPC_MEMBLOCK_SIZE(char, respXmlMP));
}
}
if (env.env_c.fault_occurred)
throw(error(env.env_c.fault_string));
}
void
generateResponse(rpcOutcome const& outcome,
string * const respXmlP) {
generateResponse(outcome, xmlrpc_dialect_i8, respXmlP);
}
void
parseResponse(string const& responseXml,
rpcOutcome * const outcomeP) {