Merge branch 'master' into feature/ipc-worker

configure.ac

@@ -1,6 +1,6 @@
 m4_pattern_allow([PKG_CHECK_EXISTS])
 
-AC_INIT([rtorrent],[0.16.24],[sundell.software@gmail.com])
+AC_INIT([rtorrent],[0.16.20],[sundell.software@gmail.com])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIRS([scripts])
@@ -14,7 +14,7 @@ AX_CXX_COMPILE_STDCXX(20, noext, mandatory)
 
 PKG_PROG_PKG_CONFIG
 
-AC_DEFINE([API_VERSION], [28], [api version])
+AC_DEFINE([API_VERSION], [25], [api version])
 
 RAK_CHECK_CFLAGS
 RAK_CHECK_CXXFLAGS
@@ -49,7 +49,7 @@ fi
 
 PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
 PKG_CHECK_MODULES([ZLIB], [zlib])
-PKG_CHECK_MODULES([DEPENDENCIES], [libtorrent >= 0.16.24])
+PKG_CHECK_MODULES([DEPENDENCIES], [libtorrent >= 0.16.20])
 
 AC_LANG_PUSH(C++)
 TORRENT_WITH_XMLRPC_C

doc/rtorrent.rc

@@ -63,14 +63,6 @@
 #network.local_address.set = 127.0.0.1
 #network.local_address.set = rakshasa.no
 
-# The port reported to the tracker, separate for ipv4/ipv6. A value of 0
-# (the default) falls back to reporting the listening port. network.local_port.set
-# sets both the ipv4 and ipv6 ports at once.
-#
-#network.local_port.set = 6881
-#network.local_port.ipv4.set = 6881
-#network.local_port.ipv6.set = 6882
-
 # The IP address the listening socket and outgoing connections is
 # bound to.
 #

doc/rtorrent.rc.lua-example

@@ -53,8 +53,8 @@ rc.execute.throw(
              cfg.watch..'/start'}))
 
 -- Listening port for incoming peer traffic (fixed; you can also randomize it)
-rc.network.listen.port.range = '50000-50000'
-rc.network.listen.port.random = false
+rc.network.port_range = '50000-50000'
+rc.network.port_random = false
 
 -- Tracker-less torrent and UDP tracker support
 -- (conservative settings for 'private' trackers, change for 'public')

src/Makefile.am

@@ -195,7 +195,6 @@ libsub_root_a_SOURCES = \
 	command_tracker.cc \
 	command_scheduler.cc \
 	command_string.cc \
-	command_system.cc \
 	command_ui.cc \
 	control.cc \
 	control.h \

src/command_download.cc

@@ -142,6 +142,16 @@ apply_d_delete_tied(core::Download* download) {
   return torrent::Object();
 }
 
