mirrors/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-04-07 06:27:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Moved jsonRpc flag from RpcMethod to RpcRequest.

Browse source 
Now RpcMethod is stateless, so we can cache and reuse them.
This commit is contained in:
Tatsuhiro Tsujikawa 2011-06-15 00:19:07 +09:00
parent ba9673be1d
commit 2d92571cf9
6 changed files with 24 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/RpcMethodImpl.cc
View file

@ -270,7 +270,7 @@ SharedHandle<ValueBase> AddTorrentRpcMethod::process
throw DL_ABORT_EX("Torrent data is not provided.");
}
SharedHandle<String> tempTorrentParam;
if(getJsonRpc()) {
if(req.jsonRpc) {
tempTorrentParam = String::g(Base64::decode(torrentParam->s()));
torrentParam = tempTorrentParam.get();
}
@ -317,7 +317,7 @@ SharedHandle<ValueBase> AddMetalinkRpcMethod::process
throw DL_ABORT_EX("Metalink data is not provided.");
}
SharedHandle<String> tempMetalinkParam;
if(getJsonRpc()) {
if(req.jsonRpc) {
tempMetalinkParam = String::g(Base64::decode(metalinkParam->s()));
metalinkParam = tempMetalinkParam.get();
}
@ -1376,7 +1376,7 @@ SharedHandle<ValueBase> SystemMulticallRpcMethod::process
const Dict* methodDict = asDict(*i);
if(!methodDict) {
list->append(createErrorResponse
(DL_ABORT_EX("system.multicall expected struct.")));
(DL_ABORT_EX("system.multicall expected struct."), req));
continue;
}
const String* methodName = asString(methodDict->get(KEY_METHOD_NAME));
@ -1384,18 +1384,18 @@ SharedHandle<ValueBase> SystemMulticallRpcMethod::process
if(!methodName || !paramsList) {
list->append(createErrorResponse
(DL_ABORT_EX("Missing methodName or params.")));
(DL_ABORT_EX("Missing methodName or params."), req));
continue;
}
if(methodName->s() == getMethodName()) {
list->append(createErrorResponse
(DL_ABORT_EX("Recursive system.multicall forbidden.")));
(DL_ABORT_EX("Recursive system.multicall forbidden."), req));
continue;
}
SharedHandle<RpcMethod> method = RpcMethodFactory::create(methodName->s());
method->setJsonRpc(getJsonRpc());
RpcRequest innerReq
(methodName->s(), static_pointer_cast<List>(methodDict->get(KEY_PARAMS)));
innerReq.jsonRpc = req.jsonRpc;
RpcResponse res = method->execute(innerReq, e);
if(res.code == 0) {
SharedHandle<List> l = List::g();