fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-09 19:52:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Parse out target param first if available

Browse Source
This commit is contained in:
kannibalox
2024-11-02 13:47:50 -04:00
committed by Jari Sundell
parent 4768eb8356
commit 5680db3598
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rpc/xmlrpc_tinyxml2.cc
+11 -7
View File
@@ -314,19 +314,23 @@ torrent::Object execute_command(std::string method_name, const tinyxml2::XMLElem
}
torrent::Object params_raw = torrent::Object::create_list();
torrent::Object::list_type& params = params_raw.as_list();
rpc::target_type target = rpc::make_target();
if (params_element != nullptr) {
for (auto child = params_element->FirstChildElement("param"); child; child = child->NextSiblingElement("param")) {
params.push_back(xml_value_to_object(child->FirstChildElement("value")));
// Parse out the target if available
auto child = params_element->FirstChildElement("param");
if (child != nullptr) {
object_to_target(xml_value_to_object(child->FirstChildElement("value")), cmd_itr->second.m_flags, &target);
child = child->NextSiblingElement("param");
// Parse out any other params
while (child != nullptr) {
params.push_back(xml_value_to_object(child->FirstChildElement("value")));
child = child->NextSiblingElement("param");
}
}
}
rpc::target_type target = rpc::make_target();
if (params.size() == 0 && (cmd_itr->second.m_flags & (CommandMap::flag_file_target | CommandMap::flag_tracker_target))) {
throw xmlrpc_error(XMLRPC_TYPE_ERROR, "invalid parameters: too few");
}
if (params.size() > 0) {
object_to_target(params.front(), cmd_itr->second.m_flags, &target);
params.erase(params.begin());
}
return rpc::commands.call_command(cmd_itr, params_raw, target);
}