+void
+apply_d_directory(core::Download* download, const std::string& name) {
+  if (!download->file_list()->is_multi_file())
+    download->set_root_directory(name);
+  else if (name.empty() || *name.rbegin() == '/')
+    download->set_root_directory(name + download->info()->name().str());
+  else
+    download->set_root_directory(name + "/" + download->info()->name().str());
+}
+
 torrent::Object
 apply_d_connection_type(core::Download* download, const std::string& name) {
   torrent::Download::ConnectionType t =
@@ -402,21 +412,13 @@ p_multicall(core::Download* download, const torrent::Object::list_type& args) {
   auto  resultRaw = torrent::Object::create_list();
   auto& result    = resultRaw.as_list();
 
-  auto*      connection_list = download->connection_list();
-  const auto change_counter  = connection_list->change_counter();
-
-  for (const auto& connection : *connection_list) {
+  for (const auto& connection : *download->connection_list()) {
     torrent::Object::list_type& row = result.insert(result.end(), torrent::Object::create_list())->as_list();
 
     for (auto cItr = ++args.begin(); cItr != args.end(); cItr++) {
       const std::string& cmd = cItr->as_string();
 
       row.push_back(rpc::parse_command(rpc::make_target(connection), cmd.c_str(), cmd.c_str() + cmd.size()).first);
-
-      // Erasing a peer frees it and swaps the last element into its place, so
-      // neither this peer nor the iteration survives a change to the list.
-      if (connection_list->change_counter() != change_counter)
-        throw torrent::input_error("Command changed the connection list during p.multicall.");
     }
   }
 
@@ -439,9 +441,6 @@ p_call_target(const torrent::Object::list_type& args) {
   const std::string& peer_id = itr++->as_string();
   const std::string& command_key = itr++->as_string();
 
-  if (download == nullptr)
-    throw torrent::input_error("invalid parameters: info-hash not found");
-
   torrent::HashString hash;
 
   if (peer_id.size() != 40)
@@ -719,7 +718,7 @@ initialize_command_download() {
   CMD2_DL_V       ("d.pause",      std::bind(&core::DownloadList::pause_default, control->core()->download_list(), std::placeholders::_1));
   CMD2_DL_V       ("d.open",       std::bind(&core::DownloadList::open_throw, control->core()->download_list(), std::placeholders::_1));
   CMD2_DL_V       ("d.close",      std::bind(&core::DownloadList::close_throw, control->core()->download_list(), std::placeholders::_1));
-  CMD2_DL_V       ("d.close.directly", std::bind(&core::DownloadList::close_files, control->core()->download_list(), std::placeholders::_1));
+  CMD2_DL_V       ("d.close.directly", std::bind(&core::DownloadList::close_directly, control->core()->download_list(), std::placeholders::_1));
   CMD2_DL_V       ("d.erase",      std::bind(&core::DownloadList::erase_ptr, control->core()->download_list(), std::placeholders::_1));
   CMD2_DL_V       ("d.check_hash", std::bind(&core::DownloadList::check_hash, control->core()->download_list(), std::placeholders::_1));
 
@@ -885,11 +884,12 @@ initialize_command_download() {
   CMD2_DL_LIST    ("d.tracker.insert",                std::bind(&download_tracker_insert, std::placeholders::_1, std::placeholders::_2));
   CMD2_DL_VALUE_V ("d.tracker.send_scrape",           [](auto download, uint64_t arg) { download->tracker_controller().scrape_request(arg); });
 
-  CMD2_DL         ("d.directory",                   CMD2_ON_FL(root_dir));
-  CMD2_DL         ("d.directory.realpath.or_empty", [](auto* download, auto)     { return resolve_path(download->file_list()->root_dir()); });
-  CMD2_DL         ("d.directory.realpath.or_throw", [](auto* download, auto)     { return resolve_path_or_throw(download->file_list()->root_dir()); });
-  CMD2_DL_STRING_V("d.directory.set",               [](auto* download, auto arg) { download->set_directory(arg); });
-  CMD2_DL_STRING_V("d.directory.base.set",          [](auto* download, auto arg) { download->set_base_directory(arg); });
+  CMD2_DL         ("d.directory",          CMD2_ON_FL(root_dir));
+  CMD2_DL         ("d.directory.realpath.or_empty", [](auto* download, auto) { return resolve_path(download->file_list()->root_dir()); });
+  CMD2_DL         ("d.directory.realpath.or_throw", [](auto* download, auto) { return resolve_path_or_throw(download->file_list()->root_dir()); });
+  CMD2_DL_STRING_V("d.directory.set",      std::bind(&apply_d_directory, std::placeholders::_1, std::placeholders::_2));
+  CMD2_DL         ("d.directory_base",     CMD2_ON_FL(root_dir));
+  CMD2_DL_STRING_V("d.directory_base.set", std::bind(&core::Download::set_root_directory, std::placeholders::_1, std::placeholders::_2));
 
   CMD2_DL         ("d.priority",     std::bind(&core::Download::priority, std::placeholders::_1));
   CMD2_DL         ("d.priority_str", std::bind(&retrieve_d_priority_str, std::placeholders::_1));
@@ -950,6 +950,7 @@ initialize_command_download() {
   rpc::rpc.mark_safe("d.name.or_base64");
   rpc::rpc.mark_safe("d.name.or_as_binary");
   rpc::rpc.mark_safe("d.directory");
+  rpc::rpc.mark_safe("d.directory_base");
   rpc::rpc.mark_safe("d.creation_date");
   rpc::rpc.mark_safe("d.load_date");
   rpc::rpc.mark_safe("d.up.rate");

src/command_dynamic.cc

@@ -157,7 +157,7 @@ system_method_insert_object(const torrent::Object::list_type& args, int flags) {
     torrent::Object             valueList     = torrent::Object::create_list();
     torrent::Object::list_type& valueListType = valueList.as_list();
 
-    if (itrArgs != args.end() && (itrArgs)->is_list())
+    if ((itrArgs)->is_list())
       valueListType = (itrArgs)->as_list();
 
     control->object_storage()->insert_str(raw_key, valueList, flags);

src/command_events.cc

@@ -51,7 +51,7 @@ apply_on_ratio(const torrent::Object& rawArgs) {
         !(max_ratio > 0 && total_upload * 100 > total_done * max_ratio))
       continue;
 
-    downloads.push_back(itr->get());
+    downloads.push_back(*itr);
   }
 
   auto ratio_command = "group." + group_name + ".ratio.command";
@@ -128,7 +128,7 @@ apply_remove_untied() {
 }
 
 torrent::Object
-apply_schedule(const torrent::Object::list_type& args, bool if_absent) {
+apply_schedule(const torrent::Object::list_type& args) {
   if (args.size() != 4)
     throw torrent::input_error("Wrong number of arguments.");
 
@@ -138,9 +138,6 @@ apply_schedule(const torrent::Object::list_type& args, bool if_absent) {
   auto& arg2 = (itr++)->as_string();
   auto& arg3 = (itr++)->as_string();
 
-  if (if_absent && control->command_scheduler()->find(arg1) != control->command_scheduler()->end())
-    return torrent::Object();
-
   control->command_scheduler()->parse(arg1, arg2, arg3, *itr);
 
   return torrent::Object();
@@ -173,7 +170,7 @@ apply_close_low_diskspace(int64_t arg, uint32_t skip_priority) {
 
   torrent::FileList::cache_list cache;
 
-  for (const auto& download : *control->core()->download_list()) {
+  for (auto download : *control->core()->download_list()) {
     if (!download->is_downloading())
       continue;
     if (download->priority() >= skip_priority)
@@ -240,25 +237,15 @@ d_multicall(const torrent::Object::list_type& args) {
 
   // Add some pre-parsing of the commands, so we don't spend time
   // parsing and searching command map for every single call.
-  // Hold a reference to each download so a command that erases one does not
-  // leave the rest of the loop dispatching on freed memory.
-  core::View::base_type dlist((*view_itr)->begin_visible(), (*view_itr)->end_visible());
+  std::vector<core::Download*> dlist((*view_itr)->begin_visible(), (*view_itr)->end_visible());
 
   torrent::Object             resultRaw = torrent::Object::create_list();
   torrent::Object::list_type& result = resultRaw.as_list();
 
-  for (const auto& download : dlist) {
-    if (download.use_count() == 1)
-      continue;
-
+  for (auto download : dlist) {
     torrent::Object::list_type& row = result.insert(result.end(), torrent::Object::create_list())->as_list();
 
     for (torrent::Object::list_const_iterator cItr = ++args.begin(); cItr != args.end(); cItr++) {
-      // A command may erase this download, which destroys the torrent object it
-      // wraps; the list dropping its reference is what tells us.
-      if (download.use_count() == 1)
-        break;
-
       auto& cmd = cItr->as_string();
       row.push_back(rpc::parse_command(rpc::make_target(download), cmd.c_str(), cmd.c_str() + cmd.size()).first);
     }
@@ -281,12 +268,10 @@ d_multicall_filtered(const torrent::Object::list_type& args) {
   if (view_itr == viewManager->end())
     throw torrent::input_error("Could not find view '" + arg->as_string() + "'.");
 
-  // Make a filtered copy of the current item list, holding a reference to each
-  // download so a command that erases one cannot free it under us.
+  // Make a filtered copy of the current item list
   core::View::base_type dlist;
   (*view_itr)->filter_by(*++arg, dlist);
 
-
   // Generate result by iterating over all items
   auto  resultRaw = torrent::Object::create_list();
   auto& result    = resultRaw.as_list();
@@ -294,17 +279,11 @@ d_multicall_filtered(const torrent::Object::list_type& args) {
   ++arg;  // skip to first command
 
   for (const auto& item : dlist) {
-    if (item.use_count() == 1)
-      continue;
-
     // Add empty row to result
     torrent::Object::list_type& row = result.insert(result.end(), torrent::Object::create_list())->as_list();
 
     // Call the provided commands and assemble their results
     for (torrent::Object::list_const_iterator command = arg; command != args.end(); command++) {
-      if (item.use_count() == 1)
-        break;
-
       auto& cmdstr = command->as_string();
       row.push_back(rpc::parse_command(rpc::make_target(item), cmdstr.c_str(), cmdstr.c_str() + cmdstr.size()).first);
     }
@@ -361,8 +340,7 @@ initialize_command_events() {
   CMD2_ANY         ("close_untied",               [](auto, auto) { return apply_close_untied(); });
   CMD2_ANY         ("remove_untied",              [](auto, auto) { return apply_remove_untied(); });
 
-  CMD2_ANY_LIST    ("schedule",                   [](auto, auto& args) { return apply_schedule(args, false); });
-  CMD2_ANY_LIST    ("schedule.if_absent",         [](auto, auto& args) { return apply_schedule(args, true); });
+  CMD2_ANY_LIST    ("schedule",                   [](auto, auto& args) { return apply_schedule(args); });
   CMD2_ANY_STRING_V("schedule.remove",            [](auto, auto& str) { return control->command_scheduler()->erase_str(str); });
 
   CMD2_ANY_STRING_V("import",                     [](auto, auto& str) { return apply_import(str); });

src/command_groups.cc

@@ -1,7 +1,5 @@
 #include "config.h"
 
-#include <memory>
-
 #include <torrent/download/resource_manager.h>
 #include <torrent/download/choke_group.h>
 #include <torrent/download/choke_queue.h>
@@ -113,7 +111,7 @@ apply_cg_all_update_balance(bool is_up) {
 //
 #else
 
-std::vector<std::unique_ptr<torrent::choke_group>> cg_list_hack;
+std::vector<torrent::choke_group*> cg_list_hack;
 
 int64_t
 cg_get_index(const torrent::Object& raw_args) {
@@ -123,7 +121,7 @@ cg_get_index(const torrent::Object& raw_args) {
 
   if (arg.is_string()) {
     if (!rpc::parse_whole_value_nothrow(arg.as_string().c_str(), &index)) {
-      auto itr = std::find_if(cg_list_hack.begin(), cg_list_hack.end(), [&arg](const auto& cg) { return arg.as_string() == cg->name(); });
+      auto itr = std::find_if(cg_list_hack.begin(), cg_list_hack.end(), [&arg](torrent::choke_group* cg) { return arg.as_string() == cg->name(); });
 
       if (itr == cg_list_hack.end())
         throw torrent::input_error("Choke group not found.");
@@ -151,7 +149,7 @@ cg_get_group(const torrent::Object& raw_args) {
   if ((size_t)index >= cg_list_hack.size())
     throw torrent::input_error("Choke group not found.");
 
-  return cg_list_hack.at(index).get();
+  return cg_list_hack.at(index);
 }
 
 int64_t cg_d_group(core::Download* download) { return download->group(); }
@@ -164,7 +162,7 @@ torrent::Object
 apply_cg_list() {
   torrent::Object::list_type result;
 
-  for (const auto& itr : cg_list_hack)
+  for (auto itr : cg_list_hack)
     result.push_back(itr->name());
 
   return torrent::Object::from_list(result);
@@ -182,10 +180,10 @@ apply_cg_insert(const std::string& arg) {
   if (rpc::parse_whole_value_nothrow(arg.c_str(), &dummy))
     throw torrent::input_error("Cannot use a value string as choke group name.");
 
-  if (arg.empty() || std::any_of(cg_list_hack.begin(), cg_list_hack.end(), [&arg](const auto& cg) { return arg == cg->name(); }))
+  if (arg.empty() || std::any_of(cg_list_hack.begin(), cg_list_hack.end(), [&arg](auto cg) { return arg == cg->name(); }))
     throw torrent::input_error("Duplicate name for choke group.");
 
-  cg_list_hack.push_back(std::make_unique<torrent::choke_group>());
+  cg_list_hack.push_back(new torrent::choke_group());
   cg_list_hack.back()->set_name(arg);
 
   cg_list_hack.back()->up_queue()->set_heuristics(torrent::HEURISTICS_UPLOAD_LEECH);
@@ -196,7 +194,7 @@ apply_cg_insert(const std::string& arg) {
 
 torrent::Object
 apply_cg_index_of(const std::string& arg) {
-  auto itr = std::find_if(cg_list_hack.begin(), cg_list_hack.end(), [&arg](const auto& cg) { return arg == cg->name(); });
+  auto itr = std::find_if(cg_list_hack.begin(), cg_list_hack.end(), [&arg](torrent::choke_group* cg) { return arg == cg->name(); });
 
   if (itr == cg_list_hack.end())
     throw torrent::input_error("Choke group not found.");
@@ -208,7 +206,7 @@ torrent::Object
 apply_cg_all_update_balance(bool is_up) {
   LT_LOG_SUBSYSTEM("apply update balance: hack is_up:%i", (int)is_up);
 
-  for (const auto& itr : cg_list_hack) {
+  for (auto itr : cg_list_hack) {
     if (is_up)
       itr->up_queue()->balance();
     else
@@ -348,7 +346,7 @@ initialize_command_groups() {
 #else
   apply_cg_insert("default");
 
-  CMD_ANY         ("choke_group.size",                [](auto, auto) { return (int64_t)cg_list_hack.size(); });
+  CMD_ANY         ("choke_group.size",                std::bind(&std::vector<torrent::choke_group*>::size, cg_list_hack));
   CMD_ANY_STRING  ("choke_group.index_of",            std::bind(&apply_cg_index_of, std::placeholders::_2));
 #endif
 

src/command_helpers.cc

@@ -20,7 +20,6 @@ void initialize_command_throttle();
 void initialize_command_tracker();
 void initialize_command_scheduler();
 void initialize_command_string();
-void initialize_command_system();
 void initialize_command_ui();
 
 void
@@ -40,5 +39,4 @@ initialize_commands() {
   initialize_command_tracker();
   initialize_command_scheduler();
   initialize_command_string();
-  initialize_command_system();
 }

src/command_ip.cc

@@ -131,7 +131,7 @@ ipv4_range_parse(const char* address, uint32_t* address_start, uint32_t* address
   // copy everything up to '#'  to address_copy and work from there
   while(address[address_start_index] != '#' && address[address_start_index] != '\r' &&
         address[address_start_index] != '\n' && address[address_start_index] != '\0' &&
-        address_start_index < 4095 ) {
+        address_start_index < 4096 ) {
 
     address_copy[address_start_index] = address[address_start_index];
     address_start_index++;
@@ -206,9 +206,6 @@ ipv4_range_parse(const char* address, uint32_t* address_start, uint32_t* address
         if (mask_bits == 0) {
           mask = 0;
           end_mask = ~(uint32_t)0;
-        } else if (mask_bits == 32) {
-          mask = ~(uint32_t)0;
-          end_mask = 0;
         } else {
           mask = (~mask) << (32-mask_bits);
           end_mask = (~end_mask) >> mask_bits;
@@ -319,11 +316,6 @@ apply_ipv4_filter_load(const torrent::Object::list_type& args) {
       ipv4_filter_parse(buffer, value);
     }
 
-    if (file.fail() && !file.eof()) {
-      lineNumber++;
-      throw torrent::input_error("Exceeded max line length.");
-    }
-
   } catch (torrent::input_error& e) {
     snprintf(buffer, 2048, "Error in ip filter file: %s:%u: %s", filename.c_str(), lineNumber, e.what());
 
@@ -344,8 +336,8 @@ apply_ipv4_filter_dump() {
   torrent::Object raw_result = torrent::Object::create_list();
   torrent::Object::list_type& result = raw_result.as_list();
 
-  const torrent::ipv4_table::range_map_type& range_map = torrent::PeerList::ipv4_filter()->range_map;
-  torrent::ipv4_table::range_map_type::const_iterator iter = range_map.begin();
+  torrent::ipv4_table::range_map_type range_map = torrent::PeerList::ipv4_filter()->range_map;
+  torrent::ipv4_table::range_map_type::iterator iter = range_map.begin();
 
   while(iter != range_map.end()) {
     char buffer[64];

src/command_local.cc

@@ -1,16 +1,33 @@
 #include "config.h"
 
+#include <cerrno>
+#include <fcntl.h>
+#include <functional>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <torrent/torrent.h>
+#include <torrent/data/file_manager.h>
+#include <torrent/data/chunk_utils.h>
+#include <torrent/runtime/runtime.h>
 #include <torrent/runtime/memory_manager.h>
-#include <torrent/utils/log.h>
+#include <torrent/runtime/socket_manager.h>
+#include <torrent/utils/chrono.h>
+#include <torrent/utils/option_strings.h>
 
-#include "command_helpers.h"
-#include "control.h"
 #include "core/download.h"
+#include "core/download_list.h"
 #include "core/manager.h"
 #include "rpc/parse_commands.h"
-#include "rpc/lua.h"
 #include "rpc/scgi.h"
 #include "session/session_manager.h"
+#include "utils/file_status_cache.h"
+
+#include "globals.h"
+#include "rpc/lua.h"
+#include "control.h"
+#include "command_helpers.h"
 
 typedef torrent::ChunkManager CM_t;
 typedef torrent::FileManager  FM_t;
@@ -26,6 +43,49 @@ apply_pieces_stats_total_size() {
   return size;
 }
 
+torrent::Object
+system_env(const torrent::Object::string_type& arg) {
+  if (arg.empty())
+    throw torrent::input_error("system.env: Missing variable name.");
+
+  char* val = getenv(arg.c_str());
+  return std::string(val ? val : "");
+}
+
+torrent::Object
+system_hostname() {
+  char buffer[1024];
+
+  if (gethostname(buffer, 1023) == -1)
+    throw torrent::input_error("Unable to read hostname.");
+
+//   if (shorten)
+//     *std::find(buffer, buffer + 1023, '.') = '\0';
+
+  return std::string(buffer);
+}
+
+torrent::Object
+system_get_cwd() {
+  char* buffer = getcwd(NULL, 0);
+
+  if (buffer == NULL)
+    throw torrent::input_error("Unable to read cwd.");
+
+  torrent::Object result = torrent::Object(std::string(buffer));
+  free(buffer);
+
+  return result;
+}
+
+torrent::Object
+system_set_cwd(const torrent::Object::string_type& rawArgs) {
+  if (::chdir(rawArgs.c_str()) != 0)
+    throw torrent::input_error("Could not change current working directory.");
+
+  return torrent::Object();
+}
+
 inline torrent::Object::list_const_iterator
 post_increment(torrent::Object::list_const_iterator& itr, const torrent::Object::list_const_iterator& last) {
   if (itr == last)
@@ -127,17 +187,94 @@ cmd_file_append(const torrent::Object::list_type& args) {
 
 void
 initialize_command_local() {
-  core::DownloadList* dList = control->core()->download_list();
+  core::DownloadList*    dList = control->core()->download_list();
+  torrent::FileManager*  fileManager = torrent::file_manager();
+
+  CMD_ANY         ("system.hostname", std::bind(&system_hostname));
+  CMD_ANY         ("system.pid",      std::bind(&getpid));
+
+  CMD_VAR_C_STRING("system.api_version",           (int64_t)API_VERSION);
+  CMD_VAR_C_STRING("system.client_version",        PACKAGE_VERSION);
+  CMD_VAR_C_STRING("system.library_version",       torrent::runtime::version());
+
+  CMD_VAR_VALUE   ("system.file.allocate",         0);
+  CMD_VAR_VALUE   ("system.file.max_size",         (int64_t)512 << 30);
+  CMD_VAR_VALUE   ("system.file.split_size",       -1);
+  CMD_VAR_STRING  ("system.file.split_suffix",     ".part");
+
+  CMD_ANY         ("system.file_status_cache.size",   std::bind(&utils::FileStatusCache::size,
+                                                                 (utils::FileStatusCache::base_type*)control->core()->file_status_cache()));
+  CMD_ANY_V       ("system.file_status_cache.prune",  std::bind(&utils::FileStatusCache::prune, control->core()->file_status_cache()));
+
+  CMD_VAR_BOOL    ("file.prioritize_toc",          0);
+  CMD_VAR_LIST    ("file.prioritize_toc.first");
+  CMD_VAR_LIST    ("file.prioritize_toc.last");
+
+  CMD_ANY         ("system.files.advise_random",             std::bind(&FM_t::advise_random, fileManager));
+  CMD_ANY_VALUE_V ("system.files.advise_random.set",         std::bind(&FM_t::set_advise_random, fileManager, std::placeholders::_2));
+  CMD_ANY         ("system.files.advise_random.hashing",     std::bind(&FM_t::advise_random_hashing, fileManager));
+  CMD_ANY_VALUE_V ("system.files.advise_random.hashing.set", std::bind(&FM_t::set_advise_random_hashing, fileManager, std::placeholders::_2));
+  CMD_ANY         ("system.files.session.fdatasync",         [](auto, auto)        { return session_thread::manager()->use_fsyncdisk(); });
+  CMD_ANY_VALUE_V ("system.files.session.fdatasync.set",     [](auto, auto& value) { return session_thread::manager()->set_use_fsyncdisk(value); });
+
+  CMD_ANY         ("system.files.opened_counter",     std::bind(&FM_t::files_opened_counter, fileManager));
+  CMD_ANY         ("system.files.closed_counter",     std::bind(&FM_t::files_closed_counter, fileManager));
+  CMD_ANY         ("system.files.failed_counter",     std::bind(&FM_t::files_failed_counter, fileManager));
+
+  CMD_ANY_STRING  ("system.env",                      [](auto, auto& str)   { return system_env(str); });
+
+  CMD_ANY         ("system.time",                     [](auto, auto)        { return torrent::this_thread::cached_seconds().count(); });
+  CMD_ANY         ("system.time_seconds",             [](auto, auto)        { return torrent::utils::cast_seconds(torrent::utils::time_since_epoch()).count(); });
+  CMD_ANY         ("system.time_usec",                [](auto, auto)        { return torrent::utils::time_since_epoch().count(); });
+
+  CMD_ANY_VALUE_V ("system.umask.set",                [](auto, auto& value) { return ::umask(value); });
+
+  CMD_VAR_BOOL    ("system.daemon",                   false);
+
+  CMD_ANY_V       ("system.shutdown.normal",          [](auto, auto)        { control->receive_normal_shutdown(); });
+  CMD_ANY_V       ("system.shutdown.quick",           [](auto, auto)        { control->receive_quick_shutdown(); });
+
+  CMD_REDIRECT_NO_EXPORT("system.shutdown", "system.shutdown.normal");
+
+  CMD_ANY         ("system.cwd",                      [](auto, auto)        { return system_get_cwd(); });
+  CMD_ANY_STRING  ("system.cwd.set",                  [](auto, auto& str)   { return system_set_cwd(str); });
+
+  CMD_ANY         ("system.sockets.size",             [](auto, auto)        { return torrent::runtime::socket_manager()->size(); });
+  CMD_ANY         ("system.sockets.max_size",         [](auto, auto)        { return torrent::runtime::socket_manager()->max_size(); });
+  CMD_ANY_VALUE_V ("system.sockets.max_size.set",     [](auto, auto& value) { return torrent::runtime::socket_manager()->set_max_size_and_adjust(value); });
+  CMD_ANY_V       ("system.sockets.adjust_alloc",     [](auto, auto)        { torrent::runtime::socket_manager()->adjust_allocation(); });
+  CMD_ANY         ("system.sockets.reserved_alloc",   [](auto, auto)        { return torrent::runtime::socket_manager()->reserved_allocation(); });
+  CMD_ANY         ("system.sockets.available_alloc",  [](auto, auto)        { return torrent::runtime::socket_manager()->available_allocation(); });
+
+  for (uint32_t i = 0; i < torrent::runtime::SocketManager::category_count; ++i) {
+    auto category      = static_cast<torrent::runtime::socket_manager_category_t>(i);
+    auto category_name = "system.sockets." + torrent::option_to_str_or_throw(torrent::OPTION_SOCKET_CATEGORY, i);
+
+    CMD_ANY        (category_name + ".size",      [category](auto, auto) { return torrent::runtime::socket_manager()->category_managed_size(category); });
+    CMD_ANY        (category_name + ".max_size",  [category](auto, auto) { return torrent::runtime::socket_manager()->category_max_size(category); });
+
+    if (i == 0) {
+      CMD_ANY      (category_name + ".min_alloc",   [](auto, auto) { return torrent::runtime::socket_manager()->generic_min_allocation(); });
+      continue;
+    }
+
+    CMD_ANY        (category_name + ".max_alloc.limit", [category](auto, auto) { return torrent::runtime::socket_manager()->category_alloc_limit(category); });
+    CMD_ANY        (category_name + ".min_alloc.limit", [category](auto, auto) { return torrent::runtime::socket_manager()->category_alloc_minimum(category); });
+    CMD_ANY        (category_name + ".min_alloc",     [category](auto, auto) { return torrent::runtime::socket_manager()->category_min_allocation(category); });
+    CMD_ANY        (category_name + ".max_alloc",     [category](auto, auto) { return torrent::runtime::socket_manager()->category_max_allocation(category); });
+    CMD_ANY_VALUE_V(category_name + ".min_alloc.set", [category](auto, auto& value) { torrent::runtime::socket_manager()->set_category_min_allocation(category, value); });
+    CMD_ANY_VALUE_V(category_name + ".max_alloc.set", [category](auto, auto& value) { torrent::runtime::socket_manager()->set_category_max_allocation(category, value); });
+  }
 
   CMD_ANY         ("pieces.sync.always_safe",         [](auto, auto)        { return torrent::runtime::memory_manager()->safe_sync(); });
   CMD_ANY_VALUE_V ("pieces.sync.always_safe.set",     [](auto, auto& value) { return torrent::runtime::memory_manager()->set_safe_sync(value); });
   CMD_ANY         ("pieces.sync.safe_free_diskspace", [](auto, auto)        { return torrent::runtime::memory_manager()->sync_safe_free_diskspace(); });
   CMD_ANY         ("pieces.sync.timeout",             [](auto, auto)        { return torrent::runtime::memory_manager()->timeout_sync().count(); });
   CMD_ANY_VALUE_V ("pieces.sync.timeout.set",         [](auto, auto& value) { return torrent::runtime::memory_manager()->set_timeout_sync(value); });
+  // CMD_ANY         ("pieces.sync.timeout_safe",        [](auto, auto)        { return torrent::runtime::memory_manager()->timeout_safe_sync(); });
+  // CMD_ANY_VALUE_V ("pieces.sync.timeout_safe.set",    [](auto, auto& value) { return torrent::runtime::memory_manager()->set_timeout_safe_sync(value); });
   CMD_ANY         ("pieces.sync.timeout_safe",        [](auto, auto)        { return 0; });
-  CMD_ANY_VALUE_V ("pieces.sync.timeout_safe.set",    [](auto, auto)        {
-      lt_log_print(torrent::LOG_WARN, "pieces.sync.timeout_safe.set is no longer supported and does nothing.");
-    });
+  CMD_ANY_VALUE_V ("pieces.sync.timeout_safe.set",    [](auto, auto)        { });
   CMD_ANY         ("pieces.sync.queue_size",          [](auto, auto)        { return torrent::runtime::memory_manager()->sync_queue_block_count(); });
 
   CMD_ANY         ("pieces.preload.type",             [](auto, auto)        { return torrent::runtime::memory_manager()->preload_type(); });
@@ -212,6 +349,35 @@ initialize_command_local() {
 
   CMD_ANY_LIST  ("group.insert", std::bind(&group_insert, std::placeholders::_2));
 
+  rpc::rpc.mark_safe("system.api_version");
+  rpc::rpc.mark_safe("system.client_version");
+  rpc::rpc.mark_safe("system.library_version");
+  rpc::rpc.mark_safe("system.file.max_size");
+  rpc::rpc.mark_safe("system.file.split_size");
+  rpc::rpc.mark_safe("system.file.split_suffix");
+
+  rpc::rpc.mark_safe("system.sockets.size");
+  rpc::rpc.mark_safe("system.sockets.max_size");
+  rpc::rpc.mark_safe("system.sockets.reserved_alloc");
+  rpc::rpc.mark_safe("system.sockets.available_alloc");
+
+  for (uint32_t i = 0; i < torrent::runtime::SocketManager::category_count; ++i) {
+    auto category_name = "system.sockets." + torrent::option_to_str_or_throw(torrent::OPTION_SOCKET_CATEGORY, i);
+
+    rpc::rpc.mark_safe(category_name + ".size");
+    rpc::rpc.mark_safe(category_name + ".max_size");
+
+    if (i == 0) {
+      rpc::rpc.mark_safe(category_name + ".min_alloc");
+      continue;
+    }
+
+    rpc::rpc.mark_safe(category_name + ".max_alloc.limit");
+    rpc::rpc.mark_safe(category_name + ".min_alloc.limit");
+    rpc::rpc.mark_safe(category_name + ".min_alloc");
+    rpc::rpc.mark_safe(category_name + ".max_alloc");
+  }
+
   rpc::rpc.mark_safe("directory.default");
   rpc::rpc.mark_safe("session.path");
   rpc::rpc.mark_safe("session.path.realpath.or_empty");

src/command_logging.cc

@@ -122,10 +122,7 @@ log_vmmap_dump(const std::string& str) {
     fprintf(log_file, "%8p-%8p [%5llxk]\n", all_mapping.ptr, (char*)all_mapping.ptr + all_mapping.length, (long long unsigned int)(all_mapping.length / 1024));
   }
 
-  // The buffered output only reaches the kernel here.
-  if (fclose(log_file) != 0)
-    throw torrent::input_error("Could not write log file: " + str);
-
+  fclose(log_file);
   return torrent::Object();
 }
 
@@ -138,7 +135,7 @@ initialize_command_logging() {
   CMD2_ANY_LIST    ("log.open_gz_file_pid",   std::bind(&apply_log_open, log_flag_append_pid | log_flag_use_gz, std::placeholders::_2));
   CMD2_ANY_LIST    ("log.append_file",        std::bind(&apply_log_open, log_flag_append_file, std::placeholders::_2));
   CMD2_ANY_LIST    ("log.append_file.flush",  std::bind(&apply_log_open, log_flag_append_file | log_flag_flush, std::placeholders::_2));
-  CMD2_ANY_LIST    ("log.append_gz_file",     std::bind(&apply_log_open, log_flag_append_file | log_flag_use_gz, std::placeholders::_2));
+  CMD2_ANY_LIST    ("log.append_gz_file",     std::bind(&apply_log_open, log_flag_append_file, std::placeholders::_2));
 
   CMD2_ANY_STRING_V("log.close",            std::bind(&torrent::log_close_output_str, std::placeholders::_2));
 

src/command_network.cc

@@ -54,14 +54,6 @@ set_listen_port_range(const std::string& arg) {
   torrent::runtime::client_config()->set_listen_port_range(port_first, port_last);
 }
 
-uint16_t
-checked_local_port_value(int64_t value, const char* label) {
-  if (value < 0 || value > 65535)
-    throw torrent::input_error(std::string("Invalid ") + label + " port number.");
-
-  return static_cast<uint16_t>(value);
-}
-
 torrent::Object
 get_encryption() {
   auto encryption_modes = torrent::runtime::network_config()->encryption_modes();
@@ -374,31 +366,18 @@ initialize_command_network() {
   CMD_ANY_STRING  ("network.tos.set",                        [](auto, auto& str)             { return apply_tos(str); });
 
   CMD_ANY         ("network.bind_address",                   [nw_config](auto, auto)         { return nw_config->bind_address_best_match_str(); });
-  CMD_ANY_STRING_V("network.bind_address.set",               [nw_config](auto, auto& str)    { return nw_config->set_bind_address(str); });
+  CMD_ANY_STRING_V("network.bind_address.set",               [nw_config](auto, auto& str)    { return nw_config->set_bind_address_str(str); });
   CMD_ANY         ("network.bind_address.ipv4",              [nw_config](auto, auto)         { return nw_config->bind_inet_address_str(); });
-  CMD_ANY_STRING_V("network.bind_address.ipv4.set",          [nw_config](auto, auto& str)    { return nw_config->set_bind_inet_address(str); });
+  CMD_ANY_STRING_V("network.bind_address.ipv4.set",          [nw_config](auto, auto& str)    { return nw_config->set_bind_inet_address_str(str); });
   CMD_ANY         ("network.bind_address.ipv6",              [nw_config](auto, auto)         { return nw_config->bind_inet6_address_str(); });
-  CMD_ANY_STRING_V("network.bind_address.ipv6.set",          [nw_config](auto, auto& str)    { return nw_config->set_bind_inet6_address(str); });
-
-  CMD_ANY_STRING_V("network.bind_device.set",                [nw_config](auto, auto& str)    { return nw_config->set_bind_device_name(str); });
-  CMD_ANY         ("network.bind_device.ipv4",               [nw_config](auto, auto)         { return nw_config->bind_inet_device_name(); });
-  CMD_ANY_STRING_V("network.bind_device.ipv4.set",           [nw_config](auto, auto& str)    { return nw_config->set_bind_inet_device_name(str); });
-  CMD_ANY         ("network.bind_device.ipv6",               [nw_config](auto, auto)         { return nw_config->bind_inet6_device_name(); });
-  CMD_ANY_STRING_V("network.bind_device.ipv6.set",           [nw_config](auto, auto& str)    { return nw_config->set_bind_inet6_device_name(str); });
+  CMD_ANY_STRING_V("network.bind_address.ipv6.set",          [nw_config](auto, auto& str)    { return nw_config->set_bind_inet6_address_str(str); });
 
   CMD_ANY         ("network.local_address",                  [nw_config](auto, auto)         { return nw_config->local_address_best_match_str(); });
-  CMD_ANY_STRING_V("network.local_address.set",              [nw_config](auto, auto& str)    { return nw_config->set_local_address(str); });
+  CMD_ANY_STRING_V("network.local_address.set",              [nw_config](auto, auto& str)    { return nw_config->set_local_address_str(str); });
   CMD_ANY         ("network.local_address.ipv4",             [nw_config](auto, auto)         { return nw_config->local_inet_address_str(); });
-  CMD_ANY_STRING_V("network.local_address.ipv4.set",         [nw_config](auto, auto& str)    { return nw_config->set_local_inet_address(str); });
+  CMD_ANY_STRING_V("network.local_address.ipv4.set",         [nw_config](auto, auto& str)    { return nw_config->set_local_inet_address_str(str); });
   CMD_ANY         ("network.local_address.ipv6",             [nw_config](auto, auto)         { return nw_config->local_inet6_address_str(); });
-  CMD_ANY_STRING_V("network.local_address.ipv6.set",         [nw_config](auto, auto& str)    { return nw_config->set_local_inet6_address(str); });
-
-  CMD_ANY         ("network.local_port",                     [nw_config](auto, auto)         { return nw_config->local_port_best_match(); });
-  CMD_ANY_VALUE_V ("network.local_port.set",                 [nw_config](auto, auto& value)  { return nw_config->set_local_port(checked_local_port_value(value, "local")); });
-  CMD_ANY         ("network.local_port.ipv4",                [nw_config](auto, auto)         { return nw_config->local_inet_port(); });
-  CMD_ANY_VALUE_V ("network.local_port.ipv4.set",            [nw_config](auto, auto& value)  { return nw_config->set_local_inet_port(checked_local_port_value(value, "local ipv4")); });
-  CMD_ANY         ("network.local_port.ipv6",                [nw_config](auto, auto)         { return nw_config->local_inet6_port(); });
-  CMD_ANY_VALUE_V ("network.local_port.ipv6.set",            [nw_config](auto, auto& value)  { return nw_config->set_local_inet6_port(checked_local_port_value(value, "local ipv6")); });
+  CMD_ANY_STRING_V("network.local_address.ipv6.set",         [nw_config](auto, auto& str)    { return nw_config->set_local_inet6_address_str(str); });
 
   CMD_ANY         ("network.proxy.global",                   [](auto, auto)                  { return torrent::runtime::proxy_manager()->proxy_url(); });
   CMD_ANY_STRING_V("network.proxy.global.set",               [](auto, auto& str)             { return torrent::runtime::proxy_manager()->set_proxy_url(str); });
@@ -458,9 +437,6 @@ initialize_command_network() {
   rpc::rpc.mark_safe("network.receive_buffer.size");
   rpc::rpc.mark_safe("network.bind_address");
   rpc::rpc.mark_safe("network.local_address");
-  rpc::rpc.mark_safe("network.local_port");
-  rpc::rpc.mark_safe("network.local_port.ipv4");
-  rpc::rpc.mark_safe("network.local_port.ipv6");
   rpc::rpc.mark_safe("network.xmlrpc.size_limit");
   rpc::rpc.mark_safe("network.open_sockets");
 

src/command_string.cc

@@ -19,8 +19,6 @@
 
 namespace {
 
-constexpr int64_t max_string_pad_size = 1 << 14;
-
 const std::string whitespace_characters = " \t\n\r\f\v";
 
 // The byte offset of every utf-8 character in 'text', terminated by the offset
@@ -251,14 +249,10 @@ apply_string_pad(const char* name, const torrent::Object::list_type& args, bool
   if (pad_size <= text_length || padding.empty())
     return text;
 
-  if (pad_size - text_length > max_string_pad_size)
-    throw torrent::input_error(std::string(name) + ": padding is too large.");
-
   auto padding_offsets = utf8_offsets(padding);
   auto padding_length  = static_cast<int64_t>(padding_offsets.size() - 1);
 
   std::string result;
-  result.reserve(pad_size - text_length);
 
   for (int64_t i = 0; i < pad_size - text_length; i++) {
     auto index = static_cast<size_t>(i % padding_length);

src/command_system.cc

@@ -1,195 +0,0 @@
-#include "config.h"
-
-#include <unistd.h>
-#include <sys/stat.h>
-#include <torrent/data/file_manager.h>
-#include <torrent/runtime/client_config.h>
-#include <torrent/runtime/memory_manager.h>
-#include <torrent/runtime/socket_manager.h>
-#include <torrent/runtime/runtime.h>
-#include <torrent/utils/chrono.h>
-#include <torrent/utils/option_strings.h>
-
-#include "command_helpers.h"
-#include "control.h"
-#include "globals.h"
-#include "core/manager.h"
-#include "session/session_manager.h"
-#include "utils/file_status_cache.h"
-
-
-torrent::Object
-system_env(const torrent::Object::string_type& arg) {
-  if (arg.empty())
-    throw torrent::input_error("system.env: Missing variable name.");
-
-  char* val = getenv(arg.c_str());
-  return std::string(val ? val : "");
-}
-
-torrent::Object
-system_hostname() {
-  char buffer[1024];
-
-  if (gethostname(buffer, 1023) == -1)
-    throw torrent::input_error("Unable to read hostname.");
-
-//   if (shorten)
-//     *std::find(buffer, buffer + 1023, '.') = '\0';
-
-  return std::string(buffer);
-}
-
-torrent::Object
-system_get_cwd() {
-  char* buffer = getcwd(NULL, 0);
-
-  if (buffer == NULL)
-    throw torrent::input_error("Unable to read cwd.");
-
-  torrent::Object result = torrent::Object(std::string(buffer));
-  free(buffer);
-
-  return result;
-}
-
-torrent::Object
-system_set_cwd(const torrent::Object::string_type& rawArgs) {
-  if (::chdir(rawArgs.c_str()) != 0)
-    throw torrent::input_error("Could not change current working directory.");
-
-  return torrent::Object();
-}
-
-uint32_t
-checked_socket_value(int64_t value, const char* label) {
-  if (value < 0 || value > std::numeric_limits<uint32_t>::max())
-    throw torrent::input_error(std::string("Invalid ") + label + " value.");
-
-  return static_cast<uint32_t>(value);
-}
-
-void
-initialize_command_system() {
-  CMD_ANY         ("system.hostname", std::bind(&system_hostname));
-  CMD_ANY         ("system.pid",      std::bind(&getpid));
-
-  CMD_VAR_C_STRING("system.api_version",           (int64_t)API_VERSION);
-  CMD_VAR_C_STRING("system.client_version",        PACKAGE_VERSION);
-  CMD_VAR_C_STRING("system.library_version",       torrent::runtime::version());
-
-  CMD_ANY         ("system.torrent_name.use_sanitized",     [](auto, auto)        { return torrent::runtime::client_config()->torrent_name_use_sanitized(); });
-  CMD_ANY_VALUE_V ("system.torrent_name.use_sanitized.set", [](auto, auto& value) { return torrent::runtime::client_config()->set_torrent_name_use_sanitized(value); });
-
-  CMD_VAR_VALUE   ("system.file.allocate",         0);
-  CMD_VAR_VALUE   ("system.file.max_size",         (int64_t)512 << 30);
-  CMD_VAR_VALUE   ("system.file.split_size",       -1);
-  CMD_VAR_STRING  ("system.file.split_suffix",     ".part");
-
-  CMD_ANY         ("system.file_name.replace_slash",     [](auto, auto)      { return torrent::runtime::client_config()->file_name_replace_slash(); });
-  CMD_ANY_STRING_V("system.file_name.replace_slash.set", [](auto, auto& str) { return torrent::runtime::client_config()->set_file_name_replace_slash(str); });
-
-  CMD_ANY         ("system.file_status_cache.size",      [](auto, auto)      { return control->core()->file_status_cache()->size(); });
-  CMD_ANY_V       ("system.file_status_cache.prune",     [](auto, auto)      { return control->core()->file_status_cache()->prune(); });
-
-  CMD_VAR_BOOL    ("file.prioritize_toc",          0);
-  CMD_VAR_LIST    ("file.prioritize_toc.first");
-  CMD_VAR_LIST    ("file.prioritize_toc.last");
-
-  CMD_ANY         ("system.files.advise_random",             [](auto, auto)        { return torrent::file_manager()->advise_random(); });
-  CMD_ANY_VALUE_V ("system.files.advise_random.set",         [](auto, auto& value) { return torrent::file_manager()->set_advise_random(value); });
-  CMD_ANY         ("system.files.advise_random.hashing",     [](auto, auto)        { return torrent::file_manager()->advise_random_hashing(); });
-  CMD_ANY_VALUE_V ("system.files.advise_random.hashing.set", [](auto, auto& value) { return torrent::file_manager()->set_advise_random_hashing(value); });
-  CMD_ANY         ("system.files.session.fdatasync",         [](auto, auto)        { return session_thread::manager()->use_fsyncdisk(); });
-  CMD_ANY_VALUE_V ("system.files.session.fdatasync.set",     [](auto, auto& value) { return session_thread::manager()->set_use_fsyncdisk(value); });
-
-  CMD_ANY         ("system.files.close_idle",         [](auto, auto)        { return torrent::file_manager()->close_idle_timeout().count(); });
-  CMD_ANY_VALUE_V ("system.files.close_idle.set",     [](auto, auto& value) { return torrent::file_manager()->set_close_idle_timeout(value * 1s); });
-
-  CMD_ANY         ("system.files.opened_counter",     [](auto, auto)        { return torrent::file_manager()->files_opened_counter(); });
-  CMD_ANY         ("system.files.closed_counter",     [](auto, auto)        { return torrent::file_manager()->files_closed_counter(); });
-  CMD_ANY         ("system.files.failed_counter",     [](auto, auto)        { return torrent::file_manager()->files_failed_counter(); });
-
-  CMD_ANY_STRING  ("system.env",                      [](auto, auto& str)   { return system_env(str); });
-
-  CMD_ANY         ("system.time",                     [](auto, auto)        { return torrent::this_thread::cached_seconds().count(); });
-  CMD_ANY         ("system.time_seconds",             [](auto, auto)        { return torrent::utils::cast_seconds(torrent::utils::time_since_epoch()).count(); });
-  CMD_ANY         ("system.time_usec",                [](auto, auto)        { return torrent::utils::time_since_epoch().count(); });
-
-  CMD_ANY_VALUE_V ("system.umask.set",                [](auto, auto& value) { return ::umask(value); });
-
-  CMD_VAR_BOOL    ("system.daemon",                   false);
-
-  CMD_ANY_V       ("system.shutdown.normal",          [](auto, auto)        { control->receive_normal_shutdown(); });
-  CMD_ANY_V       ("system.shutdown.quick",           [](auto, auto)        { control->receive_quick_shutdown(); });
-
-  CMD_REDIRECT_NO_EXPORT("system.shutdown", "system.shutdown.normal");
-
-  CMD_ANY         ("system.cwd",                      [](auto, auto)        { return system_get_cwd(); });
-  CMD_ANY_STRING  ("system.cwd.set",                  [](auto, auto& str)   { return system_set_cwd(str); });
-
-  CMD_ANY         ("system.sockets.size",             [](auto, auto)        { return torrent::runtime::socket_manager()->size(); });
-  CMD_ANY         ("system.sockets.max_size",         [](auto, auto)        { return torrent::runtime::socket_manager()->max_size(); });
-  CMD_ANY_VALUE_V ("system.sockets.max_size.set",     [](auto, auto& value) {
-      return torrent::runtime::socket_manager()->set_max_size_and_adjust(checked_socket_value(value, "socket max size"));
-    });
-  CMD_ANY_V       ("system.sockets.adjust_alloc",     [](auto, auto)        { torrent::runtime::socket_manager()->adjust_allocation(); });
-  CMD_ANY         ("system.sockets.reserved_alloc",   [](auto, auto)        { return torrent::runtime::socket_manager()->reserved_allocation(); });
-  CMD_ANY         ("system.sockets.available_alloc",  [](auto, auto)        { return torrent::runtime::socket_manager()->available_allocation(); });
-
-  for (uint32_t i = 0; i < torrent::runtime::SocketManager::category_count; ++i) {
-    auto category      = static_cast<torrent::runtime::socket_manager_category_t>(i);
-    auto category_name = "system.sockets." + torrent::option_to_str_or_throw(torrent::OPTION_SOCKET_CATEGORY, i);
-
-    CMD_ANY        (category_name + ".size",      [category](auto, auto) { return torrent::runtime::socket_manager()->category_managed_size(category); });
-    CMD_ANY        (category_name + ".max_size",  [category](auto, auto) { return torrent::runtime::socket_manager()->category_max_size(category); });
-
-    if (i == 0) {
-      CMD_ANY      (category_name + ".min_alloc", [](auto, auto) { return torrent::runtime::socket_manager()->generic_min_allocation(); });
-      continue;
-    }
-
-    CMD_ANY        (category_name + ".max_alloc.limit", [category](auto, auto)        { return torrent::runtime::socket_manager()->category_alloc_limit(category); });
-    CMD_ANY        (category_name + ".min_alloc.limit", [category](auto, auto)        { return torrent::runtime::socket_manager()->category_alloc_minimum(category); });
-    CMD_ANY        (category_name + ".min_alloc",       [category](auto, auto)        { return torrent::runtime::socket_manager()->category_min_allocation(category); });
-    CMD_ANY        (category_name + ".max_alloc",       [category](auto, auto)        { return torrent::runtime::socket_manager()->category_max_allocation(category); });
-    CMD_ANY_VALUE_V(category_name + ".min_alloc.set",   [category](auto, auto& value) {
-        torrent::runtime::socket_manager()->set_category_min_allocation(category, checked_socket_value(value, "socket min alloc"));
-      });
-    CMD_ANY_VALUE_V(category_name + ".max_alloc.set",   [category](auto, auto& value) {
-        torrent::runtime::socket_manager()->set_category_max_allocation(category, checked_socket_value(value, "socket max alloc"));
-      });
-  }
-
-  rpc::rpc.mark_safe("system.api_version");
-  rpc::rpc.mark_safe("system.client_version");
-  rpc::rpc.mark_safe("system.library_version");
-  rpc::rpc.mark_safe("system.time");
-  rpc::rpc.mark_safe("system.time_seconds");
-  rpc::rpc.mark_safe("system.time_usec");
-  rpc::rpc.mark_safe("system.file.max_size");
-  rpc::rpc.mark_safe("system.file.split_size");
-  rpc::rpc.mark_safe("system.file.split_suffix");
-
-  rpc::rpc.mark_safe("system.sockets.size");
-  rpc::rpc.mark_safe("system.sockets.max_size");
-  rpc::rpc.mark_safe("system.sockets.reserved_alloc");
-  rpc::rpc.mark_safe("system.sockets.available_alloc");
-
-  for (uint32_t i = 0; i < torrent::runtime::SocketManager::category_count; ++i) {
-    auto category_name = "system.sockets." + torrent::option_to_str_or_throw(torrent::OPTION_SOCKET_CATEGORY, i);
-
-    rpc::rpc.mark_safe(category_name + ".size");
-    rpc::rpc.mark_safe(category_name + ".max_size");
-
-    if (i == 0) {
-      rpc::rpc.mark_safe(category_name + ".min_alloc");
-      continue;
-    }
-
-    rpc::rpc.mark_safe(category_name + ".max_alloc.limit");
-    rpc::rpc.mark_safe(category_name + ".min_alloc.limit");
-    rpc::rpc.mark_safe(category_name + ".min_alloc");
-    rpc::rpc.mark_safe(category_name + ".max_alloc");
-  }
-}

src/command_throttle.cc

@@ -1,9 +1,10 @@
 #include "config.h"
 
-#include <limits>
+#include <cstdio>
 #include <torrent/throttle.h>
 #include <torrent/rate.h>
 #include <torrent/download/resource_manager.h>
+#include <torrent/net/socket_address.h>
 
 #include "core/manager.h"
 #include "ui/root.h"
@@ -14,6 +15,59 @@
 #include "control.h"
 #include "command_helpers.h"
 
+std::pair<uint32_t, uint32_t>
+parse_address_range(const torrent::Object::list_type& args, torrent::Object::list_type::const_iterator itr) {
+  unsigned int prefixWidth, ret;
+  char dummy;
+  char host[1024];
+  torrent::sa_unique_ptr sa;
+
+  ret = std::sscanf(itr->as_string().c_str(), "%1023[^/]/%d%c", host, &prefixWidth, &dummy);
+
+  if (ret < 1)
+    throw torrent::input_error("Invalid address/prefix.");
+
+  try {
+    sa = torrent::sa_copy(torrent::sa_lookup_address(host, AF_INET).get());
+
+  } catch (torrent::input_error& e) {
+    throw torrent::input_error("Could not resolve host: " + std::string(e.what()));
+  }
+
+  uint32_t begin, end;
+
+  auto sa_addr = htonl(reinterpret_cast<sockaddr_in*>(sa.get())->sin_addr.s_addr);
+
+  begin = end = sa_addr;
+
+  if (ret == 2) {
+    if (++itr != args.end())
+      throw torrent::input_error("Cannot specify both network and range end.");
+
+    uint32_t netmask = std::numeric_limits<uint32_t>::max() << (32 - prefixWidth);
+
+    if (prefixWidth >= 32 || sa_addr & ~netmask)
+      throw torrent::input_error("Invalid address/prefix.");
+
+    end = sa_addr | ~netmask;
+
+  } else if (++itr != args.end()) {
+    try {
+      sa = torrent::sa_copy(torrent::sa_lookup_address(itr->as_string(), AF_INET).get());
+
+    } catch (torrent::input_error& e) {
+      throw torrent::input_error("Could not resolve host: " + std::string(e.what()));
+    }
+
+    sa_addr = htonl(reinterpret_cast<sockaddr_in*>(sa.get())->sin_addr.s_addr);
+    end = sa_addr;
+  }
+
+  // convert to [begin, end) making sure the end doesn't overflow
+  // (this precludes 255.255.255.255 from ever matching, but that's not a real IP anyway)
+  return std::make_pair((uint32_t)begin, (uint32_t)std::max(end, end + 1));
+}
+
 torrent::Object
 apply_throttle(const torrent::Object::list_type& args, bool up) {
   auto arg_itr = args.begin();
@@ -29,16 +83,11 @@ apply_throttle(const torrent::Object::list_type& args, bool up) {
     throw torrent::input_error("Missing throttle rate for '" + name + "'.");
 
   int64_t rate;
-
-  if (!rpc::parse_whole_value_nothrow(arg_itr->as_string().c_str(), &rate))
-    throw torrent::input_error("Invalid throttle rate for '" + name + "'.");
+  rpc::parse_whole_value_nothrow(arg_itr->as_string().c_str(), &rate);
 
   if (rate < 0)
     throw torrent::input_error("Throttle rate must be non-negative.");
 
-  if (rate > (std::numeric_limits<int64_t>::max() >> 10))
-    throw torrent::input_error("Throttle rate is too large.");
-
   auto itr = control->core()->throttles().find(name);
 
   if (itr == control->core()->throttles().end())

src/command_tracker.cc

@@ -68,11 +68,11 @@ apply_dht_add_node(const std::string& arg) {
 torrent::Object
 apply_enable_trackers(int64_t arg) {
   if (arg == 0) {
-    for (const auto& download : *control->core()->download_list())
+    for (auto download : *control->core()->download_list())
       download->tracker_controller().for_each([](auto& tracker) { tracker.disable(); });
 
   } else {
-    for (const auto& download : *control->core()->download_list())
+    for (auto download : *control->core()->download_list())
       download->tracker_controller().for_each([](auto& tracker) { tracker.enable(); });
   }
 

src/command_ui.cc

@@ -2,9 +2,7 @@
 
 #include <sys/types.h>
 
-#include <cerrno>
 #include <ctime>
-#include <limits>
 #include <regex>
 #include <torrent/utils/log.h>
 
@@ -127,20 +125,11 @@ apply_value([[maybe_unused]] rpc::target_type target, const torrent::Object::lis
   if (args.front().is_value()) {
     val = args.front().as_value();
   } else {
-    int64_t base = args.size() > 1 ? args.back().is_value() ?
-                   args.back().as_value() : strtoll(args.back().as_string().c_str(), NULL, 10) : 10;
-
-    if (base != 0 && (base < 2 || base > 36))
-      throw torrent::input_error("'value' base must be 0 or between 2 and 36!");
-
+    int base = args.size() > 1 ? args.back().is_value() ?
+               args.back().as_value() : strtol(args.back().as_string().c_str(), NULL, 10) : 10;
     char* endptr = 0;
-    errno = 0;
 
     val = strtoll(args.front().as_string().c_str(), &endptr, base);
-
-    if (errno == ERANGE)
-      throw torrent::input_error("Number out of range: " + args.front().as_string());
-
     while (*endptr == ' ' || *endptr == '\n') ++endptr;
     if (*endptr)
       throw torrent::input_error("Junk at end of number: " + args.front().as_string());
@@ -418,9 +407,8 @@ apply_to_time(const torrent::Object& rawArgs, int flags) {
 torrent::Object
 apply_to_elapsed_time(const torrent::Object& rawArgs) {
   auto cached_seconds = torrent::this_thread::cached_seconds().count();
-  auto value          = rawArgs.as_value();
 
-  uint64_t arg = value >= 0 && value <= cached_seconds ? cached_seconds - value : 0;
+  uint64_t arg = cached_seconds - rawArgs.as_value();
 
   char buffer[48];
   snprintf(buffer, 48, "%2d:%02d:%02d", (int)(arg / 3600), (int)((arg / 60) % 60), (int)(arg % 60));
@@ -686,13 +674,8 @@ apply_math_basic(const char* name, Comp op, const torrent::Object::list_type& ar
       throw torrent::input_error(std::string(name) + ": Wrong argument type");
     }
 
-    if (divides && itr != args.begin()) {
-      if (rhs == 0)
-        throw torrent::input_error(std::string(name) + ": Division by zero!");
-
-      if (val == std::numeric_limits<int64_t>::min() && rhs == -1)
-        throw torrent::input_error(std::string(name) + ": Division overflow!");
-    }
+    if (divides && !rhs && itr != args.begin())
+      throw torrent::input_error(std::string(name) + ": Division by zero!");
 
     val = itr == args.begin() ? rhs : op(val, rhs);
 
@@ -933,7 +916,6 @@ initialize_command_ui() {
 
   rpc::rpc.mark_safe("view.set_visible");
   rpc::rpc.mark_safe("view.set_not_visible");
-  rpc::rpc.mark_safe("view.list");
 
   rpc::rpc.mark_safe("cat");
   rpc::rpc.mark_safe("if");

src/control.h

@@ -118,6 +118,4 @@ private:
   std::atomic<bool>   m_shutdown_quick{};
 };
 
-extern Control* control;
-
 #endif

src/core/dht_manager.cc

@@ -4,7 +4,6 @@
 
 #include <fstream>
 #include <sstream>
-#include <torrent/exceptions.h>
 #include <torrent/object.h>
 #include <torrent/object_stream.h>
 #include <torrent/rate.h>
@@ -63,14 +62,7 @@ DhtManager::load_dht_cache() {
     LT_LOG("could not open cache file (path:%s)", cache_filename.c_str());
   }
 
-  try {
-    torrent::runtime::network_manager()->dht_controller()->initialize(cache);
-
-  } catch (const torrent::base_error& e) {
-    LT_LOG_ERROR("cache file rejected, discarding (path:%s errmsg:%s)", cache_filename.c_str(), e.what());
-
-    torrent::runtime::network_manager()->dht_controller()->initialize(torrent::Object::create_map());
-  }
+  torrent::runtime::network_manager()->dht_controller()->initialize(cache);
 
   if (m_start == dht_on)
     start_dht();
@@ -140,12 +132,11 @@ DhtManager::save_dht_cache() {
   torrent::Object cache = torrent::Object::create_map();
   cache_file << *torrent::runtime::network_manager()->dht_controller()->store_cache(&cache);
 
-  // The data only reaches the kernel here, so this is where a full disk is seen.
-  cache_file.close();
-
   if (!cache_file.good())
     return;
 
+  cache_file.close();
+
   ::rename(filename_tmp.c_str(), filename.c_str());
 }
 

src/core/download.cc

@@ -101,18 +101,7 @@ Download::set_throttle_name(const std::string& name) {
 }
 
 void
-Download::set_directory(const std::string& path) {
-  if (!m_download.file_list()->is_multi_file())
-    return set_base_directory(path);
-
-  if (path.empty() || *path.rbegin() == '/')
-    return set_base_directory(path + m_download.info()->name_sanitized());
-
-  set_base_directory(path + "/" + m_download.info()->name_sanitized());
-}
-
-void
-Download::set_base_directory(const std::string& path) {
+Download::set_root_directory(const std::string& path) {
   // If the download is open, hashed and has completed chunks make
   // sure to verify that the download files are still present.
   //
@@ -131,12 +120,13 @@ Download::set_base_directory(const std::string& path) {
        !file_stat.update(file_list->front()->frozen_path().str()))) {
 
     set_message("Cannot change the directory of an open download after the files have been moved.");
+    rpc::call_command("d.state.set", (int64_t)0, rpc::make_target(this));
     control->core()->download_list()->close_directly(this);
 
     throw torrent::input_error("Cannot change the directory of an open download after the files have been moved.");
   }
 
-  control->core()->download_list()->close_files(this);
+  control->core()->download_list()->close_directly(this);
   file_list->set_root_dir(expand_path(path));
 
   bencode()->get_key("rtorrent").insert_key("directory", path);

src/core/download.h

@@ -1,7 +1,6 @@
 #ifndef RTORRENT_CORE_DOWNLOAD_H
 #define RTORRENT_CORE_DOWNLOAD_H
 
-#include <memory>
 #include <torrent/common.h>
 #include <torrent/download.h>
 #include <torrent/download_info.h>
@@ -79,8 +78,7 @@ public:
   uint32_t            resume_flags()                           { return m_resumeFlags; }
   void                set_resume_flags(uint32_t flags)         { m_resumeFlags = flags; }
 
-  void                set_directory(const std::string& path);
-  void                set_base_directory(const std::string& path);
+  void                set_root_directory(const std::string& path);
 
   void                set_throttle_name(const std::string& name);
 

src/core/download_factory.cc

@@ -7,7 +7,6 @@
 #include <functional>
 #include <sstream>
 #include <stdexcept>
-#include <sys/stat.h>
 #include <torrent/utils/log.h>
 #include <torrent/utils/resume.h>
 #include <torrent/object.h>
@@ -40,11 +39,6 @@ static constexpr const char* session_invalid_message = "Session data is invalid,
 
 static std::unique_ptr<torrent::Object>
 download_factory_load_stream(const char* filename, bool* is_invalid) {
-  struct stat sb;
-
-  if (stat(filename, &sb) != 0 || !S_ISREG(sb.st_mode))
-    return std::unique_ptr<torrent::Object>();
-
   std::fstream stream(filename, std::ios::in | std::ios::binary);
 
   if (!stream.is_open())
@@ -173,19 +167,11 @@ void
 DownloadFactory::receive_success() {
   bool session_invalid = false;
 
-  std::unique_ptr<torrent::Object> rtorrent_object;
-  std::unique_ptr<torrent::Object> libtorrent_resume_object;
+  auto rtorrent_object          = download_factory_load_stream((expand_path(m_uri) + ".rtorrent").c_str(), &session_invalid);
+  auto libtorrent_resume_object = download_factory_load_stream((expand_path(m_uri) + ".libtorrent_resume").c_str(), &session_invalid);
 
-  if (m_session) {
-    if (m_uri.empty())
-      throw torrent::input_error("Session torrent URI is empty.");
-
-    rtorrent_object          = download_factory_load_stream((expand_path(m_uri) + ".rtorrent").c_str(), &session_invalid);
-    libtorrent_resume_object = download_factory_load_stream((expand_path(m_uri) + ".libtorrent_resume").c_str(), &session_invalid);
-
-    if (session_invalid)
-      lt_log_print(torrent::LOG_ERROR, "%s: %s", session_invalid_message, m_uri.c_str());
-  }
+  if (session_invalid)
+    lt_log_print(torrent::LOG_ERROR, "%s: %s", session_invalid_message, m_uri.c_str());
 
   uint32_t tracker_key;
 

src/core/download_list.cc

@@ -37,7 +37,7 @@ namespace core {
 inline void
 DownloadList::check_contains([[maybe_unused]] Download* d) {
 #ifdef USE_EXTRA_DEBUG
-  if (std::find_if(begin(), end(), [d](const auto& entry) { return entry.get() == d; }) == end())
+  if (std::find(begin(), end(), d) == end())
     throw torrent::internal_error("DownloadList::check_contains(...) failed.");
 #endif
 }
@@ -54,6 +54,7 @@ DownloadList::clear() {
       base_type::pop_back();
 
       torrent::download_remove(*download->download());
+      delete download;
 
     } catch (torrent::internal_error& e) {
       lt_log_print(torrent::LOG_ERROR, "DownloadList::clear() failed to close or remove download: %s", e.what());
@@ -69,7 +70,7 @@ DownloadList::clear() {
 void
 DownloadList::session_save() {
   for (auto& download : *this)
-    session_thread::manager()->save_resume_download(download.get());
+    session_thread::manager()->save_resume_download(download);
 
   control->dht_manager()->save_dht_cache();
   control->ui()->save_input_history();
@@ -77,7 +78,7 @@ DownloadList::session_save() {
 
 DownloadList::iterator
 DownloadList::find(const torrent::HashString& hash) {
-  return std::find_if(begin(), end(), [hash](const auto& d) { return hash == d->info()->hash(); });
+  return std::find_if(begin(), end(), [hash](Download* d) { return hash == d->info()->hash(); });
 }
 
 DownloadList::iterator
@@ -90,14 +91,14 @@ DownloadList::find_hex(const char* hash) {
   if (torrent::utils::transform_from_hex(hash, hash + 40, key) != key.end())
     return end();
 
-  return std::find_if(begin(), end(), [key](const auto& d) { return key == d->info()->hash(); });
+  return std::find_if(begin(), end(), [key](Download* d) { return key == d->info()->hash(); });
 }
 
 Download*
 DownloadList::find_hex_ptr(const char* hash) {
   iterator itr = find_hex(hash);
 
-  return itr != end() ? itr->get() : NULL;
+  return itr != end() ? *itr : NULL;
 }
 
 Download*
@@ -158,7 +159,7 @@ DownloadList::create(std::istream* str, uint32_t tracker_key, bool printLog) {
 
 DownloadList::iterator
 DownloadList::insert(Download* download) {
-  iterator itr = base_type::insert(end(), std::shared_ptr<Download>(download));
+  iterator itr = base_type::insert(end(), download);
 
   lt_log_print_info(torrent::LOG_TORRENT_INFO, download->info(), "download_list", "Inserting download.");
 
@@ -169,7 +170,7 @@ DownloadList::insert(Download* download) {
     // This needs to be separated into two different calls to ensure
     // the download remains in the view.
     for (auto v : *control->view_manager())
-      v->insert(*itr);
+      v->insert(download);
     for (auto v : *control->view_manager())
       v->filter_download(download);
 
@@ -186,7 +187,7 @@ DownloadList::insert(Download* download) {
 
 void
 DownloadList::erase_ptr(Download* download) {
-  erase(std::find_if(begin(), end(), [download](const auto& entry) { return entry.get() == download; }));
+  erase(std::find(begin(), end(), download));
 }
 
 DownloadList::iterator
@@ -200,14 +201,15 @@ DownloadList::erase(iterator itr) {
   (*itr)->set_hash_failed(true);
 
   close(*itr);
-  session_thread::manager()->remove_download(itr->get());
+  session_thread::manager()->remove_download(*itr);
 
   DL_TRIGGER_EVENT(*itr, "event.download.erased");
 
   for (auto v : *control->view_manager())
-    v->erase(itr->get());
+    v->erase(*itr);
 
   torrent::download_remove(*(*itr)->download());
+  delete *itr;
 
   return base_type::erase(itr);
 }
@@ -254,11 +256,9 @@ DownloadList::close(Download* download) {
   }
 }
 
-// Releases the files without changing the download's state, for callers that
-// need the files closed and will keep using the download.
 void
-DownloadList::close_files(Download* download) {
-  lt_log_print_info(torrent::LOG_TORRENT_INFO, download->info(), "download_list", "Closing download files.");
+DownloadList::close_directly(Download* download) {
+  lt_log_print_info(torrent::LOG_TORRENT_INFO, download->info(), "download_list", "Closing download directly.");
 
   if (download->download()->info()->is_active()) {
     download->download()->stop(torrent::Download::stop_skip_tracker);
@@ -271,44 +271,6 @@ DownloadList::close_files(Download* download) {
     download->download()->close();
 }
 
-void
-DownloadList::close_directly(Download* download) {
-  lt_log_print_info(torrent::LOG_TORRENT_INFO, download->info(), "download_list", "Closing download directly.");
-
-  bool was_active = download->download()->info()->is_active();
-  bool was_open   = download->download()->info()->is_open();
-
-  close_files(download);
-  set_state_stopped(download);
-
-  if (was_active) {
-    DL_TRIGGER_EVENT(download, "event.download.paused");
-    update_paused_state(download);
-  }
-
-  if (was_open) {
-    DL_TRIGGER_EVENT(download, "event.download.hash_removed");
-    DL_TRIGGER_EVENT(download, "event.download.closed");
-  }
-}
-
-void
-DownloadList::set_state_stopped(Download* download) {
-  control->view_manager()->find_ptr_throw("stopped")->set_visible(download);
-  rpc::call_command("d.state.set", (int64_t)0, rpc::make_target(download));
-}
-
-void
-DownloadList::update_paused_state(Download* download) {
-  rpc::call_command("d.state_changed.set", torrent::this_thread::cached_seconds().count(), rpc::make_target(download));
-  rpc::call_command("d.state_counter.set", rpc::call_command_value("d.state_counter", rpc::make_target(download)) + 1, rpc::make_target(download));
-
-  // If initial seeding is complete, don't try it again when restarting.
-  if (download->is_done() &&
-      rpc::call_command("d.connection_current", torrent::Object(), rpc::make_target(download)).as_string() == "initial_seed")
-    rpc::call_command("d.connection_seed.set", rpc::call_command("d.connection_current", torrent::Object(), rpc::make_target(download)), rpc::make_target(download));
-}
-
 void
 DownloadList::close_quick(Download* download) {
   lt_log_print_info(torrent::LOG_TORRENT_INFO, download->info(), "download_list", "Closing download quickly.");
@@ -483,7 +445,15 @@ DownloadList::pause(Download* download, int flags) {
     // view.
     DL_TRIGGER_EVENT(download, "event.download.paused");
 
-    update_paused_state(download);
+    auto cached_seconds = torrent::this_thread::cached_seconds().count();
+
+    rpc::call_command("d.state_changed.set", cached_seconds, rpc::make_target(download));
+    rpc::call_command("d.state_counter.set", rpc::call_command_value("d.state_counter", rpc::make_target(download)), rpc::make_target(download));
+
+    // If initial seeding is complete, don't try it again when restarting.
+    if (download->is_done() &&
+        rpc::call_command("d.connection_current", torrent::Object(), rpc::make_target(download)).as_string() == "initial_seed")
+      rpc::call_command("d.connection_seed.set", rpc::call_command("d.connection_current", torrent::Object(), rpc::make_target(download)), rpc::make_target(download));
 
     // Save the state after all the slots, etc have been called so we
     // include the modifications they may make.
@@ -554,7 +524,7 @@ DownloadList::hash_done(Download* download) {
     // If the download was previously completed but the files were
     // f.ex deleted, then we clear the state and complete.
     if (rpc::call_command_value("d.complete", rpc::make_target(download)) && !download->is_done()) {
-      set_state_stopped(download);
+      rpc::call_command("d.state.set", (int64_t)0, rpc::make_target(download));
       download->set_message("Download registered as completed, but hash check returned unfinished chunks.");
     }
 
@@ -726,10 +696,11 @@ DownloadList::process_meta_download(Download* download) {
     return;
   }
 
-  auto bencode = std::make_unique<torrent::Object>(torrent::Object::create_map());
+  torrent::Object* bencode = new torrent::Object(torrent::Object::create_map());
   file >> bencode->insert_key("info", torrent::Object());
 
   if (file.fail()) {
+    delete bencode;
     lt_log_print(torrent::LOG_TORRENT_ERROR, "Could not create download, the input is not a valid torrent.");
     return;
   }
@@ -745,7 +716,7 @@ DownloadList::process_meta_download(Download* download) {
 
   erase_ptr(download);
 
-  control->core()->try_create_download_from_meta_download(std::move(bencode), metafile);
+  control->core()->try_create_download_from_meta_download(bencode, metafile);
 }
 
 }

src/core/download_list.h

@@ -3,7 +3,6 @@
 
 #include <iosfwd>
 #include <list>
-#include <memory>
 #include <string>
 
 namespace torrent {
@@ -21,9 +20,9 @@ class Download;
 //
 // Fix apply_on_ratio if the base_type is changed.
 
-class DownloadList : private std::list<std::shared_ptr<Download>> {
+class DownloadList : private std::list<Download*> {
 public:
-  typedef std::list<std::shared_ptr<Download>> base_type;
+  typedef std::list<Download*>               base_type;
 
   using base_type::iterator;
   using base_type::const_iterator;
@@ -65,17 +64,8 @@ public:
   bool                open(Download* d);
   void                open_throw(Download* d);
 
-  // Overloads for the list's own entries, so callers iterating it do not need
-  // to unwrap.
-  bool                open(const value_type& d)          { return open(d.get()); }
-  void                close(const value_type& d)         { close(d.get()); }
-  void                close_quick(const value_type& d)   { close_quick(d.get()); }
-  void                pause(const value_type& d)         { pause(d.get()); }
-  void                resume(const value_type& d)        { resume(d.get()); }
-
   void                close(Download* d);
   void                close_directly(Download* d);
-  void                close_files(Download* d);
   void                close_quick(Download* d);
   void                close_throw(Download* d);
 
@@ -133,9 +123,6 @@ private:
   void                hash_done(Download* d);
   void                hash_queue(Download* d, int type);
 
-  void                set_state_stopped(Download* d);
-  void                update_paused_state(Download* d);
-
   inline void         check_contains(Download* d);
 
   void                received_finished(Download* d);

src/core/manager.cc

@@ -154,10 +154,10 @@ Manager::cleanup() {
 void
 Manager::shutdown(bool force) {
   if (!force) {
-    for (const auto& d : *m_download_list)
-      m_download_list->pause_default(d.get());
+    for (auto d : *m_download_list)
+      m_download_list->pause_default(d);
   } else {
-    for (const auto& d : *m_download_list)
+    for (auto d : *m_download_list)
       m_download_list->close_quick(d);
   }
 }
@@ -195,14 +195,14 @@ Manager::try_create_download(const std::string& uri, int flags, const command_li
     return;
 
   // Adding download.
-  auto f = std::make_unique<DownloadFactory>(this);
+  DownloadFactory* f = new DownloadFactory(this);
 
   f->variables()["tied_to_file"] = (int64_t)(bool)(flags & create_tied);
   f->commands().insert(f->commands().end(), commands.begin(), commands.end());
 
   f->set_start(flags & create_start);
   f->set_print_log(!(flags & create_quiet));
-  f->slot_finished([factory = f.get()]() { delete factory; });
+  f->slot_finished([f]() { delete f; });
 
   if (is_data_uri(uri)) {
     // Allow the use of data URIs, primarily for JSON-RPC which
@@ -216,13 +216,10 @@ Manager::try_create_download(const std::string& uri, int flags, const command_li
   }
 
   f->commit();
-
-  // From here the finished slot deletes it.
-  f.release();
 }
 
 void
-Manager::try_create_download_from_meta_download(std::unique_ptr<torrent::Object> bencode, const std::string& metafile) {
+Manager::try_create_download_from_meta_download(torrent::Object* bencode, const std::string& metafile) {
   DownloadFactory* f = new DownloadFactory(this);
 
   f->variables()["tied_to_file"] = (int64_t)true;
@@ -408,7 +405,7 @@ Manager::receive_hashing_changed() {
       continue;
 
     try {
-      m_download_list->open_throw(itr->get());
+      m_download_list->open_throw(*itr);
 
       // Since the bitfield is allocated on loading of resume load or
       // hash start, and unallocated on close, we know that if it it

src/core/manager.h

@@ -76,7 +76,7 @@ public:
   // Temporary, find a better place for this.
   void                try_create_download(const std::string& uri, int flags, const command_list_type& commands);
   void                try_create_download_expand(const std::string& uri, int flags, command_list_type commands = command_list_type());
-  void                try_create_download_from_meta_download(std::unique_ptr<torrent::Object> bencode, const std::string& metafile);
+  void                try_create_download_from_meta_download(torrent::Object* bencode, const std::string& metafile);
 
 private:
   void                create_http(const std::string& uri);

src/core/view.cc

@@ -16,20 +16,10 @@
 namespace core {
 
 // Also add focus thingie here?
-// Matches the list entry that owns a given download.
-inline auto
-entry_is(Download* download) {
-  return [download](const std::shared_ptr<Download>& entry) { return entry.get() == download; };
-}
-
 struct view_downloads_compare {
   view_downloads_compare(const torrent::Object& cmd) :
       m_command(cmd) {}
 
-  bool operator()(const std::shared_ptr<Download>& d1, const std::shared_ptr<Download>& d2) const {
-    return (*this)(d1.get(), d2.get());
-  }
-
   bool operator()(Download* d1, Download* d2) const {
     try {
       if (m_command.is_empty())
@@ -64,10 +54,6 @@ struct view_downloads_filter {
   view_downloads_filter(const torrent::Object& cmd, const torrent::Object& cmd2) :
       m_command(cmd), m_command2(cmd2) {}
 
-  bool operator()(const std::shared_ptr<Download>& d1) const {
-    return (*this)(d1.get());
-  }
-
   bool operator()(Download* d1) const {
     return this->evalCmd(m_command, d1) && this->evalCmd(m_command2, d1);
   }
@@ -166,7 +152,7 @@ View::initialize(const std::string& name) {
 
 void
 View::erase(Download* download) {
-  iterator itr = std::find_if(base_type::begin(), base_type::end(), entry_is(download));
+  iterator itr = std::find(base_type::begin(), base_type::end(), download);
 
   if (itr >= end_visible()) {
     erase_internal(itr);
@@ -179,24 +165,22 @@ View::erase(Download* download) {
 
 void
 View::set_visible(Download* download) {
-  iterator itr = std::find_if(begin_filtered(), end_filtered(), entry_is(download));
+  iterator itr = std::find(begin_filtered(), end_filtered(), download);
 
   if (itr == end_filtered())
     return;
 
   // Don't optimize erase since we want to keep the order of the
   // non-visible elements.
-  auto entry = *itr;
-
   base_type::erase(itr);
-  insert_visible(entry);
+  insert_visible(download);
 
   rpc::call_object_nothrow(m_event_added, rpc::make_target(download));
 }
 
 void
 View::set_not_visible(Download* download) {
-  iterator itr = std::find_if(begin_visible(), end_visible(), entry_is(download));
+  iterator itr = std::find(begin_visible(), end_visible(), download);
 
   if (itr == end_visible())
     return;
@@ -206,17 +190,15 @@ View::set_not_visible(Download* download) {
 
   // Don't optimize erase since we want to keep the order of the
   // non-visible elements.
-  auto entry = *itr;
-
   base_type::erase(itr);
-  base_type::push_back(entry);
+  base_type::push_back(download);
 
   rpc::call_object_nothrow(m_event_removed, rpc::make_target(download));
 }
 
 void
 View::next_focus(unsigned int i) {
-  if (empty_visible())
+  if (empty())
     return;
 
   // If at the boundary, roll over
@@ -239,7 +221,7 @@ View::next_focus(unsigned int i) {
 
 void
 View::prev_focus(unsigned int i) {
-  if (empty_visible())
+  if (empty())
     return;
 
   // If at the boundary, roll over
@@ -259,12 +241,12 @@ View::prev_focus(unsigned int i) {
 
 void
 View::sort() {
-  Download* curFocus = focus() != end_visible() ? focus()->get() : NULL;
+  Download* curFocus = focus() != end_visible() ? *focus() : NULL;
 
   // Don't go randomly switching around equivalent elements.
   std::stable_sort(begin(), end_visible(), view_downloads_compare(m_sortCurrent));
 
-  m_focus = position(std::find_if(begin(), end_visible(), entry_is(curFocus)));
+  m_focus = position(std::find(begin(), end_visible(), curFocus));
   emit_changed();
 }
 
@@ -298,10 +280,10 @@ View::filter() {
   // set the elements to NULL as we trigger commands on them. Or
   // perhaps always clear them, thus not throwing anything.
   if (!m_event_removed.is_empty())
-    std::for_each(changed.begin(), splitChanged, [this](const auto& d) { rpc::call_object_d_nothrow(m_event_removed, d.get()); });
+    std::for_each(changed.begin(), splitChanged, std::bind(&rpc::call_object_d_nothrow, m_event_removed, std::placeholders::_1));
 
   if (!m_event_added.is_empty())
-    std::for_each(splitChanged, changed.end(), [this](const auto& d) { rpc::call_object_d_nothrow(m_event_added, d.get()); });
+    std::for_each(changed.begin(), splitChanged, std::bind(&rpc::call_object_d_nothrow, m_event_added, std::placeholders::_1));
 
   emit_changed();
 }
@@ -312,23 +294,21 @@ View::filter_by(const torrent::Object& condition, View::base_type& result) {
   view_downloads_filter matches = view_downloads_filter(condition, m_temp_filter);
 
   for (iterator itr = begin_visible(); itr != end_visible(); ++itr)
-    if (matches(itr->get()))
+    if (matches(*itr))
       result.push_back(*itr);
 }
 
 void
 View::filter_download(core::Download* download) {
-  iterator itr = std::find_if(base_type::begin(), base_type::end(), entry_is(download));
+  iterator itr = std::find(base_type::begin(), base_type::end(), download);
 
   if (itr == base_type::end())
     throw torrent::internal_error("View::filter_download(...) could not find download.");
 
   if (view_downloads_filter(m_filter, m_temp_filter)(download)) {
     if (itr >= end_visible()) {
-      auto entry = *itr;
-
       erase_internal(itr);
-      insert_visible(entry);
+      insert_visible(download);
 
       rpc::call_object_nothrow(m_event_added, rpc::make_target(download));
 
@@ -337,20 +317,16 @@ View::filter_download(core::Download* download) {
       // already visible.
       //
       // Consider removing this.
-      auto entry = *itr;
-
       erase_internal(itr);
-      insert_visible(entry);
+      insert_visible(download);
     }
 
   } else {
     if (itr >= end_visible())
       return;
 
-    auto entry = *itr;
-
     erase_internal(itr);
-    base_type::push_back(entry);
+    base_type::push_back(download);
 
     rpc::call_object_nothrow(m_event_removed, rpc::make_target(download));
   }
@@ -369,8 +345,8 @@ View::clear_filter_on() {
 }
 
 inline void
-View::insert_visible(const std::shared_ptr<Download>& d) {
-  auto itr = std::find_if(begin_visible(), end_visible(), [this, &d](const auto& d2) { return view_downloads_compare(m_sortNew)(d.get(), d2.get()); });
+View::insert_visible(Download* d) {
+  auto itr = std::find_if(begin_visible(), end_visible(), [this, d](auto d2) { return view_downloads_compare(m_sortNew)(d, d2); });
 
   m_size++;
   m_focus += (m_focus >= position(itr));

src/core/view.h

@@ -15,7 +15,6 @@
 
 #include <functional>
 #include <list>
-#include <memory>
 #include <string>
 #include <vector>
 #include <torrent/object.h>
@@ -27,9 +26,9 @@ namespace core {
 
 class Download;
 
-class View : private std::vector<std::shared_ptr<Download>> {
+class View : private std::vector<Download*> {
 public:
-  typedef std::vector<std::shared_ptr<Download>> base_type;
+  typedef std::vector<Download*> base_type;
   typedef std::function<void()>  slot_void;
   typedef std::list<slot_void>   signal_void;
 
@@ -73,7 +72,7 @@ public:
     emit_changed();
   }
 
-  void insert(const std::shared_ptr<Download>& download) { base_type::push_back(download); }
+  void insert(Download* download) { base_type::push_back(download); }
   void erase(Download* download);
 
   void set_visible(Download* download);
@@ -125,9 +124,9 @@ private:
   View(const View&);
   void        operator=(const View&);
 
-  void        push_back(const std::shared_ptr<Download>& d) { base_type::push_back(d); }
+  void        push_back(Download* d) { base_type::push_back(d); }
 
-  inline void insert_visible(const std::shared_ptr<Download>& d);
+  inline void insert_visible(Download* d);
   inline void erase_internal(iterator itr);
 
   void        emit_changed();

src/display/window_download_list.cc

@@ -37,7 +37,7 @@ WindowDownloadList::set_view(core::View* l) {
 // Return a pair of ints, representing a) the ncurses attributes and b) the ncurses color pair ID to use
 std::pair<int, int>
 WindowDownloadList::get_attr_color(core::View::iterator selected) {
-  core::Download* item       = selected->get();
+  core::Download* item       = *selected;
   unsigned long   focus_attr = selected == m_view->focus() ? m_canvas->attr_map().at(RCOLOR_FOCUS) : 0;
   int             offset     = (((selected - m_view->begin_visible()) & 1) + 1) * RCOLOR_MAX; // Determine the even/odd offset for the color pair
   bool            active     = item->is_open() && item->is_active();
@@ -132,15 +132,15 @@ WindowDownloadList::redraw() {
       ColorKind focus_color = is_focused ? RCOLOR_FOCUS : RCOLOR_LABEL;
       auto      attr_color  = get_attr_color(range.first);
 
-      print_download_title(buffer.data(), last, range.first->get());
+      print_download_title(buffer.data(), last, *range.first);
       m_canvas->print(0, pos, "%c %s", focus_char, buffer.data());
       m_canvas->set_attr(2, pos++, -1, attr_color.first, attr_color.second);
 
-      print_download_info_full(buffer.data(), last, range.first->get());
+      print_download_info_full(buffer.data(), last, *range.first);
       m_canvas->print(0, pos, "%c %s", focus_char, buffer.data());
       m_canvas->set_attr(2, pos++, -1, focus_color);
 
-      print_download_status(buffer.data(), last, range.first->get());
+      print_download_status(buffer.data(), last, *range.first);
       m_canvas->print(0, pos, "%c %s", focus_char, buffer.data());
       m_canvas->set_attr(2, pos++, -1, focus_color);
 
@@ -152,7 +152,7 @@ WindowDownloadList::redraw() {
       char focus_char = range.first == m_view->focus() ? '*' : ' ';
       auto attr_color = get_attr_color(range.first);
 
-      print_download_info_compact(buffer.data(), last, range.first->get());
+      print_download_info_compact(buffer.data(), last, *range.first);
       m_canvas->print(0, pos, "%c %s", focus_char, buffer.data());
       m_canvas->set_attr(2, pos++, -1, attr_color.first, attr_color.second);
 

src/display/window_file_list.cc

@@ -25,10 +25,7 @@ WindowFileList::WindowFileList(const ui::ElementFileList* element) :
 // Convert std::string to std::wstring of given width (in screen positions),
 // taking into account that some characters may be occupying two screen positions.
 std::wstring
-wstring_width(const std::string& i_str, int width) {
-  if (width < 0)
-    width = 0;
-
+wstring_width(const std::string& i_str, [[maybe_unused]] int width) {
   std::wstring result(width + 1, L' ');
   size_t length = std::mbstowcs(result.data(), i_str.c_str(), width);
 

src/display/window_log.cc

@@ -1,8 +1,6 @@
 #include "config.h"
 
 #include <ctime>
-#include <mutex>
-#include <vector>
 #include <torrent/torrent.h>
 #include <torrent/system/callbacks.h>
 #include <torrent/system/thread.h>
@@ -43,20 +41,13 @@ WindowLog::redraw() {
 
   int pos = m_canvas->height();
 
-  std::vector<torrent::log_entry> entries;
+  for (iterator itr = m_log->end(), last = find_older(); itr != last && pos > 0; --pos) {
+    itr--;
 
-  {
-    std::lock_guard<torrent::log_buffer> guard(*m_log);
-
-    for (iterator itr = m_log->end(), last = find_older(); itr != last && entries.size() < static_cast<size_t>(pos); )
-      entries.push_back(*--itr);
-  }
-
-  for (const auto& entry : entries) {
     char buffer[16];
-    print_hhmmss_local(buffer, buffer + 16, static_cast<time_t>(entry.timestamp));
+    print_hhmmss_local(buffer, buffer + 16, static_cast<time_t>(itr->timestamp));
 
-    m_canvas->print(0, --pos, "(%s) %s", buffer, entry.message.c_str());
+    m_canvas->print(0, pos - 1, "(%s) %s", buffer, itr->message.c_str());
   }
 }
 
@@ -69,13 +60,8 @@ WindowLog::receive_update() {
   if (!is_active())
     return;
 
-  std::iterator_traits<iterator>::difference_type height;
-
-  {
-    std::lock_guard<torrent::log_buffer> guard(*m_log);
-
-    height = std::min(std::distance(find_older(), (iterator)m_log->end()), (std::iterator_traits<iterator>::difference_type)10);
-  }
+  auto itr    = find_older();
+  auto height = std::min(std::distance(itr, (iterator)m_log->end()), (std::iterator_traits<iterator>::difference_type)10);
 
   if (height != m_max_height) {
     m_min_height = height != 0 ? 1 : 0;

src/display/window_log_complete.cc

@@ -1,8 +1,6 @@
 #include "config.h"
 
 #include <ctime>
-#include <mutex>
-#include <vector>
 
 #include "canvas.h"
 #include "utils.h"
@@ -31,34 +29,24 @@ WindowLogComplete::redraw() {
 
   int pos = m_canvas->height();
 
-  std::vector<torrent::log_entry> entries;
-
-  {
-    std::lock_guard<torrent::log_buffer> guard(*m_log);
-
-    for (iterator itr = m_log->end(), last = m_log->begin(); itr != last && entries.size() < static_cast<size_t>(pos); )
-      entries.push_back(*--itr);
-  }
-
-  for (const auto& entry : entries) {
-    if (pos <= 0)
-      break;
+  for (iterator itr = m_log->end(), last = m_log->begin(); itr != last && pos > 0; ) {
+    itr--;
 
     char buffer[16];
 
     // Use an arbitrary min width of 60 for allowing multiple
     // lines. This should ensure we don't mess up the display when the
     // screen is shrunk too much.
-    unsigned int timeWidth = 3 + print_hhmmss_local(buffer, buffer + 16, static_cast<time_t>(entry.timestamp)) - buffer;
+    unsigned int timeWidth = 3 + print_hhmmss_local(buffer, buffer + 16, static_cast<time_t>(itr->timestamp)) - buffer;
 
     unsigned int logWidth  = m_canvas->width() > 60 ? (m_canvas->width() - timeWidth) : (60 - timeWidth);
-    unsigned int logHeight = (entry.message.size() + logWidth - 1) / logWidth;
+    unsigned int logHeight = (itr->message.size() + logWidth - 1) / logWidth;
 
     for (unsigned int j = logHeight; j > 0 && pos > 0; --j, --pos)
       if (j == 1)
-        m_canvas->print(0, pos - 1, "(%s) %s", buffer, entry.message.substr(0, m_canvas->width() - timeWidth).c_str());
+        m_canvas->print(0, pos - 1, "(%s) %s", buffer, itr->message.substr(0, m_canvas->width() - timeWidth).c_str());
       else
-        m_canvas->print(timeWidth, pos - 1, "%s", entry.message.substr(logWidth * (j - 1), m_canvas->width() - timeWidth).c_str());
+        m_canvas->print(timeWidth, pos - 1, "%s", itr->message.substr(logWidth * (j - 1), m_canvas->width() - timeWidth).c_str());
   }
 }
 

src/input/input_event.cc

@@ -11,8 +11,7 @@ namespace input {
 
 void
 InputEvent::insert() {
-  torrent::this_thread::poll()->open(this);
-  torrent::this_thread::poll()->insert_read(this);
+  torrent::this_thread::poll()->open_and_insert_read(this);
 }
 
 void

src/main.cc

@@ -112,8 +112,9 @@ main(int argc, char** argv) {
 
     torrent::log_initialize();
 
-    // TODO: Create a fake thread object for initializing other processes and enabling logging.
-    torrent::initialize_main_thread();
+    torrent::runtime::initialize_worker_process_and_main_thread([argc, argv]() {
+        parse_config_file(argc, argv, [](auto& path) { parse_config_file_comments("worker", path); });
+      });
 
     // Block SIGCHLD until all threads are created, then unblock on main-thread, to avoid SIGCHLD
     // interrupting other threads.
@@ -136,12 +137,10 @@ main(int argc, char** argv) {
     // # do:log.open_file=system,/usr/rakshasa/system.log
     // # do:log.add_output=system,system
     //
-    parse_config_file(argc, argv, [](auto& path) {
-        if (path.empty())
-          return;
-
-        parse_config_file_comments(path);
-      });
+    // # do-worker:log.open_file=system,/usr/rakshasa/system-worker.log
+    // # do-worker:log.add_output=system,system
+    //
+    parse_config_file(argc, argv, [](auto& path) { parse_config_file_comments("", path); });
 
     control = new Control;
 
@@ -164,6 +163,8 @@ main(int argc, char** argv) {
     torrent::initialize();
     torrent::main_thread::set_client_callback(&client_perform);
 
+    torrent::runtime::initialize_worker_process();
+
     scgi::ThreadScgi::create_thread();
     session::ThreadSession::create_thread();
 
@@ -379,12 +380,6 @@ main(int argc, char** argv) {
         lt_log_print(torrent::LOG_WARN, "network.max_open_files.set is deprecated, use system.sockets.files.min_alloc.set instead.");
       });
 
-    // TODO: Keep d.directory_base for a while as it is widely used.
-    CMD_REDIRECT("d.directory_base",     "d.directory");
-    CMD_REDIRECT("d.directory_base.set", "d.directory.base.set");
-
-    rpc::rpc.mark_safe("d.directory_base");
-
     // if (rpc::call_command_value("method.use_intermediate") == 1) {
 
     // } else if (rpc::call_command_value("method.use_intermediate") == 2) {
@@ -550,6 +545,8 @@ handle_sigbus(int signum, siginfo_t* sa, [[maybe_unused]] void* ptr) {
 #else
   output << "Stack dump not enabled." << std::endl;
 #endif
+  output << std::endl << "Error: " << std::strerror(sa->si_errno) << std::endl;
+
   const char* signal_reason;
 
   switch (sa->si_code) {

src/option_parser.cc

@@ -108,6 +108,6 @@ OptionParser::call_int_pair(slot_int_pair slot, const std::string& arg) {
 
   if (a < 0 || b < 0)
     throw std::runtime_error("Invalid argument, \"" + arg + "\" should be positive numbers");
-  
+
   slot(a, b);
 }

src/rpc/command.cc

@@ -1,7 +1,5 @@
 #include "config.h"
 
-#include <limits>
-
 #include "core/download.h"
 #include "parse.h"
 
@@ -43,13 +41,7 @@ command_base_call_value_base(command_base* command_raw, target_type target, cons
     return command_base::_call<typename command_value_function<T>::type, T>(command_raw, target, val);
   }
 
-  auto value = arg.as_value();
-
-  if (value > std::numeric_limits<int64_t>::max() / unit ||
-      value < std::numeric_limits<int64_t>::min() / unit)
-    throw torrent::input_error("Value out of range.");
-
-  return command_base::_call<typename command_value_function<T>::type, T>(command_raw, target, unit * value);
+  return command_base::_call<typename command_value_function<T>::type, T>(command_raw, target, unit * arg.as_value());
 }
 
 template <typename T> const torrent::Object

src/rpc/command_map.h

@@ -1,7 +1,6 @@
 #ifndef RTORRENT_RPC_COMMAND_MAP_H
 #define RTORRENT_RPC_COMMAND_MAP_H
 
-#include <memory>
 #include <map>
 #include <string>
 #include <cstring>
@@ -105,10 +104,6 @@ inline target_type make_target(T target) {
   return target_type((int)target_type_id<T>::value, target);
 }
 
-inline target_type make_target(const std::shared_ptr<core::Download>& target) {
-  return make_target(target.get());
-}
-
 template <typename T>
 inline target_type make_target_pair(T target1, T target2) {
   return target_type((int)target_type_id<T, T>::value, target1, target2);

src/rpc/command_scheduler.cc

@@ -61,20 +61,14 @@ CommandScheduler::call_item(value_type item) {
   // Remove the item before calling the command if it should be
   // removed.
 
-  std::string key = item->key();
-
   try {
     rpc::call_object(item->command());
 
   } catch (torrent::input_error& e) {
     if (m_slotErrorMessage)
-      m_slotErrorMessage("Scheduled command failed: " + key + ": " + e.what());
+      m_slotErrorMessage("Scheduled command failed: " + item->key() + ": " + e.what());
   }
 
-  // The command is allowed to erase or replace this item, which deletes it.
-  if (std::find(begin(), end(), item) == end())
-    return;
-
   // Still schedule if we caught a torrrent::input_error?
   auto next = item->next_time_scheduled();
 

src/rpc/jsonrpc.cc

@@ -13,7 +13,6 @@
 #include "rpc/command_map.h"
 #include "rpc/nlohmann/json.h"
 #include "rpc/parse_commands.h"
-#include "rpc/scgi_task.h"
 #include "torrent/exceptions.h"
 #include "torrent/object.h"
 #include "utils/functional.h"
@@ -27,12 +26,10 @@ constexpr int JSONRPC_METHOD_NOT_FOUND_ERROR = -32601;
 constexpr int JSONRPC_INVALID_PARAMS_ERROR   = -32602;
 constexpr int JSONRPC_INTERNAL_ERROR         = -32000;
 
-constexpr uint32_t max_json_depth = 1024;
-
 using json = nlohmann::json;
 
 torrent::Object
-json_to_object(const json& value, uint32_t depth = 0) {
+json_to_object(const json& value) {
   switch (value.type()) {
   case json::value_t::number_unsigned:
   case json::value_t::number_integer:
@@ -45,26 +42,20 @@ json_to_object(const json& value, uint32_t depth = 0) {
     return torrent::Object(value.get<std::string>());
 
   case json::value_t::array: {
-    if (++depth >= max_json_depth)
-      throw torrent::input_error("invalid parameters: max depth reached");
-
     auto  array_raw = torrent::Object::create_list();
     auto& array     = array_raw.as_list();
 
     for (const auto& entry : value)
-      array.push_back(json_to_object(entry, depth));
+      array.push_back(json_to_object(entry));
 
     return array_raw;
   }
   case json::value_t::object: {
-    if (++depth >= max_json_depth)
-      throw torrent::input_error("invalid parameters: max depth reached");
-
     auto  map_raw = torrent::Object::create_map();
     auto& map     = map_raw.as_map();
 
     for (const auto& entry : value.items())
-      map[entry.key()] = json_to_object(entry.value(), depth);
+      map[entry.key()] = json_to_object(entry.value());
 
     return map_raw;
   }
@@ -147,7 +138,7 @@ jsonrpc_call_command(const std::string& method, const json& params) {
 
   CommandMap::iterator itr = commands.find(method.c_str());
 
-  if (itr == commands.end() || !(itr->second.m_flags & CommandMap::flag_public_rpc)) {
+  if (itr == commands.end()) {
     throw rpc_error(JSONRPC_METHOD_NOT_FOUND_ERROR, "method not found: " + method);
   }
 
@@ -265,17 +256,13 @@ JsonRpc::process(const char* in_buffer, uint32_t length, slot_write callback) {
 
     std::string response_str = response.dump();
 
-    if (response_str.size() > SCgiTask::max_response_size) {
-      const auto& id = response.is_object() && response.contains("id") ? response["id"] : json(nullptr);
-      auto err_str = json_error(JSONRPC_INTERNAL_ERROR, "response size exceeds maximum RPC limit", id).dump();
-
-      return callback(err_str.c_str(), err_str.size());
-    }
-
     return callback(response_str.c_str(), response_str.size());
 
-  } catch (json::exception& e) {
-    // Exception strings may contain invalid UTF-8, hence the ::replace
+  } catch (json::parse_error& e) {
+    auto err_str = json_error(JSONRPC_PARSE_ERROR, e.what(), nullptr).dump(-1, ' ', false, json::error_handler_t::replace);
+    return callback(err_str.c_str(), err_str.size());
+  } catch (json::type_error& e) {
+    // Type errors may be caused by invalid UTF-8 strings in exception strings, hence the ::replace
     auto err_str = json_error(JSONRPC_PARSE_ERROR, e.what(), nullptr).dump(-1, ' ', false, json::error_handler_t::replace);
     return callback(err_str.c_str(), err_str.size());
   }

src/rpc/object_storage.cc

@@ -26,7 +26,10 @@ const size_t object_storage::key_size;
 
 object_storage::iterator
 object_storage::find_raw_string(const torrent::raw_string& key) {
-  return find(key_type::from_raw_string(key));
+  fixed_key_type<64> k;
+  k.set_c_str(key.data());
+
+  return find(k);
 }
 
 object_storage::iterator
@@ -61,12 +64,8 @@ object_storage::insert(const char* key_data, uint32_t key_size, const torrent::O
   if (std::find(key_data, key_data + key_size, '\0') != key_data + key_size)
     throw torrent::input_error("Found nul-char in string.");
 
-  // key_type turns a key this long into the empty key.
-  if (key_size >= object_storage::key_size)
-    throw torrent::input_error("Key is too long.");
-
-  if (key_size == 0)
-    throw torrent::input_error("Key is empty.");
+  // Check for size > key_size.
+  // Check for empty string.
 
   bool use_raw = false;
   torrent::Object object;

src/rpc/object_storage.h

@@ -158,7 +158,14 @@ fixed_key_type<MaxSize>::set_data(const value_type* src_data, size_type src_size
 
 template <size_t MaxSize> inline void
 fixed_key_type<MaxSize>::set_c_str(const value_type* src_data) {
-  set_c_str(src_data, std::strlen(src_data));
+  value_type* itr = m_data;
+  const value_type* last = m_data + max_size;
+
+  while (itr != last && *src_data != '\0')
+    *itr++ = *src_data++;
+
+  *itr = '\0';
+  m_size = std::distance(m_data, itr);
 }
 
 template <size_t MaxSize> inline void

src/rpc/parse.cc

@@ -2,7 +2,6 @@
 
 #include <cstring>
 #include <cstdio>
-#include <limits>
 #include <locale>
 #include <torrent/exceptions.h>
 
@@ -11,8 +10,6 @@
 
 namespace rpc {
 
-constexpr uint32_t max_parse_depth = 1024;
-
 const char*
 parse_skip_wspace(const char* first, const char* last) {
   while (first != last && parse_is_space(*first))
@@ -102,12 +99,6 @@ parse_whole_value_nothrow(const char* src, int64_t* value, int base, int unit) {
   return true;
 }
 
-static bool
-value_fits_shifted(int64_t value, int shift) {
-  return value <= (std::numeric_limits<int64_t>::max() >> shift) &&
-         value >= (std::numeric_limits<int64_t>::min() >> shift);
-}
-
 const char*
 parse_value_nothrow(const char* src, int64_t* value, int base, int unit) {
   if (unit <= 0)
@@ -130,26 +121,20 @@ parse_value_nothrow(const char* src, int64_t* value, int base, int unit) {
   case 'B': ++last; break;
   case 'k':
   case 'K':
-    if (!value_fits_shifted(*value, 10)) return src; // overflow guard
+    if (*value > (int64_t)0x1FFFFFFFFFFFFF) return src; // overflow guard
     *value = *value << 10; ++last; break;
   case 'm':
   case 'M':
-    if (!value_fits_shifted(*value, 20)) return src; // overflow guard
+    if (*value > (int64_t)0x7FFFFFFFFFF) return src; // overflow guard
     *value = *value << 20; ++last; break;
   case 'g':
   case 'G':
-    if (!value_fits_shifted(*value, 30)) return src; // overflow guard
+    if (*value > (int64_t)0x1FFFFFFFF) return src; // overflow guard
     *value = *value << 30; ++last; break;
 //   case ' ':
 //   case '\0': *value = *value * unit; break;
 //   default: throw torrent::input_error("Could not parse value.");
-  default:
-    if (*value > std::numeric_limits<int64_t>::max() / unit ||
-        *value < std::numeric_limits<int64_t>::min() / unit)
-      return src; // overflow guard
-
-    *value = *value * unit;
-    break;
+  default: *value = *value * unit; break;
   }
 
   return last;
@@ -157,13 +142,10 @@ parse_value_nothrow(const char* src, int64_t* value, int base, int unit) {
 
 // Somewhat ugly...
 const char*
-parse_object(const char* first, const char* last, torrent::Object* dest, bool (*delim)(const char), uint32_t depth) {
-  if (++depth >= max_parse_depth)
-    throw torrent::input_error("Max parse depth reached.");
-
+parse_object(const char* first, const char* last, torrent::Object* dest, bool (*delim)(const char)) {
   if (*first == '{') {
     *dest = torrent::Object::create_list();
-    first = parse_list(first + 1, last, dest, &parse_is_delim_block, depth);
+    first = parse_list(first + 1, last, dest, &parse_is_delim_block);
     first = parse_skip_wspace(first, last);
 
     if (first == last || *first != '}')
@@ -172,18 +154,18 @@ parse_object(const char* first, const char* last, torrent::Object* dest, bool (*
     return ++first;
 
   } else if (*first == '(') {
-    int32_t parentheses = 1;
+    int32_t depth = 1;
 
     while (first + 1 != last && *(first + 1) == '(') {
       first++;
-      parentheses++;
+      depth++;
     }
 
-    if (parentheses > 3)
+    if (depth > 3)
       throw torrent::input_error("Max 3 parentheses per object allowed.");
 
     *dest = torrent::Object::create_dict_key();
-    dest->set_flags(torrent::Object::flag_function << (parentheses - 1));
+    dest->set_flags(torrent::Object::flag_function << (depth - 1));
 
     first = parse_string(first + 1, last, &dest->as_dict_key(), &parse_is_delim_func);
     first = parse_skip_wspace(first, last);
@@ -194,16 +176,16 @@ parse_object(const char* first, const char* last, torrent::Object* dest, bool (*
     if (*first == ',') {
       // This will always create a list even for single argument functions...
       dest->as_dict_obj() = torrent::Object::create_list();
-      first = parse_list(first + 1, last, &dest->as_dict_obj(), &parse_is_delim_func, depth);
+      first = parse_list(first + 1, last, &dest->as_dict_obj(), &parse_is_delim_func);
       first = parse_skip_wspace(first, last);
     }
 
-    while (parentheses != 0 && first != last && *first == ')') {
+    while (depth != 0 && first != last && *first == ')') {
       first++;
-      parentheses--;
+      depth--;
     }
 
-    if (parentheses != 0)
+    if (depth != 0)
       throw torrent::input_error("Parentheses mismatch.");
 
     return first;
@@ -216,7 +198,7 @@ parse_object(const char* first, const char* last, torrent::Object* dest, bool (*
 }
 
 const char*
-parse_list(const char* first, const char* last, torrent::Object* dest, bool (*delim)(const char), uint32_t depth) {
+parse_list(const char* first, const char* last, torrent::Object* dest, bool (*delim)(const char)) {
   if (!dest->is_list())
     throw torrent::internal_error("parse_list(...) !dest->is_list().");
 
@@ -224,7 +206,7 @@ parse_list(const char* first, const char* last, torrent::Object* dest, bool (*de
     torrent::Object tmp;
 
     first = parse_skip_wspace(first, last);
-    first = parse_object(first, last, &tmp, delim, depth);
+    first = parse_object(first, last, &tmp, delim);
     first = parse_skip_wspace(first, last);
 
     dest->as_list().push_back(tmp);
@@ -239,9 +221,9 @@ parse_list(const char* first, const char* last, torrent::Object* dest, bool (*de
 }
 
 const char*
-parse_whole_list(const char* first, const char* last, torrent::Object* dest, bool (*delim)(const char), uint32_t depth) {
+parse_whole_list(const char* first, const char* last, torrent::Object* dest, bool (*delim)(const char)) {
   first = parse_skip_wspace(first, last);
-  first = parse_object(first, last, dest, delim, depth);
+  first = parse_object(first, last, dest, delim);
   first = parse_skip_wspace(first, last);
 
   if (first != last && parse_is_seperator(*first)) {
@@ -249,7 +231,7 @@ parse_whole_list(const char* first, const char* last, torrent::Object* dest, boo
     tmp.swap(*dest);
 
     dest->as_list().push_back(tmp);
-    first = parse_list(++first, last, dest, delim, depth);
+    first = parse_list(++first, last, dest, delim);
   }
 
   return first;

src/rpc/parse.h

@@ -77,9 +77,9 @@ const char* parse_value_nothrow(const char* first, const char* last, int64_t* va
 void        parse_whole_value(const char* src, int64_t* value, int base = 0, int unit = 1);
 bool        parse_whole_value_nothrow(const char* src, int64_t* value, int base = 0, int unit = 1);
 
-const char* parse_object    (const char* first, const char* last, torrent::Object* dest, bool (*delim)(const char) = &parse_is_delim_default, uint32_t depth = 0);
-const char* parse_list      (const char* first, const char* last, torrent::Object* dest, bool (*delim)(const char) = &parse_is_delim_default, uint32_t depth = 0);
-const char* parse_whole_list(const char* first, const char* last, torrent::Object* dest, bool (*delim)(const char) = &parse_is_delim_default, uint32_t depth = 0);
+const char* parse_object    (const char* first, const char* last, torrent::Object* dest, bool (*delim)(const char) = &parse_is_delim_default);
+const char* parse_list      (const char* first, const char* last, torrent::Object* dest, bool (*delim)(const char) = &parse_is_delim_default);
+const char* parse_whole_list(const char* first, const char* last, torrent::Object* dest, bool (*delim)(const char) = &parse_is_delim_default);
 
 std::string convert_to_string(const torrent::Object& src);
 

src/rpc/parse_commands.cc

@@ -181,11 +181,6 @@ parse_command_file(const std::string& path) {
       getCount = 0;
     }
 
-    if (file.fail() && !file.eof()) {
-      lineNumber++;
-      throw torrent::input_error("Exceeded max line length.");
-    }
-
   } catch (torrent::input_error& e) {
     snprintf(buffer, 2048, "Error in option file: %s:%u: %s", path.c_str(), lineNumber, e.what());
 

src/rpc/rpc_manager.cc

@@ -167,17 +167,6 @@ RpcManager::cleanup() {
   m_jsonrpc.cleanup();
 }
 
-void
-RpcManager::set_size_limit(uint64_t size) {
-  if (size > SCgiTask::max_content_size)
-    throw torrent::input_error("XMLRPC size limit cannot exceed the SCGI content size limit.");
-
-  if (size < min_size_limit)
-    throw torrent::input_error("XMLRPC size limit is too small to hold a request.");
-
-  m_xmlrpc.set_size_limit(size);
-}
-
 void
 RpcManager::insert_command(const char* name, const char* parm, const char* doc) {
   m_xmlrpc.insert_command(name, parm, doc);

src/rpc/rpc_manager.h

@@ -53,10 +53,6 @@ public:
   enum RPCType { XML,
                  JSON };
 
-  // A limit below the shortest useful request rejects every request, the one
-  // that would raise it again included.
-  static constexpr uint64_t min_size_limit = 1024;
-
   RpcManager()  = default;
   ~RpcManager() = default;
 
@@ -66,7 +62,7 @@ public:
   void                cleanup();
 
   int64_t             size_limit()                  { return m_xmlrpc.size_limit(); };
-  void                set_size_limit(uint64_t size);
+  void                set_size_limit(uint64_t size) { m_xmlrpc.set_size_limit(size); };
 
   int                 dialect()                     { return m_xmlrpc.dialect(); }
   void                set_dialect(int dialect)      { m_xmlrpc.set_dialect(dialect); }

src/rpc/scgi.cc

@@ -109,8 +109,7 @@ void
 SCgi::activate() {
   assert(torrent::this_thread::thread() == scgi_thread::thread());
 
-  torrent::this_thread::poll()->open(this);
-  torrent::this_thread::poll()->insert_read(this);
+  torrent::this_thread::poll()->open_and_insert_read(this);
 }
 
 // TODO: This should close the fd to avoid reuse.

src/rpc/scgi_task.cc

@@ -14,7 +14,6 @@
 #include <torrent/runtime/socket_manager.h>
 #include <torrent/system/callbacks.h>
 #include <torrent/system/poll.h>
-#include <torrent/system/scheduler.h>
 #include <torrent/utils/log.h>
 
 #include "control.h"
@@ -28,8 +27,6 @@ namespace rpc {
 SCgiTask::SCgiTask()
   : m_callback_id(torrent::system::make_callback_id()) {
 
-  m_task_timeout.slot() = [this]() { close(); };
-
   reset_file_descriptor();
 }
 
@@ -50,10 +47,7 @@ SCgiTask::open(SCgi* parent, int fd) {
                                  // m_trusted=false into the next reuse, given that the
                                  // UNTRUSTED_CONNECTION=0 parse branch is a no-op.
 
-  torrent::this_thread::poll()->open(this);
-  torrent::this_thread::poll()->insert_read(this);
-
-  torrent::this_thread::scheduler()->update_wait_for_ceil_seconds(&m_task_timeout, timeout_request);
+  torrent::this_thread::poll()->open_and_insert_read(this);
 
   auto lock = std::lock_guard<std::mutex>(m_result_mutex);
 
@@ -66,8 +60,6 @@ SCgiTask::cancel_open() {
   if (!is_open())
     return;
 
-  torrent::this_thread::scheduler()->erase(&m_task_timeout);
-
   torrent::this_thread::poll()->remove_and_close(this);
 
   torrent::fd_close(file_descriptor());
@@ -79,8 +71,6 @@ SCgiTask::close() {
   if (!is_open())
     return;
 
-  torrent::this_thread::scheduler()->erase(&m_task_timeout);
-
   torrent::system::cancel_callback_and_wait(m_callback_id, scgi_thread::thread(), torrent::main_thread::thread());
 
   torrent::runtime::socket_manager()->close_event_or_throw(this, [this]() {
@@ -93,8 +83,7 @@ SCgiTask::close() {
   // The callbacks are guaranteed to be finished/canceled at this point.
   auto lock = std::lock_guard<std::mutex>(m_result_mutex);
 
-  // clear() would keep the capacity, and the task is pooled for the lifetime of the process.
-  std::vector<char>().swap(m_buffer);
+  m_buffer.clear();
 }
 
 void
@@ -104,12 +93,8 @@ SCgiTask::event_read() {
   if (m_content_length == 0)
     read_length--;
 
-  if (read_length <= 0) {
-    if (m_content_length == 0)
-      return close();
-
+  if (read_length <= 0)
     throw torrent::internal_error("SCgiTask::event_read() no space in buffer for event_read.");
-  }
 
   int bytes = ::recv(file_descriptor(), m_buffer.data() + m_position, read_length, 0);
 
@@ -168,8 +153,6 @@ SCgiTask::event_read() {
 
   torrent::this_thread::poll()->remove_read(this);
 
-  torrent::this_thread::scheduler()->update_wait_for_ceil_seconds(&m_task_timeout, timeout_request);
-
   if (m_parent->log_fd() >= 0) {
     [[maybe_unused]] int result;
 
@@ -405,7 +388,7 @@ void
 SCgiTask::receive_write(const char* buffer, uint32_t length) {
   assert(torrent::this_thread::thread() == torrent::main_thread::thread());
 
-  if (buffer == nullptr || length > max_response_size)
+  if (buffer == nullptr || length > (100 << 20))
     throw torrent::internal_error("SCgiTask::receive_write(...) received bad input.");
 
   // Main thread callback already locked this mutex.

src/rpc/scgi_task.h

@@ -1,13 +1,10 @@
 #ifndef RTORRENT_RPC_SCGI_TASK_H
 #define RTORRENT_RPC_SCGI_TASK_H
 
-#include <chrono>
-#include <cstdint>
 #include <memory>
 #include <mutex>
 #include <vector>
 #include <torrent/system/event.h>
-#include <torrent/system/scheduler.h>
 
 namespace rpc {
 
@@ -17,11 +14,7 @@ class SCgiTask : public torrent::system::Event {
 public:
   static constexpr int default_buffer_size = 8191;
   static constexpr int max_header_size     = 2000;
-  static constexpr int max_content_size    = (1 << 26);
-
-  static constexpr uint32_t max_response_size = (100 << 20);
-
-  static constexpr auto timeout_request = std::chrono::seconds(60);
+  static constexpr int max_content_size    = (2 << 23);
 
   enum ContentType { XML, JSON };
 
@@ -61,9 +54,8 @@ private:
   void                plaintext_response(const char* buffer, uint32_t content_length);
   void                gzip_response(const char* buffer, uint32_t content_length);
 
-  SCgi*                           m_parent{};
-  torrent::system::callback_id    m_callback_id;
-  torrent::system::SchedulerEntry m_task_timeout;
+  SCgi*                        m_parent{};
+  torrent::system::callback_id m_callback_id;
 
   std::mutex          m_result_mutex;
 

src/rpc/xmlrpc_c.cc

@@ -27,11 +27,11 @@ public:
   virtual ~xmlrpc_error_c() throw() {}
 
   virtual int         type() const throw() { return m_type; }
-  virtual const char* what() const throw() { return m_msg.c_str(); }
+  virtual const char* what() const throw() { return m_msg; }
 
 private:
   int                 m_type;
-  std::string         m_msg;
+  const char*         m_msg;
 };
 
 torrent::Object xmlrpc_to_object(xmlrpc_env* env, xmlrpc_value* value, int call_type = 0, rpc::target_type* target = NULL, std::function<void()>* deleter = NULL);
@@ -44,9 +44,10 @@ xmlrpc_list_entry_to_object(xmlrpc_env* env, xmlrpc_value* src, int index) {
   if (env->fault_occurred)
     throw xmlrpc_error_c(env);
 
-  utils::scope_guard guard([tmp]() { xmlrpc_DECREF(tmp); });
+  torrent::Object obj = xmlrpc_to_object(env, tmp);
+  xmlrpc_DECREF(tmp);
 
-  return xmlrpc_to_object(env, tmp);
+  return obj;
 }
 
 int64_t
@@ -76,18 +77,16 @@ xmlrpc_list_entry_to_value(xmlrpc_env* env, xmlrpc_value* src, int index) {
   {
     const char* str;
     xmlrpc_read_string(env, tmp, &str);
-    xmlrpc_DECREF(tmp);
 
     if (env->fault_occurred)
       throw xmlrpc_error_c(env);
 
     const char* end = str;
     int64_t v3 = ::strtoll(str, (char**)&end, 0);
-    bool invalid = *str == '\0' || *end != '\0';
 
     ::free((void*)str);
 
-    if (invalid)
+    if (*str == '\0' || *end != '\0')
       throw xmlrpc_error_c(XMLRPC_TYPE_ERROR, "Invalid index.");
 
     return v3;
@@ -212,11 +211,11 @@ xmlrpc_to_object(xmlrpc_env* env, xmlrpc_value* value, int call_type, rpc::targe
       if (env->fault_occurred)
         throw xmlrpc_error_c(env);
 
-      utils::scope_guard guard([tmp]() { xmlrpc_DECREF(tmp); });
-
       if (target != nullptr)
         std::tie(*target, *deleter) = xmlrpc_to_target(env, tmp, call_type);
 
+      xmlrpc_DECREF(tmp);
+
       if (env->fault_occurred)
         throw xmlrpc_error_c(env);
 
@@ -530,6 +529,9 @@ XmlRpc::size_limit() {
 
 void
 XmlRpc::set_size_limit(uint64_t size) {
+  if (size >= (64 << 20))
+    throw torrent::input_error("Invalid XMLRPC limit size.");
+
   xmlrpc_limit_set(XMLRPC_XML_SIZE_LIMIT_ID, size);
 }
 

src/rpc/xmlrpc_tinyxml2.cc

@@ -19,7 +19,6 @@
 #include "rpc/tinyxml2/tinyxml2.h"
 #include "rpc/rpc_manager.h"
 #include "utils/base64.h"
-#include "utils/functional.h"
 #include "xmlrpc.h"
 
 namespace rpc {
@@ -50,23 +49,13 @@ element_access(const tinyxml2::XMLElement* elem, std::initializer_list<std::stri
   return result;
 }
 
-const char*
-element_text_value(const tinyxml2::XMLNode* node) {
-  auto text = node->ToText();
-
-  if (text == nullptr)
-    throw rpc_error(XMLRPC_TYPE_ERROR, "expected a text value");
-
-  return text->Value();
-}
-
 long long
 element_to_int(const tinyxml2::XMLNode* elem) {
   char* pos;
   if (elem->FirstChild() == nullptr) {
     throw rpc_error(XMLRPC_TYPE_ERROR, "unable to parse empty integer");
   }
-  auto str    = element_text_value(elem->FirstChild());
+  auto str    = elem->FirstChild()->ToText()->Value();
   auto result = std::strtoll(str, &pos, 10);
   if (pos == str || *pos != '\0')
     throw rpc_error(XMLRPC_TYPE_ERROR, "unable to parse integer value");
@@ -96,7 +85,7 @@ xml_value_to_object(const tinyxml2::XMLNode* elem) {
     if (child_element == nullptr)
       return torrent::Object("");
 
-    return torrent::Object(element_text_value(child_element));
+    return torrent::Object(child_element->ToText()->Value());
 
   } else if (std::strncmp(root_type, "int", sizeof("int")) == 0 ||
              std::strncmp(root_type, "i4", sizeof("i4")) == 0 ||
@@ -109,7 +98,7 @@ xml_value_to_object(const tinyxml2::XMLNode* elem) {
     if (child_element == nullptr)
       throw rpc_error(XMLRPC_TYPE_ERROR, "empty boolean element");
 
-    auto boolean_text = std::string(element_text_value(child_element));
+    auto boolean_text = std::string(child_element->ToText()->Value());
 
     if (boolean_text == "1")
       return torrent::Object((int64_t)1);
@@ -140,12 +129,7 @@ xml_value_to_object(const tinyxml2::XMLNode* elem) {
       if (name_element == nullptr)
         throw rpc_error(XMLRPC_PARSE_ERROR, "struct member missing name element");
 
-      auto name_text = name_element->GetText();
-
-      if (name_text == nullptr)
-        throw rpc_error(XMLRPC_PARSE_ERROR, "struct member has an empty name element");
-
-      map[name_text] = std::move(xml_value_to_object(child->FirstChildElement("value")));
+      map[name_element->GetText()] = std::move(xml_value_to_object(child->FirstChildElement("value")));
     }
 
     return map_raw;
@@ -156,7 +140,7 @@ xml_value_to_object(const tinyxml2::XMLNode* elem) {
     if (child_element == nullptr)
       return torrent::Object("");
 
-    return torrent::Object(utils::decode_base64(utils::remove_newlines(element_text_value(child_element))));
+    return torrent::Object(utils::decode_base64(utils::remove_newlines(child_element->ToText()->Value())));
 
   } else {
     throw rpc_error(XMLRPC_INTERNAL_ERROR, "received unsupported value type: " + std::string(root_type));
@@ -259,8 +243,6 @@ execute_command(std::string method_name, const tinyxml2::XMLElement* params_elem
   torrent::Object             params_raw = torrent::Object::create_list();
   torrent::Object::list_type& params     = params_raw.as_list();
   rpc::target_type            target     = rpc::make_target();
-  std::function<void()>       deleter    = []() {};
-  utils::scope_guard          guard([&deleter]() { deleter(); });
 
   if (params_element != nullptr) {
     if (std::strncmp(params_element->Name(), "params", sizeof("params")) == 0) {
@@ -268,6 +250,8 @@ execute_command(std::string method_name, const tinyxml2::XMLElement* params_elem
       const auto* child = params_element->FirstChildElement("param");
 
       if (child != nullptr) {
+        std::function<void()> deleter = []() {};
+
         RpcManager::object_to_target(xml_value_to_object(child->FirstChildElement("value")), cmd_itr->second.m_flags, &target, &deleter);
         child = child->NextSiblingElement("param");
 
@@ -283,6 +267,8 @@ execute_command(std::string method_name, const tinyxml2::XMLElement* params_elem
       const auto* child = params_element->FirstChildElement("data")->FirstChildElement("value");
 
       if (child != nullptr) {
+        std::function<void()> deleter = []() {};
+
         RpcManager::object_to_target(xml_value_to_object(child), cmd_itr->second.m_flags, &target, &deleter);
         child = child->NextSiblingElement("value");
 
@@ -314,9 +300,6 @@ process_document(const tinyxml2::XMLDocument* doc, tinyxml2::XMLPrinter* printer
   if (doc->FirstChildElement("methodCall")->FirstChildElement("methodName") == nullptr)
     throw rpc_error(XMLRPC_PARSE_ERROR, "methodName element not found");
   auto            method_name = doc->FirstChildElement("methodCall")->FirstChildElement("methodName")->GetText();
-
-  if (method_name == nullptr)
-    throw rpc_error(XMLRPC_PARSE_ERROR, "methodName element is empty");
   torrent::Object result;
 
   // Add a shim here for system.multicall to allow better code reuse, and
@@ -327,9 +310,6 @@ process_document(const tinyxml2::XMLDocument* doc, tinyxml2::XMLPrinter* printer
     auto  parent_elements = element_access(doc->RootElement(), {"params", "param", "value", "array", "data"});
     for (auto child = parent_elements->FirstChildElement("value"); child; child = child->NextSiblingElement("value")) {
       auto sub_method_name = element_access(child, {"struct", "member", "value", "string"})->GetText();
-
-      if (sub_method_name == nullptr)
-        throw rpc_error(XMLRPC_PARSE_ERROR, "multicall methodName element is empty");
       // If sub_params ends up a nullptr at the end of this if-chian,
       // execute_command will turn it into an empty list
       auto sub_params = element_access(child, {"struct", "member"});
@@ -425,14 +405,6 @@ XmlRpc::process(const char* inBuffer, uint32_t length, slot_write slotWrite) {
     // remains.
     tinyxml2::XMLPrinter printer(nullptr, true, 0);
     process_document(&doc, &printer);
-
-    if (printer.CStrSize() - 1 > static_cast<int>(SCgiTask::max_response_size)) {
-      tinyxml2::XMLPrinter fault_printer(nullptr, true, 0);
-      print_xmlrpc_fault(XMLRPC_LIMIT_EXCEEDED_ERROR, "Response size exceeds maximum XML-RPC limit", &fault_printer);
-
-      return slotWrite(fault_printer.CStr(), fault_printer.CStrSize() - 1);
-    }
-
     return slotWrite(printer.CStr(), printer.CStrSize() - 1);
   } catch (rpc_error& e) {
     tinyxml2::XMLPrinter printer(nullptr, true, 0);

src/session/download_storer.cc

@@ -127,12 +127,8 @@ save_stream(const std::string& path, bool use_fsyncdisk, const std::stringstream
   if (!output.good())
     throw torrent::storage_error("failed to write stream to file : " + path);
 
-  // The data only reaches the kernel here, so this is where a full disk is seen.
   output.close();
 
-  if (!output.good())
-    throw torrent::storage_error("failed to flush stream to file : " + path);
-
   // Ensure that the new file is actually written to the disk
   int fd = ::open(path.c_str(), O_WRONLY);
 
@@ -141,19 +137,13 @@ save_stream(const std::string& path, bool use_fsyncdisk, const std::stringstream
 
   if (use_fsyncdisk) {
 #ifdef __APPLE__
-    int sync_result = ::fsync(fd);
+    ::fsync(fd);
 #else
-    int sync_result = ::fdatasync(fd);
+    ::fdatasync(fd);
 #endif
-
-    if (sync_result == -1) {
-      ::close(fd);
-      throw torrent::storage_error("failed to sync file to disk : " + path);
-    }
   }
 
-  if (::close(fd) == -1)
-    throw torrent::storage_error("failed to close file descriptor : " + path);
+  ::close(fd);
 }
 
 } // namespace anonymous

src/session/session_manager.h

@@ -126,7 +126,7 @@ private:
 
 inline bool        SessionManager::is_used() const            { return !m_path.empty(); }
 inline std::string SessionManager::path() const               { return m_path; }
-inline bool        SessionManager::use_fsyncdisk() const      { return m_use_fsyncdisk; }
+inline bool        SessionManager::use_fsyncdisk() const      { return true; }
 inline bool        SessionManager::use_lock() const           { return m_use_lock; }
 inline void        SessionManager::flush_all_pending_builds() { process_pending_builds(true); }
 

src/setup.cc

@@ -37,7 +37,7 @@ parse_main_options(int argc, char** argv) {
 
     optionParser.insert_option('b', [](auto& arg) { rpc::call_command_set_string("network.bind_address.set", arg); });
     optionParser.insert_option('d', [](auto& arg) { rpc::call_command_set_string("directory.default.set", arg); });
-    optionParser.insert_option('i', [](auto& arg) { rpc::call_command_set_string("network.local_address.set", arg); });
+    optionParser.insert_option('i', [](auto& arg) { rpc::call_command_set_string("ip", arg); });
     optionParser.insert_option('p', [](auto& arg) { rpc::call_command_set_string("network.listen.port.range.set", arg); });
     optionParser.insert_option('s', [](auto& arg) { rpc::call_command_set_string("session", arg); });
 
@@ -86,13 +86,9 @@ config_comment_log(const std::string& command, const std::string& raw_args) {
     pos = next_pos + 1;
   }
 
-  if (command == "log.add_output") {
-    if (args.size() != 2)
-      throw torrent::input_error("Invalid number of arguments.");
-
+  if (command == "log.add_output")
     log_add_group_output_str(args[0], args[1]);
-
-  } else if (command == "log.open_file")
+  else if (command == "log.open_file")
     apply_log_open_str(0, args);
   else if (command == "log.open_file.flush")
     apply_log_open_str(log_flag_flush, args);
@@ -112,18 +108,22 @@ config_comment_log(const std::string& command, const std::string& raw_args) {
     throw torrent::input_error("Unknown log command: " + command);
 }
 
-// Call special commands in the format "# do:command=args" in the config file.
+// Call special commands in the format "# do:command=args" or "# do-<category>:command=args" in the config file.
 void
-parse_config_file_comments(const std::string& path) {
+parse_config_file_comments(const std::string& category, const std::string& path) {
+  if (path.empty())
+    return;
+
   std::fstream file(path, std::ios::in);
 
   if (!file.is_open())
     return;
 
   std::string line;
+  std::string prefix = category.empty() ? "# do:" : "# do-" + category + ":";
 
   while (std::getline(file, line)) {
-    if (line.size() <= 5 || line.compare(0, 5, "# do:") != 0)
+    if (line.size() <= prefix.size() || line.compare(0, prefix.size(), prefix) != 0)
       continue;
 
     auto equal_pos = line.find('=');

src/setup.h

@@ -3,11 +3,10 @@
 
 #include <functional>
 #include <string>
-#include <vector>
 
 int  parse_main_options(int argc, char** argv);
 void parse_config_file(int argc, char** argv, std::function<void (const std::string&)> parse_fn);
-void parse_config_file_comments(const std::string& path);
+void parse_config_file_comments(const std::string& category, const std::string& path);
 
 void load_session_torrents(const std::string& path);
 void load_arg_torrents(char** first, char** last);

src/ui/download.cc

@@ -1,4 +1,3 @@
-#include <memory>
 #include "config.h"
 
 #include <cassert>
@@ -31,10 +30,8 @@
 
 namespace ui {
 
-Download::Download(const std::shared_ptr<core::Download>& download)
-  : m_download(download.get()) {
-
-  auto* d = download.get();
+Download::Download(core::Download* d)
+  : m_download(d) {
 
   m_windowDownloadStatus = std::make_unique<WDownloadStatus>(d);
   m_windowDownloadStatus->set_bottom(true);

src/ui/download.h

@@ -2,7 +2,6 @@
 #define RTORRENT_UI_DOWNLOAD_H
 
 #include <list>
-#include <memory>
 #include <torrent/peer/peer.h>
 
 #include "display/manager.h"
@@ -37,7 +36,7 @@ public:
     DISPLAY_MAX_SIZE
   } Display;
 
-  Download(const std::shared_ptr<core::Download>& d);
+  Download(core::Download* d);
   ~Download();
 
   void                activate(display::Frame* frame, bool focus = true);

src/ui/download_list.cc

@@ -30,38 +30,6 @@
 
 namespace ui {
 
-std::string
-create_filter_pattern(const std::string& input) {
-  std::string pattern = input;
-
-  if (pattern.empty())
-    return pattern;
-
-  if (pattern.back() != '$')
-    pattern = pattern + ".*";
-  if (pattern.front() != '^')
-    pattern = ".*" + pattern;
-
-  std::transform(pattern.begin(), pattern.end(), pattern.begin(), ::tolower);
-  return pattern;
-}
-
-torrent::Object
-create_filter_command(const std::string& pattern) {
-  torrent::Object name = torrent::Object::create_dict_key();
-  name.as_dict_key() = "d.name";
-
-  torrent::Object args = torrent::Object::create_list();
-  args.as_list().push_back(name);
-  args.as_list().push_back(torrent::Object(pattern));
-
-  torrent::Object command = torrent::Object::create_dict_key();
-  command.as_dict_key() = "match";
-  command.as_dict_obj() = args;
-
-  return command;
-}
-
 DownloadList::DownloadList() {
   m_uiArray[DISPLAY_DOWNLOAD]      = NULL;
   m_uiArray[DISPLAY_DOWNLOAD_LIST] = new ElementDownloadList();
@@ -121,7 +89,7 @@ DownloadList::unfocus_download(core::Download* d) {
   if (m_state == DISPLAY_DOWNLOAD && d == static_cast<Download*>(m_uiArray[DISPLAY_DOWNLOAD])->download())
     activate_display(DISPLAY_DOWNLOAD_LIST);
 
-  if (current_view()->focus() < current_view()->end_visible() && current_view()->focus()->get() == d)
+  if (*current_view()->focus() == d && current_view()->focus() < current_view()->end_visible())
       current_view()->next_focus();
 }
 
@@ -351,12 +319,16 @@ DownloadList::receive_exit_input(Input type) {
         current_view()->filter();
         current_view()->sort();
       } else {
-        std::string pattern = create_filter_pattern(input->str());
-
+        std::string pattern = input->str();
+        if (pattern.back() != '$')
+          pattern = pattern + ".*";
+        if (pattern.front() != '^')
+          pattern = ".*" + pattern;
+        std::transform(pattern.begin(), pattern.end(), pattern.begin(), ::tolower);
+        std::string temp_filter = "match={d.name=," + pattern + "}";
         if (rpc::call_command_value("view.filter.temp.log"))
           control->core()->push_log_std("Temporary filter on '" + current_view()->name() + "' view: " + pattern);
-
-        current_view()->set_filter_temp(create_filter_command(pattern));
+        current_view()->set_filter_temp(temp_filter);
         current_view()->filter();
       }
       break;

src/ui/download_list.h

@@ -1,9 +1,6 @@
 #ifndef RTORRENT_UI_DOWNLOAD_LIST_H
 #define RTORRENT_UI_DOWNLOAD_LIST_H
 
-#include <string>
-#include <torrent/object.h>
-
 #include "element_base.h"
 #include "globals.h"
 #include "display/manager.h"
@@ -32,12 +29,6 @@ namespace ui {
 
 class Download;
 
-// Wrap a user-typed download name pattern in the anchors 'match' expects.
-std::string     create_filter_pattern(const std::string& input);
-
-// Build the 'match' command the temporary view filter runs against d.name.
-torrent::Object create_filter_command(const std::string& pattern);
-
 class DownloadList : public ElementBase {
 public:
   typedef display::WindowDownloadList              WList;

src/ui/element_download_list.cc

@@ -196,7 +196,7 @@ ElementDownloadList::receive_cycle_throttle() {
   if (m_view->focus() == m_view->end_visible())
     return;
 
-  core::Download* download = m_view->focus()->get();
+  core::Download* download = *m_view->focus();
   if (download->is_active()) {
     lt_log_print(torrent::LOG_TORRENT_WARN, "Cannot change throttle on active download.");
     return;

src/ui/root.cc

@@ -467,9 +467,6 @@ Root::save_input_history() {
         history_file << entry << "|" + category.at((pitr->second + i) % m_input_history_length) + "\n";
   }
 
-  // The data only reaches the kernel here, so this is where a full disk is seen.
-  history_file.close();
-
   if (!history_file.good()) {
     lt_log_print(torrent::LOG_DEBUG, "input history file corrupted during writing, discarding (path:%s)", history_filename.c_str());
     return;
@@ -477,6 +474,8 @@ Root::save_input_history() {
     lt_log_print(torrent::LOG_DEBUG, "input history file written (path:%s)", history_filename.c_str());
   }
 
+  history_file.close();
+
   std::rename(history_filename_tmp.c_str(), history_filename.c_str());
 }
 

src/utils/gzip.cc

@@ -5,8 +5,6 @@
 #include <zlib.h>
 #include <torrent/exceptions.h>
 
-#include "utils/functional.h"
-
 namespace utils {
 
 void
@@ -23,8 +21,6 @@ gzip_compress_to_vector(const char* buffer, unsigned int length, std::vector<cha
   if (deflateInit2(&zs, Z_DEFAULT_COMPRESSION, Z_DEFLATED, window_bits | gzip_encoding, gzip_level, Z_DEFAULT_STRATEGY) != Z_OK)
     throw torrent::internal_error("gzip_compress_to_vector(...) could not initialize gzip deflate.");
 
-  scope_guard guard([&zs]() { deflateEnd(&zs); });
-
   auto max_response_size = deflateBound(&zs, length);
 
   output.resize(offset + max_response_size);

src/utils/gzip.h

@@ -2,7 +2,6 @@
 #define RTORRENT_UTILS_GZIP_H
 
 #include <functional>
-#include <vector>
 
 namespace utils {
 

test/Makefile.am

@@ -1,5 +1,4 @@
 TESTS = \
-	rtorrent_Test_Core \
 	rtorrent_Test_Rpc \
 	rtorrent_Test_Src
 
@@ -8,7 +7,6 @@ check_PROGRAMS = $(TESTS)
 rtorrent_Test_LDADD = \
 	../src/libsub_root.a
 
-rtorrent_Test_Core_LDADD = $(rtorrent_Test_LDADD)
 rtorrent_Test_Rpc_LDADD = $(rtorrent_Test_LDADD)
 rtorrent_Test_Src_LDADD = $(rtorrent_Test_LDADD)
 
@@ -32,17 +30,11 @@ rtorrent_Test_Common = \
 	helpers/test_utils.h \
 	helpers/utils.h
 
-rtorrent_Test_Core_SOURCES = $(rtorrent_Test_Common) \
-	core/test_view.cc \
-	core/test_view.h
-
 rtorrent_Test_Rpc_SOURCES = $(rtorrent_Test_Common) \
 	rpc/test_command.cc \
 	rpc/test_command.h \
 	rpc/test_command_map.cc \
 	rpc/test_command_map.h \
-	rpc/test_command_scheduler.cc \
-	rpc/test_command_scheduler.h \
 	rpc/test_jsonrpc.cc \
 	rpc/test_jsonrpc.h \
 	rpc/test_xmlrpc.cc \
@@ -52,30 +44,20 @@ rtorrent_Test_Rpc_SOURCES = $(rtorrent_Test_Common) \
 	rpc/test_object_storage.cc \
 	rpc/test_object_storage.h \
 	rpc/test_parse_options.cc \
-	rpc/test_parse_options.h \
-	rpc/test_rpc_manager.cc \
-	rpc/test_rpc_manager.h
+	rpc/test_parse_options.h
 
 rtorrent_Test_Src_SOURCES = $(rtorrent_Test_Common) \
 	src/test_command_dynamic.cc \
 	src/test_command_dynamic.h \
-	src/test_command_ip.cc \
-	src/test_command_ip.h \
-	src/test_command_system.cc \
-	src/test_command_system.h \
+	src/test_command_local.cc \
+	src/test_command_local.h \
 	src/test_command_path.cc \
 	src/test_command_path.h \
 	src/test_command_string.cc \
 	src/test_command_string.h \
-	src/test_setup.cc \
-	src/test_setup.h \
-	src/test_ui_download_list.cc \
-	src/test_ui_download_list.h \
 	src/test_watch_ready_queue.cc \
 	src/test_watch_ready_queue.h
 
-rtorrent_Test_Core_CXXFLAGS = $(CPPUNIT_CFLAGS)
-rtorrent_Test_Core_LDFLAGS = $(CPPUNIT_LIBS) -ldl
 rtorrent_Test_Rpc_CXXFLAGS = $(CPPUNIT_CFLAGS)
 rtorrent_Test_Rpc_LDFLAGS = $(CPPUNIT_LIBS) -ldl
 rtorrent_Test_Src_CXXFLAGS = $(CPPUNIT_CFLAGS)

test/core/test_view.cc

@@ -1,158 +0,0 @@
-#include "config.h"
-
-#include "test/core/test_view.h"
-
-#include <algorithm>
-#include <cstddef>
-#include <deque>
-#include <memory>
-#include <set>
-#include <string>
-#include <vector>
-
-#include "command_helpers.h"
-#include "control.h"
-#include "core/download.h"
-#include "core/view.h"
-#include "globals.h"
-#include "rpc/parse_commands.h"
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestView);
-
-namespace {
-
-const char* filter_command  = "test.view.filter";
-const char* added_command   = "test.view.event_added";
-const char* removed_command = "test.view.event_removed";
-
-// View only stores these and hands them to the command layer as RPC targets,
-// which casts the pointer without reading through it.
-struct download_stub {
-  alignas(core::Download) std::byte storage[sizeof(core::Download)];
-};
-
-std::deque<download_stub>    stub_storage;
-std::vector<core::Download*> stub_downloads;
-
-std::set<core::Download*>    matches_filter;
-std::vector<core::Download*> added_events;
-std::vector<core::Download*> removed_events;
-
-std::shared_ptr<core::Download>
-make_stub_download() {
-  auto download = reinterpret_cast<core::Download*>(&stub_storage.emplace_back());
-
-  stub_downloads.push_back(download);
-
-  return std::shared_ptr<core::Download>(download, [](core::Download*) {});
-}
-
-// Renders a dispatch list as "d0,d2" so a failure names the downloads the
-// handler saw, not just how many there were.
-std::string
-describe(const std::vector<core::Download*>& downloads) {
-  std::string result;
-
-  for (const auto& download : downloads) {
-    auto itr = std::find(stub_downloads.begin(), stub_downloads.end(), download);
-
-    if (!result.empty())
-      result += ',';
-
-    result += 'd' + std::to_string(std::distance(stub_downloads.begin(), itr));
-  }
-
-  return result;
-}
-
-torrent::Object
-cmd_filter(core::Download* download, const torrent::Object&) {
-  return torrent::Object(static_cast<int64_t>(matches_filter.count(download)));
-}
-
-torrent::Object
-cmd_event_added(core::Download* download, const torrent::Object&) {
-  added_events.push_back(download);
-  return torrent::Object();
-}
-
-torrent::Object
-cmd_event_removed(core::Download* download, const torrent::Object&) {
-  removed_events.push_back(download);
-  return torrent::Object();
-}
-
-torrent::Object
-command_object(const char* command) {
-  return torrent::Object(std::string(command) + "=");
-}
-
-} // namespace
-
-void
-TestView::setUp() {
-  TestFixtureWithMainThread::setUp();
-
-  if (control == nullptr)
-    control = new Control;
-
-  if (!rpc::commands.has(filter_command)) {
-    CMD2_DL(filter_command, &cmd_filter);
-    CMD2_DL(added_command, &cmd_event_added);
-    CMD2_DL(removed_command, &cmd_event_removed);
-  }
-
-  stub_storage.clear();
-  stub_downloads.clear();
-  matches_filter.clear();
-  added_events.clear();
-  removed_events.clear();
-}
-
-void
-TestView::tearDown() {
-  TestFixtureWithMainThread::tearDown();
-}
-
-// d0 and d1 start visible and stop matching, d2 and d3 start filtered out and
-// start matching. The two halves are the same size on purpose: a test that
-// only counted the dispatches would pass even if both events were sent over
-// the same half of the changed range.
-void
-TestView::test_filter_dispatches_events_to_the_right_downloads() {
-  core::View view;
-  view.initialize("test_view");
-
-  auto d0 = make_stub_download();
-  auto d1 = make_stub_download();
-  auto d2 = make_stub_download();
-  auto d3 = make_stub_download();
-
-  view.insert(d0);
-  view.insert(d1);
-  view.insert(d2);
-  view.insert(d3);
-
-  view.set_visible(d0.get());
-  view.set_visible(d1.get());
-
-  CPPUNIT_ASSERT_EQUAL(core::View::size_type(2), view.size_visible());
-
-  matches_filter = {d2.get(), d3.get()};
-
-  view.set_filter(command_object(filter_command));
-  view.set_event_added(command_object(added_command));
-  view.set_event_removed(command_object(removed_command));
-
-  added_events.clear();
-  removed_events.clear();
-
-  view.filter();
-
-  CPPUNIT_ASSERT_EQUAL(std::string("d2,d3"), describe(added_events));
-  CPPUNIT_ASSERT_EQUAL(std::string("d0,d1"), describe(removed_events));
-
-  CPPUNIT_ASSERT_EQUAL(core::View::size_type(2), view.size_visible());
-  CPPUNIT_ASSERT(*view.begin_visible() == d2);
-  CPPUNIT_ASSERT(*(view.begin_visible() + 1) == d3);
-}

test/core/test_view.h

@@ -1,15 +0,0 @@
-#include "test/helpers/test_main_thread.h"
-
-class TestView : public TestFixtureWithMainThread {
-  CPPUNIT_TEST_SUITE(TestView);
-
-  CPPUNIT_TEST(test_filter_dispatches_events_to_the_right_downloads);
-
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  void setUp();
-  void tearDown();
-
-  void test_filter_dispatches_events_to_the_right_downloads();
-};

test/rpc/test_command_scheduler.cc

@@ -1,65 +0,0 @@
-#include "config.h"
-
-#include "test/rpc/test_command_scheduler.h"
-
-#include <chrono>
-
-#include "rpc/command_scheduler.h"
-#include "rpc/command_scheduler_item.h"
-#include "torrent/object.h"
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestCommandScheduler);
-
-namespace {
-
-const torrent::Object test_command = torrent::Object(std::string("print=scheduled"));
-
-std::chrono::microseconds
-time_scheduled(rpc::CommandScheduler& scheduler, const std::string& key) {
-  auto itr = scheduler.find(key);
-
-  CPPUNIT_ASSERT(itr != scheduler.end());
-
-  return (*itr)->time_scheduled();
-}
-
-}
-
-void
-TestCommandScheduler::setUp() {
-  TestFixtureWithMainThread::setUp();
-
-  m_main_thread->test_set_cached_time(std::chrono::seconds(0));
-}
-
-void
-TestCommandScheduler::tearDown() {
-  TestFixtureWithMainThread::tearDown();
-}
-
-void
-TestCommandScheduler::test_parse_rearms_existing_key() {
-  rpc::CommandScheduler scheduler;
-
-  scheduler.parse("key", "3600", "3600", test_command);
-
-  auto first = time_scheduled(scheduler, "key");
-
-  m_main_thread->test_add_cached_time(std::chrono::seconds(600));
-  scheduler.parse("key", "3600", "3600", test_command);
-
-  CPPUNIT_ASSERT_EQUAL(size_t{1}, scheduler.size());
-  CPPUNIT_ASSERT(time_scheduled(scheduler, "key") == first + std::chrono::seconds(600));
-}
-
-void
-TestCommandScheduler::test_find_locates_a_scheduled_key() {
-  rpc::CommandScheduler scheduler;
-
-  CPPUNIT_ASSERT(scheduler.find("key") == scheduler.end());
-
-  scheduler.parse("key", "3600", "3600", test_command);
-
-  CPPUNIT_ASSERT(scheduler.find("key") != scheduler.end());
-  CPPUNIT_ASSERT(scheduler.find("other") == scheduler.end());
-}

test/rpc/test_command_scheduler.h

@@ -1,17 +0,0 @@
-#include "test/helpers/test_main_thread.h"
-
-class TestCommandScheduler : public TestFixtureWithMainThread {
-  CPPUNIT_TEST_SUITE(TestCommandScheduler);
-
-  CPPUNIT_TEST(test_parse_rearms_existing_key);
-  CPPUNIT_TEST(test_find_locates_a_scheduled_key);
-
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  void setUp();
-  void tearDown();
-
-  void test_parse_rearms_existing_key();
-  void test_find_locates_a_scheduled_key();
-};

test/rpc/test_jsonrpc.cc

@@ -8,18 +8,12 @@
 #include "globals.h"
 #include "command_helpers.h"
 #include "rpc/command_map.h"
-#include "rpc/scgi_task.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION(TestJsonrpc);
 
 torrent::Object
 jsonrpc_cmd_test_reflect([[maybe_unused]] rpc::target_type t, const torrent::Object& obj) { return obj; }
 
-torrent::Object
-jsonrpc_cmd_test_oversized([[maybe_unused]] rpc::target_type t, [[maybe_unused]] const torrent::Object& obj) {
-  return torrent::Object(std::string(rpc::SCgiTask::max_response_size + (1 << 20), 'a'));
-}
-
 void initialize_command_dynamic();
 
 // Name, Request, Expected response
@@ -136,10 +130,6 @@ TestJsonrpc::setUp() {
   if (rpc::commands.find("jsonrpc_reflect") == rpc::commands.end()) {
     CMD2_ANY("jsonrpc_reflect", &jsonrpc_cmd_test_reflect);
   }
-
-  if (rpc::commands.find("jsonrpc_oversized") == rpc::commands.end()) {
-    CMD2_ANY("jsonrpc_oversized", &jsonrpc_cmd_test_oversized);
-  }
 }
 
 void
@@ -155,21 +145,3 @@ TestJsonrpc::test_basics() {
     CPPUNIT_ASSERT_EQUAL_MESSAGE(std::get<0>(test), std::get<2>(test), output);
   }
 }
-
-// A command whose result does not fit in the SCGI response buffer must be
-// answered with a fault, not handed to the writer. SCgiTask::receive_write
-// treats an oversized body as an internal_error, which is not caught by any
-// RPC handler and terminates the process.
-void
-TestJsonrpc::test_response_size_limit() {
-  const std::string request = R"({"jsonrpc": "2.0", "method": "jsonrpc_oversized", "params": [""], "id": 1})";
-  const std::string expected = R"({"error":{"code":-32000,"message":"response size exceeds maximum RPC limit"},"id":1,"jsonrpc":"2.0"})";
-
-  std::string output;
-  m_jsonrpc.process(request.c_str(), request.size(), [&output](const char* c, uint32_t l) { output.append(c, l); return true; });
-
-  CPPUNIT_ASSERT_MESSAGE("response handed to the writer is " + std::to_string(output.size()) +
-                         " bytes, over the " + std::to_string(rpc::SCgiTask::max_response_size) + " byte SCGI limit",
-                         output.size() <= rpc::SCgiTask::max_response_size);
-  CPPUNIT_ASSERT_EQUAL(expected, output);
-}

test/rpc/test_jsonrpc.h

@@ -8,7 +8,6 @@ class TestJsonrpc : public test_fixture {
   CPPUNIT_TEST_SUITE(TestJsonrpc);
 
   CPPUNIT_TEST(test_basics);
-  CPPUNIT_TEST(test_response_size_limit);
 
   CPPUNIT_TEST_SUITE_END();
 
@@ -17,7 +16,6 @@ public:
   void tearDown();
 
   void test_basics();
-  void test_response_size_limit();
 
 private:
   std::unique_ptr<TestMainThread> m_test_main_thread;

test/rpc/test_object_storage.cc

@@ -49,34 +49,6 @@ TestObjectStorage::test_validate_keys() {
   torrent::raw_string raw_string_4("test_4\0foo", 10);
 
   ASSERT_CATCH_INPUT_ERROR( { m_storage.insert(raw_string_4, torrent::Object("a"), rpc::object_storage::flag_string_type); } );
-  ASSERT_CATCH_INPUT_ERROR( { m_storage.insert_str("", torrent::Object("a"), rpc::object_storage::flag_string_type); } );
-
-  std::string key_max(rpc::object_storage::key_size - 1, 'k');
-
-  CPPUNIT_ASSERT(m_storage.insert_str(key_max, torrent::Object("a"), rpc::object_storage::flag_string_type)->first == key_max);
-  ASSERT_CATCH_INPUT_ERROR( { m_storage.insert_str(key_max + 'k', torrent::Object("a"), rpc::object_storage::flag_string_type); } );
-
-  // The over-long key must not have been stored as the empty key.
-  CPPUNIT_ASSERT(m_storage.find_raw_string(torrent::raw_string::from_c_str("")) == m_storage.end());
-
-  // An over-long key must not be truncated into a match either.
-  CPPUNIT_ASSERT(m_storage.find_raw_string(torrent::raw_string::from_string(key_max + 'k')) == m_storage.end());
-
-  // set_c_str puts the terminating nul at m_data[size()], so size() has to
-  // stay below max_size for that write to land inside the array.
-  rpc::object_storage::key_type key_long;
-  key_long.set_c_str(std::string(rpc::object_storage::key_size + 1, 'k').c_str());
-
-  CPPUNIT_ASSERT(key_long.size() < rpc::object_storage::key_size);
-
-  m_storage.clear();
-  m_storage.insert_str("test_5", torrent::Object("a"), rpc::object_storage::flag_string_type);
-
-  // insert rejects a key holding a nul-char, so a lookup must not match past one.
-  CPPUNIT_ASSERT(m_storage.find_raw_string(torrent::raw_string("test_5\0x", 8)) == m_storage.end());
-  CPPUNIT_ASSERT(m_storage.find_raw_string(torrent::raw_string::from_c_str("test_5")) != m_storage.end());
-
-  m_storage.clear();
 }
 
 // And test many other bad/good string combos.

test/rpc/test_rpc_manager.cc

@@ -1,21 +0,0 @@
-#include "config.h"
-
-#include "test/rpc/test_rpc_manager.h"
-
-#include <torrent/exceptions.h>
-
-#include "rpc/scgi_task.h"
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestRpcManager);
-
-// A size limit too small to hold any request rejects every request, including
-// the one that would put it back, so it can only be undone by a restart.
-void
-TestRpcManager::test_size_limit_bounds() {
-  CPPUNIT_ASSERT_THROW(m_rpc_manager.set_size_limit(0), torrent::input_error);
-  CPPUNIT_ASSERT_THROW(m_rpc_manager.set_size_limit(rpc::RpcManager::min_size_limit - 1), torrent::input_error);
-  CPPUNIT_ASSERT_THROW(m_rpc_manager.set_size_limit(rpc::SCgiTask::max_content_size + 1), torrent::input_error);
-
-  CPPUNIT_ASSERT_NO_THROW(m_rpc_manager.set_size_limit(rpc::RpcManager::min_size_limit));
-  CPPUNIT_ASSERT_NO_THROW(m_rpc_manager.set_size_limit(rpc::SCgiTask::max_content_size));
-}

test/rpc/test_rpc_manager.h

@@ -1,17 +0,0 @@
-#include "test/helpers/test_fixture.h"
-
-#include "rpc/rpc_manager.h"
-
-class TestRpcManager : public test_fixture {
-  CPPUNIT_TEST_SUITE(TestRpcManager);
-
-  CPPUNIT_TEST(test_size_limit_bounds);
-
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  void test_size_limit_bounds();
-
-private:
-  rpc::RpcManager m_rpc_manager;
-};

test/rpc/test_xmlrpc.cc

@@ -8,7 +8,6 @@
 #include "globals.h"
 #include "command_helpers.h"
 #include "rpc/command_map.h"
-#include "rpc/scgi_task.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION(TestXmlrpc);
 
@@ -22,11 +21,6 @@ xmlrpc_cmd_test_reflect_string([[maybe_unused]] rpc::target_type t, const std::s
   return obj;
 }
 
-torrent::Object
-xmlrpc_cmd_test_oversized([[maybe_unused]] rpc::target_type t, [[maybe_unused]] const torrent::Object& obj) {
-  return torrent::Object(std::string(rpc::SCgiTask::max_response_size + (1 << 20), 'a'));
-}
-
 void initialize_command_dynamic();
 
 #if defined(HAVE_XMLRPC_TINYXML2) && !defined(HAVE_XMLRPC_C)
@@ -133,9 +127,6 @@ TestXmlrpc::setUp() {
 
   if (rpc::commands.find("xmlrpc_reflect_string") == rpc::commands.end())
     CMD2_ANY_STRING("xmlrpc_reflect_string", &xmlrpc_cmd_test_reflect_string);
-
-  if (rpc::commands.find("xmlrpc_oversized") == rpc::commands.end())
-    CMD2_ANY("xmlrpc_oversized", &xmlrpc_cmd_test_oversized);
 }
 
 void
@@ -174,30 +165,11 @@ TestXmlrpc::test_size_limit() {
   CPPUNIT_ASSERT_EQUAL(expected, output);
 }
 
-// A command whose result does not fit in the SCGI response buffer must be
-// answered with a fault, not handed to the writer. SCgiTask::receive_write
-// treats an oversized body as an internal_error, which is not caught by any
-// RPC handler and terminates the process.
-void
-TestXmlrpc::test_response_size_limit() {
-  std::string input = "<?xml version=\"1.0\"?><methodCall><methodName>xmlrpc_oversized</methodName><params><param><value><string></string></value></param></params></methodCall>";
-  std::string expected = "<?xml version=\"1.0\"?><methodResponse><fault><value><struct><member><name>faultCode</name><value><i8>-509</i8></value></member><member><name>faultString</name><value><string>Response size exceeds maximum XML-RPC limit</string></value></member></struct></value></fault></methodResponse>";
-  std::string output;
-
-  m_xmlrpc.process(input.c_str(), input.size(), [&output](const char* c, uint32_t l){ output.append(c, l); return true;});
-
-  CPPUNIT_ASSERT_MESSAGE("response handed to the writer is " + std::to_string(output.size()) +
-                         " bytes, over the " + std::to_string(rpc::SCgiTask::max_response_size) + " byte SCGI limit",
-                         output.size() <= rpc::SCgiTask::max_response_size);
-  CPPUNIT_ASSERT_EQUAL(expected, output);
-}
-
 #else
 
 void TestXmlrpc::test_invalid_utf8() {}
 void TestXmlrpc::test_basics() {}
 void TestXmlrpc::test_size_limit() {}
-void TestXmlrpc::test_response_size_limit() {}
 void TestXmlrpc::setUp() {}
 void TestXmlrpc::tearDown() {}
 

test/rpc/test_xmlrpc.h

@@ -10,7 +10,6 @@ class TestXmlrpc : public test_fixture {
   CPPUNIT_TEST(test_basics);
   CPPUNIT_TEST(test_invalid_utf8);
   CPPUNIT_TEST(test_size_limit);
-  CPPUNIT_TEST(test_response_size_limit);
 
   CPPUNIT_TEST_SUITE_END();
 
@@ -23,7 +22,6 @@ public:
   void test_basics();
   void test_invalid_utf8();
   void test_size_limit();
-  void test_response_size_limit();
 
 private:
   std::unique_ptr<TestMainThread> m_test_main_thread;

test/src/test_command_dynamic.cc

@@ -2,8 +2,6 @@
 
 #include "test/src/test_command_dynamic.h"
 
-#include "helpers/assert.h"
-
 #include "control.h"
 #include "globals.h"
 #include "rpc/parse_commands.h"
@@ -63,51 +61,3 @@ TestCommandDynamic::test_old_style() {
   rpc::commands.call_command("method.insert", rpc::create_object_list("test_old_style.4", "simple", "cat=test.3"));
   CPPUNIT_ASSERT(rpc::commands.call_command("test_old_style.4", torrent::Object()).as_string() == "test.3");
 }
-
-void
-TestCommandDynamic::test_insert_list() {
-  torrent::Object key_only = torrent::Object::create_list();
-  key_only.as_list().push_back("test_insert_list.1");
-
-  rpc::commands.call_command("method.insert.list", key_only);
-
-  torrent::Object result = rpc::commands.call_command("test_insert_list.1", torrent::Object());
-
-  CPPUNIT_ASSERT(result.is_list());
-  CPPUNIT_ASSERT(result.as_list().empty());
-
-  rpc::commands.call_command("method.insert.list",
-                             rpc::create_object_list("test_insert_list.2", rpc::create_object_list("a", "b")));
-
-  torrent::Object filled = rpc::commands.call_command("test_insert_list.2", torrent::Object());
-
-  CPPUNIT_ASSERT(filled.is_list());
-  CPPUNIT_ASSERT_EQUAL((size_t)2, filled.as_list().size());
-}
-
-void
-TestCommandDynamic::test_value_base() {
-  auto value = [](std::initializer_list<torrent::Object> objects) {
-    auto args = torrent::Object::create_list();
-
-    for (const auto& object : objects)
-      args.as_list().push_back(object);
-
-    return rpc::commands.call_command("value", args).as_value();
-  };
-
-  CPPUNIT_ASSERT_EQUAL(int64_t(10), value({"10"}));
-  CPPUNIT_ASSERT_EQUAL(int64_t(255), value({"ff", int64_t(16)}));
-
-  // strtoll only defines base 0 and base 2 through 36.
-  ASSERT_CATCH_INPUT_ERROR( { value({"10", int64_t(1)}); } );
-  ASSERT_CATCH_INPUT_ERROR( { value({"10", int64_t(37)}); } );
-  ASSERT_CATCH_INPUT_ERROR( { value({"10", int64_t(-1)}); } );
-
-  // An out-of-range base must not be narrowed into a valid one.
-  ASSERT_CATCH_INPUT_ERROR( { value({"10", int64_t(1) << 40}); } );
-  ASSERT_CATCH_INPUT_ERROR( { value({"ff", (int64_t(1) << 32) + 16}); } );
-
-  // A number too large for the result must be rejected, not clamped.
-  ASSERT_CATCH_INPUT_ERROR( { value({"99999999999999999999999"}); } );
-}

test/src/test_command_dynamic.h

@@ -7,8 +7,6 @@ class TestCommandDynamic : public test_fixture {
   CPPUNIT_TEST(test_basics);
   CPPUNIT_TEST(test_get_set);
   CPPUNIT_TEST(test_old_style);
-  CPPUNIT_TEST(test_insert_list);
-  CPPUNIT_TEST(test_value_base);
 
   CPPUNIT_TEST_SUITE_END();
 
@@ -20,8 +18,6 @@ public:
   void test_get_set();
 
   void test_old_style();
-  void test_insert_list();
-  void test_value_base();
 
 private:
   std::unique_ptr<TestMainThread> m_test_main_thread;

test/src/test_command_ip.cc

@@ -1,55 +0,0 @@
-#include "config.h"
-
-#include "test/src/test_command_ip.h"
-
-#include <cstdint>
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestCommandIp);
-
-bool ipv4_range_parse(const char* address, uint32_t* address_start, uint32_t* address_end);
-
-static uint32_t
-ipv4(uint32_t a, uint32_t b, uint32_t c, uint32_t d) {
-  return (a << 24) | (b << 16) | (c << 8) | d;
-}
-
-#define RANGE_ASSERT(address, expected_start, expected_end)             \
-  {                                                                     \
-    uint32_t start = 0;                                                 \
-    uint32_t end = 0;                                                   \
-                                                                        \
-    CPPUNIT_ASSERT(ipv4_range_parse(address, &start, &end));            \
-    CPPUNIT_ASSERT_EQUAL(expected_start, start);                        \
-    CPPUNIT_ASSERT_EQUAL(expected_end, end);                            \
-  }
-
-void
-TestCommandIp::test_single_address() {
-  RANGE_ASSERT("10.1.2.3", ipv4(10, 1, 2, 3), ipv4(10, 1, 2, 3));
-}
-
-void
-TestCommandIp::test_explicit_range() {
-  RANGE_ASSERT("10.1.2.3-10.1.2.9", ipv4(10, 1, 2, 3), ipv4(10, 1, 2, 9));
-}
-
-void
-TestCommandIp::test_cidr() {
-  RANGE_ASSERT("10.0.0.0/8", ipv4(10, 0, 0, 0), ipv4(10, 255, 255, 255));
-  RANGE_ASSERT("10.1.2.0/24", ipv4(10, 1, 2, 0), ipv4(10, 1, 2, 255));
-  RANGE_ASSERT("10.1.2.128/25", ipv4(10, 1, 2, 128), ipv4(10, 1, 2, 255));
-  RANGE_ASSERT("10.1.2.3/31", ipv4(10, 1, 2, 2), ipv4(10, 1, 2, 3));
-}
-
-void
-TestCommandIp::test_cidr_zero_mask() {
-  RANGE_ASSERT("0.0.0.0/0", ipv4(0, 0, 0, 0), ipv4(255, 255, 255, 255));
-  RANGE_ASSERT("10.1.2.3/0", ipv4(0, 0, 0, 0), ipv4(255, 255, 255, 255));
-}
-
-void
-TestCommandIp::test_cidr_full_mask() {
-  RANGE_ASSERT("10.1.2.3/32", ipv4(10, 1, 2, 3), ipv4(10, 1, 2, 3));
-  RANGE_ASSERT("0.0.0.0/32", ipv4(0, 0, 0, 0), ipv4(0, 0, 0, 0));
-  RANGE_ASSERT("255.255.255.255/32", ipv4(255, 255, 255, 255), ipv4(255, 255, 255, 255));
-}

test/src/test_command_ip.h

@@ -1,25 +0,0 @@
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-
-// ipv4_range_parse is a pure function, so this does not use test_fixture and
-// the mock and logging setup that comes with it.
-class TestCommandIp : public CppUnit::TestFixture {
-  CPPUNIT_TEST_SUITE(TestCommandIp);
-
-  CPPUNIT_TEST(test_single_address);
-  CPPUNIT_TEST(test_explicit_range);
-
-  CPPUNIT_TEST(test_cidr);
-  CPPUNIT_TEST(test_cidr_zero_mask);
-  CPPUNIT_TEST(test_cidr_full_mask);
-
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  void test_single_address();
-  void test_explicit_range();
-
-  void test_cidr();
-  void test_cidr_zero_mask();
-  void test_cidr_full_mask();
-};

test/src/test_command_local.cc

@@ -1,6 +1,6 @@
 #include "config.h"
 
-#include "test/src/test_command_system.h"
+#include "test/src/test_command_local.h"
 
 #include <torrent/torrent.h>
 #include <torrent/runtime/socket_manager.h>
@@ -10,12 +10,12 @@
 #include "globals.h"
 #include "rpc/parse_commands.h"
 
-CPPUNIT_TEST_SUITE_REGISTRATION(TestCommandSystem);
+CPPUNIT_TEST_SUITE_REGISTRATION(TestCommandLocal);
 
-void initialize_command_system();
+void initialize_command_local();
 
 void
-TestCommandSystem::setUp() {
+TestCommandLocal::setUp() {
   torrent::initialize_main_thread();
   torrent::initialize();
 
@@ -23,16 +23,16 @@ TestCommandSystem::setUp() {
     control = new Control;
 
   if (!rpc::commands.has("system.sockets.size"))
-    initialize_command_system();
+    initialize_command_local();
 }
 
 void
-TestCommandSystem::tearDown() {
+TestCommandLocal::tearDown() {
   torrent::cleanup();
 }
 
 void
-TestCommandSystem::test_socket_category_commands() {
+TestCommandLocal::test_socket_category_commands() {
   for (uint32_t i = 0; i < torrent::runtime::SocketManager::category_count; ++i) {
     auto category = static_cast<torrent::runtime::socket_manager_category_t>(i);
     auto name     = "system.sockets." + torrent::option_to_str_or_throw(torrent::OPTION_SOCKET_CATEGORY, i);

test/src/test_command_local.h

@@ -1,7 +1,7 @@
 #include "test/helpers/test_fixture.h"
 
-class TestCommandSystem : public test_fixture {
-  CPPUNIT_TEST_SUITE(TestCommandSystem);
+class TestCommandLocal : public test_fixture {
+  CPPUNIT_TEST_SUITE(TestCommandLocal);
 
   CPPUNIT_TEST(test_socket_category_commands);
 

test/src/test_setup.cc

@@ -1,78 +0,0 @@
-#include "config.h"
-
-#include "test/src/test_setup.h"
-
-#include <fstream>
-#include <string>
-#include <unistd.h>
-#include <torrent/exceptions.h>
-
-#include "setup.h"
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestSetup);
-
-// Linking setup.o pulls in the help printer, which lives in src/main.cc.
-void
-print_help() {}
-
-namespace {
-
-class temp_config_file {
-public:
-  temp_config_file(const std::string& contents) {
-    char path[] = "/tmp/rtorrent_test_setup_XXXXXX";
-
-    CPPUNIT_ASSERT(::mkstemp(path) != -1);
-    m_path = path;
-
-    std::ofstream file(m_path);
-    file << contents << '\n';
-  }
-
-  ~temp_config_file() { ::unlink(m_path.c_str()); }
-
-  const std::string& path() const { return m_path; }
-
-private:
-  std::string m_path;
-};
-
-// The group name must be a valid one, else option_find_string throws before
-// the output argument is ever touched.
-void
-assert_arg_count_error(const std::string& line) {
-  temp_config_file file(line);
-
-  try {
-    parse_config_file_comments(file.path());
-  } catch (torrent::input_error& e) {
-    CPPUNIT_ASSERT_EQUAL(std::string("Invalid number of arguments."), std::string(e.what()));
-    return;
-  }
-
-  CPPUNIT_FAIL("no torrent::input_error thrown for: " + line);
-}
-
-} // namespace
-
-void
-TestSetup::test_config_comment_log_add_output() {
-  temp_config_file file("# do:log.add_output=debug,test_output");
-
-  CPPUNIT_ASSERT_NO_THROW(parse_config_file_comments(file.path()));
-}
-
-void
-TestSetup::test_config_comment_log_add_output_no_args() {
-  assert_arg_count_error("# do:log.add_output=");
-}
-
-void
-TestSetup::test_config_comment_log_add_output_one_arg() {
-  assert_arg_count_error("# do:log.add_output=debug");
-}
-
-void
-TestSetup::test_config_comment_log_add_output_too_many_args() {
-  assert_arg_count_error("# do:log.add_output=debug,test_output,extra");
-}

test/src/test_setup.h

@@ -1,18 +0,0 @@
-#include "test/helpers/test_fixture.h"
-
-class TestSetup : public test_fixture {
-  CPPUNIT_TEST_SUITE(TestSetup);
-
-  CPPUNIT_TEST(test_config_comment_log_add_output);
-  CPPUNIT_TEST(test_config_comment_log_add_output_no_args);
-  CPPUNIT_TEST(test_config_comment_log_add_output_one_arg);
-  CPPUNIT_TEST(test_config_comment_log_add_output_too_many_args);
-
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  void test_config_comment_log_add_output();
-  void test_config_comment_log_add_output_no_args();
-  void test_config_comment_log_add_output_one_arg();
-  void test_config_comment_log_add_output_too_many_args();
-};

test/src/test_ui_download_list.cc

@@ -1,52 +0,0 @@
-#include "config.h"
-
-#include "test/src/test_ui_download_list.h"
-
-#include "ui/download_list.h"
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestUiDownloadList);
-
-void
-TestUiDownloadList::test_filter_pattern() {
-  CPPUNIT_ASSERT_EQUAL(std::string(""), ui::create_filter_pattern(""));
-  CPPUNIT_ASSERT_EQUAL(std::string(".*linux.*"), ui::create_filter_pattern("linux"));
-  CPPUNIT_ASSERT_EQUAL(std::string("^linux.*"), ui::create_filter_pattern("^linux"));
-  CPPUNIT_ASSERT_EQUAL(std::string(".*linux$"), ui::create_filter_pattern("linux$"));
-  CPPUNIT_ASSERT_EQUAL(std::string(".*linux.*"), ui::create_filter_pattern("LiNuX"));
-}
-
-void
-TestUiDownloadList::test_filter_command() {
-  torrent::Object command = ui::create_filter_command(".*linux.*");
-
-  CPPUNIT_ASSERT(command.is_dict_key());
-  CPPUNIT_ASSERT_EQUAL(std::string("match"), command.as_dict_key());
-
-  const torrent::Object::list_type& args = command.as_dict_obj().as_list();
-
-  CPPUNIT_ASSERT_EQUAL((size_t)2, args.size());
-  CPPUNIT_ASSERT(args.front().is_dict_key());
-  CPPUNIT_ASSERT_EQUAL(std::string("d.name"), args.front().as_dict_key());
-  CPPUNIT_ASSERT(args.back().is_string());
-  CPPUNIT_ASSERT_EQUAL(std::string(".*linux.*"), args.back().as_string());
-}
-
-// A pattern that closes the 'match' argument early and appends a second
-// command must stay a single inert string argument.
-void
-TestUiDownloadList::test_filter_command_does_not_inject() {
-  const std::string pattern = ui::create_filter_pattern("zzz},$d.custom1.set={pwned");
-
-  CPPUNIT_ASSERT_EQUAL(std::string(".*zzz},$d.custom1.set={pwned.*"), pattern);
-
-  torrent::Object command = ui::create_filter_command(pattern);
-
-  CPPUNIT_ASSERT(command.is_dict_key());
-  CPPUNIT_ASSERT_EQUAL(std::string("match"), command.as_dict_key());
-
-  const torrent::Object::list_type& args = command.as_dict_obj().as_list();
-
-  CPPUNIT_ASSERT_EQUAL((size_t)2, args.size());
-  CPPUNIT_ASSERT(args.back().is_string());
-  CPPUNIT_ASSERT_EQUAL(pattern, args.back().as_string());
-}

test/src/test_ui_download_list.h

@@ -1,16 +0,0 @@
-#include "test/helpers/test_fixture.h"
-
-class TestUiDownloadList : public test_fixture {
-  CPPUNIT_TEST_SUITE(TestUiDownloadList);
-
-  CPPUNIT_TEST(test_filter_pattern);
-  CPPUNIT_TEST(test_filter_command);
-  CPPUNIT_TEST(test_filter_command_does_not_inject);
-
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  void test_filter_pattern();
-  void test_filter_command();
-  void test_filter_command_does_not_inject();
-};