Changing listen/dht port changes the listening/dht ports.

Replace protocol.encryption.set bitmask flags with
protocol.encryption.handshake.set and protocol.encryption.stream.set.
Add encryption_config to map commands to libtorrent EncryptionPolicy.
Startup default matches the old preset (allow_incoming, enable_retry,
prefer_plaintext → handshake=allow, stream=allow).

Update docs and examples. Peer list distinguishes RC4 (R/L),
handshake-only (H/h), and plain (r/l). Fix ui encrypted column
conditional. Add encryption config tests; remove OPTION_ENCRYPTION
parse tests. Drop the encryption command redirect.

.github/workflows/commit-lint.yml

@@ -1,65 +0,0 @@
-name: "Lint Commit Message Size"
-
-on:
-  pull_request:
-    types: [opened, synchronize, reopened]
-
-jobs:
-  check-commit-bounds:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Validate Line Count, Width, and Spacing
-        run: |
-          # Fetch commit hashes unique to this PR branch
-          COMMITS=$(git log --no-merges --pretty=format:"%H" origin/${{ github.base_ref }}..HEAD)
-
-          MAX_LINES=3
-          MAX_CHARS=90
-          FAILED=0
-
-          for commit in $COMMITS; do
-            SUBJECT=$(git log --format="%s" -n 1 $commit)
-
-            # Extract clean commit message, trimming trailing blank lines
-            RAW_MSG=$(git log --format="%B" -n 1 $commit)
-            CLEAN_MSG=$(echo "$RAW_MSG" | awk '{msg[NR]=$0} END {while(NR>0 && msg[NR]=="") NR--; for(i=1;i<=NR;i++) print msg[i]}')
-
-            # 1. Check total line count
-            LINE_COUNT=$(echo "$CLEAN_MSG" | wc -l)
-            if [ "$LINE_COUNT" -gt "$MAX_LINES" ]; then
-              echo "❌ Error: Commit message has too many lines ($LINE_COUNT/$MAX_LINES)."
-              echo "   Commit: '$SUBJECT'"
-              FAILED=1
-            fi
-
-            # 2. Check for multiple consecutive blank lines
-            # This regex looks for 2 or more empty lines anywhere in the message
-            if echo "$CLEAN_MSG" | grep -Pz '(\r?\n){3,}'; then
-              echo "❌ Error: Commit message contains multiple consecutive line breaks."
-              echo "   Commit: '$SUBJECT'"
-              FAILED=1
-            fi
-
-            # 3. Check maximum width of any individual line
-            while IFS= read -r line; do
-              LINE_LENGTH=${#line}
-              if [ "$LINE_LENGTH" -gt "$MAX_CHARS" ]; then
-                echo "❌ Error: Line length exceeds limit ($LINE_LENGTH / $MAX_CHARS chars)."
-                echo "   Offending line: '$line'"
-                FAILED=1
-              fi
-            done <<< "$CLEAN_MSG"
-
-          done
-
-          # Fail the job if any check failed
-          if [ "$FAILED" -ne 0 ]; then
-            exit 1
-          fi
-
-          echo "✅ All commit messages passed style rules!"

configure.ac

@@ -1,6 +1,6 @@
 m4_pattern_allow([PKG_CHECK_EXISTS])
 
-AC_INIT([rtorrent],[0.16.20],[sundell.software@gmail.com])
+AC_INIT([rtorrent],[0.16.17],[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], [25], [api version])
+AC_DEFINE([API_VERSION], [23], [api version])
 
 RAK_CHECK_CFLAGS
 RAK_CHECK_CXXFLAGS
@@ -22,8 +22,6 @@ RAK_ENABLE_DEBUG
 RAK_ENABLE_EXTRA_DEBUG
 RAK_ENABLE_WERROR
 
-TORRENT_CHECK_ATOMIC
-
 AC_ARG_ENABLE(execinfo,
   AS_HELP_STRING([--disable-execinfo],
     [disable libexecinfo [[default=enable]]]),
@@ -49,7 +47,7 @@ fi
 
 PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
 PKG_CHECK_MODULES([ZLIB], [zlib])
-PKG_CHECK_MODULES([DEPENDENCIES], [libtorrent >= 0.16.20])
+PKG_CHECK_MODULES([DEPENDENCIES], [libtorrent >= 0.16.17])
 
 AC_LANG_PUSH(C++)
 TORRENT_WITH_XMLRPC_C
@@ -70,7 +68,7 @@ AC_DEFINE(USER_AGENT, [std::string(PACKAGE "/" VERSION)], Http user agent)
 
 dnl Only update global build variables immediately before generating the output,
 dnl to avoid affecting the global build environment for other autoconf checks.
-LIBS="$ATOMIC_LIBS $PTHREAD_LIBS $CURSES_LIB $CURSES_LIBS $ZLIB_LIBS $DEPENDENCIES_LIBS $LIBS"
+LIBS="$PTHREAD_LIBS $CURSES_LIB $CURSES_LIBS $ZLIB_LIBS $DEPENDENCIES_LIBS $LIBS"
 CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS $ZLIB_CFLAGS $DEPENDENCIES_CFLAGS"
 CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS $ZLIB_CFLAGS $DEPENDENCIES_CFLAGS"
 

doc/manual/paths.md

@@ -1,60 +0,0 @@
-# Resolving paths
-
-Commands that return a path have `.realpath` variants that resolve it to a
-canonical one, with symlinks followed and any `.` or `..` components removed.
-
-The intent is to make paths safer to hand to an external script.
-A script called through `execute` receives whatever path rtorrent gives it, and
-many scripts do no sanity checking of their own, so resolving the path before it
-leaves rtorrent removes a class of surprises: a download directory that is a
-symlink into somewhere unexpected, or a torrent whose name walks upwards out of
-the directory it is supposed to live in.
-
-    # Instead of this
-    execute = ~/bin/on-finished, (d.base_path)
-
-    # Pass the resolved path
-    execute = ~/bin/on-finished, (d.base_path.realpath.or_throw)
-
-## Available variants
-
-Each command below comes in an `.or_empty` and an `.or_throw` form.
-
-| Command | Resolves |
-| --- | --- |
-| `d.base_path.realpath.*` | `d.base_path` |
-| `d.directory.realpath.*` | `d.directory` |
-| `d.tied_to_file.realpath.*` | `d.tied_to_file` |
-| `d.loaded_file.realpath.*` | `d.loaded_file` |
-| `f.frozen_path.realpath.*` | `f.frozen_path` |
-| `session.path.realpath.*` | `session.path` |
-| `directory.default.realpath.*` | `directory.default` |
-
-A leading `~` is expanded first, exactly as it is for `execute`, so
-`~/downloads` resolves the same way it would on the command line.
-
-## Paths that do not exist
-
-Resolving requires the path to name an existing file or directory, which is
-often not the case for a download whose data has not been written yet.
-The two forms differ only in what they do about it.
-
-`.or_empty` returns an empty string:
-
-    print = (d.base_path.realpath.or_empty)    # ""
-
-This keeps `d.multicall` usable over a view that mixes started and unstarted
-downloads, since a single unresolvable path does not abort the whole call.
-A script receiving one of these paths should still check that it is not empty
-before acting on it.
-
-`.or_throw` raises an error instead:
-
-    print = (d.base_path.realpath.or_throw)    # Could not resolve path: '...'
-
-Prefer this one wherever an unresolvable path means the command should not run
-at all, such as a single `execute` on `event.download.finished`.
-
-Note that a download only has a file list once it has been opened, so
-`d.base_path` and `f.frozen_path` are empty at `event.download.inserted` time
-and their `.realpath` variants resolve nothing.

doc/manual/string_functions.md

@@ -1,139 +0,0 @@
-# String functions
-
-The `string.*` commands manipulate and inspect text from within the
-configuration file.
-They are pure functions with no side effects, so they can be nested freely and
-are safe to call over RPC.
-
-Every argument is converted to its string representation before use, which means
-numbers can be passed where text is expected.
-Commands that count characters, such as `string.length` and `string.substr`, count
-utf-8 characters rather than bytes.
-
-## string.length
-
-    # string.length = «text»
-
-    string.length = "héllo"    # 5
-
-Returns the number of utf-8 characters in the text.
-
-## string.equals
-
-    # string.equals = «text», «other»[, ...]
-
-    string.equals = (d.name), "first.iso", "second.iso"
-
-Returns `1` if the first argument equals any of the following arguments,
-otherwise `0`.
-
-## string.starts_with, string.ends_with
-
-    # string.starts_with = «text», «prefix»[, ...]
-    # string.ends_with = «text», «tail»[, ...]
-
-    string.starts_with = (t.url), "http://", "https://"
-    string.ends_with = (d.name), ".iso"
-
-Returns `1` if the text begins, or ends, with any of the given prefixes or
-tails.
-
-## string.contains, string.contains_i
-
-    # string.contains = «haystack», «needle»[, ...]
-    # string.contains_i = «haystack», «needle»[, ...]
-
-    string.contains = (t.url), "retracker.local"
-    string.contains_i = (t.url), "RETRACKER.local"
-
-Returns `1` if the haystack contains any of the needles.
-The `_i` variant compares case-insensitively, and only handles ascii.
-
-## string.substr
-
-    # string.substr = «text»[, «position»[, «count»[, «default»]]]
-
-    string.substr = "abcdef", 2, 3       # "cde"
-    string.substr = "abcdef", -2         # "ef"
-    string.substr = "abcdef", 10, 1, "?" # "?"
-
-Extracts a part of the text, starting at `position` and spanning `count`
-characters.
-The position defaults to the start of the text, and the count to the rest of it.
-A negative position is relative to the end of the text.
-If the position falls outside the text, the default value is returned instead,
-which is the empty string unless given.
-
-## string.split
-
-    # string.split = «text», «delimiter»
-
-    string.split = "a.b.c", "."    # {"a", "b", "c"}
-    string.split = "abc", ""       # {"a", "b", "c"}
-
-Splits the text into a list, keeping empty fields.
-An empty delimiter splits the text into its utf-8 characters.
-
-## string.join
-
-    # string.join = «delimiter»[, «object»[, ...]]
-
-    string.join = "-", (string.split, "a.b.c", ".")    # "a-b-c"
-
-Concatenates the objects, inserting the delimiter between them.
-Lists are flattened, so the result of `string.split` can be joined back
-together.
-
-## string.lpad, string.rpad
-
-    # string.lpad = «text», «length»[, «padding»]
-    # string.rpad = «text», «length»[, «padding»]
-
-    string.lpad = 7, 3, 0    # "007"
-    string.rpad = "a", 3     # "a  "
-
-Pads the text at the start, or the end, until it is `length` characters long.
-The padding defaults to a single space and is repeated as needed.
-Text that is already long enough is returned unchanged.
-
-## string.strip, string.lstrip, string.rstrip
-
-    # string.strip = «text»[, «strippable»[, ...]]
-    # string.lstrip = «text»[, «head»[, ...]]
-    # string.rstrip = «text»[, «tail»[, ...]]
-
-    string.strip = "  padded  "      # "padded"
-    string.strip = "//path//", "/"   # "path"
-
-Removes characters from both ends of the text, or from only the start or the
-end.
-The arguments after the text form a set of utf-8 characters to remove.
-Without them, whitespace is removed.
-
-## string.map
-
-    # string.map = «text», {«old», «new»}[, ...]
-
-    string.map = (d.state), {0, "stopped"}, {1, "started"}
-
-Returns the replacement of the first pair whose `old` value equals the whole
-text.
-If no pair matches, the text is returned unchanged.
-
-## string.replace
-
-    # string.replace = «text», {«old», «new»}[, ...]
-
-    string.replace = "a-b-c", {"-", "+"}    # "a+b+c"
-
-Replaces every occurrence of `old` with `new`.
-The pairs are applied in order, so a later pair operates on the result of the
-earlier ones.
-
-## Example: dropping unwanted trackers
-
-The following disables every tracker that points at `retracker.local` as soon as
-a download is inserted.
-
-    method.set_key = event.download.inserted, drop_retracker, \
-      ((t.multicall, default, "branch=(string.contains,(t.url),retracker.local),((t.disable))"))

doc/old/rtorrent.1

@@ -214,21 +214,15 @@ Add a preferred filename encoding to the list. The encodings are
 attempted in the order they are inserted, if none match the torrent
 default is used.
 .TP
-\fBencryption = \fIoption\fB,\fI\&...\fB\fR
+\fBprotocol.encryption.handshake.set\fR (deny, allow, prefer, require)
-Set how rtorrent should deal with encrypted Bittorrent connections. By
+and \fBprotocol.encryption.stream.set\fR (deny, allow, prefer,
-default, encryption is disabled, equivalent to specifying the option
+require) control how rtorrent deals with encrypted Bittorrent
-\fBnone\fR\&. Alternatively, any number of the following
+connections. Handshake \fBallow\fR accepts plain or PE inbound and
-options may be specified:
+tries plain first outbound with one PE retry on failure.
-
+\fBprefer\fR tries PE first with one plain retry. Stream \fBallow\fR
-\fBallow_incoming\fR (allow incoming encrypted connections), 
+and \fBprefer\fR offer both handshake-only and RC4 on outgoing PE
-\fBtry_outgoing\fR (use encryption for outgoing connections),
+connections. The default is handshake=allow, stream=allow. Use
-\fBrequire\fR (disable unencrypted handshakes), 
+\fBprotocol.encryption\fR to inspect the effective policy.
-\fBrequire_RC4\fR (also disable plaintext transmission after the
-initial encrypted handshake),
-\fBenable_retry\fR (if the initial outgoing connection fails, retry
-with encryption turned on if it was off or off if it was on), 
-\fBprefer_plaintext\fR (choose plaintext when peer offers a choice 
-between plaintext transmission and RC4 encryption, otherwise RC4 will be used).
 .TP
 \fBpeer_exchange = \fIyes | no\fB\fR
 Enable/disable peer exchange for torrents that aren't marked private. Disabled by default.

doc/old/rtorrent.1.xml

@@ -484,25 +484,19 @@ default is used.
       </varlistentry>
 
       <varlistentry>
-        <term>encryption = <replaceable>option</replaceable>,<replaceable>...</replaceable></term>
+        <term>protocol.encryption.handshake.set = <replaceable>policy</replaceable></term>
         <listitem><para>
 
-Set how rtorrent should deal with encrypted Bittorrent connections. By
+Control how rtorrent deals with encrypted Bittorrent connections.
-default, encryption is disabled, equivalent to specifying the option
+<emphasis>protocol.encryption.handshake.set</emphasis> (deny, allow, prefer,
-<emphasis>none</emphasis>. Alternatively, any number of the following
+require) and <emphasis>protocol.encryption.stream.set</emphasis> (deny, allow,
-options may be specified:
+prefer, require). Handshake <emphasis>allow</emphasis> accepts plain or PE
-
+inbound and tries plain first outbound with one PE retry on failure.
-        </para><para>
+<emphasis>prefer</emphasis> tries PE first with one plain retry. Stream
-
+<emphasis>allow</emphasis> and <emphasis>prefer</emphasis> offer both
-<emphasis>allow_incoming</emphasis> (allow incoming encrypted connections), 
+handshake-only and RC4 on outgoing PE connections. The default is
-<emphasis>try_outgoing</emphasis> (use encryption for outgoing connections),
+handshake=allow, stream=allow. Use <emphasis>protocol.encryption</emphasis> to
-<emphasis>require</emphasis> (disable unencrypted handshakes), 
+inspect the effective policy.
-<emphasis>require_RC4</emphasis> (also disable plaintext transmission after the
-initial encrypted handshake),
-<emphasis>enable_retry</emphasis> (if the initial outgoing connection fails, retry
-with encryption turned on if it was off or off if it was on), 
-<emphasis>prefer_plaintext</emphasis> (choose plaintext when peer offers a choice 
-between plaintext transmission and RC4 encryption, otherwise RC4 will be used).
 
         </para></listitem>
       </varlistentry>

doc/rtorrent.rc

@@ -71,11 +71,11 @@
 
 # Port range to use for listening.
 #
-#network.listen.port.range.set = 6890-6999
+#network.port_range.set = 6890-6999
 
 # Start opening ports at a random position within the port range.
 #
-#network.listen.port.random.set = no
+#network.port_random.set = no
 
 # Set RPC type
 #network.rpc.use_xmlrpc.set = true
@@ -95,14 +95,40 @@
 #schedule2 = ip_tick,0,1800,ip=rakshasa
 #schedule2 = bind_tick,0,1800,bind=rakshasa
 
-# Encryption options, set to none (default) or any combination of the following:
+# --- Protocol encryption (PE handshake / optional RC4 stream) ---
-# allow_incoming, try_outgoing, require, require_RC4, enable_retry, prefer_plaintext
+# Default at startup: handshake=allow stream=allow
 #
-# The example value allows incoming encrypted connections, starts unencrypted
+# Handshake (PE handshake; incoming accepts plain or PE for allow/prefer):
-# outgoing connections but retries with encryption if they fail, preferring
+#   deny    - plain BT handshake only both ways; no retry
-# plain-text to RC4 encryption after the encrypted handshake.
+#   allow   - accept plain or PE inbound; plain first outbound with one PE retry
+#   prefer  - accept plain or PE inbound; PE first outbound with one plain retry
+#   require - PE handshake required both ways; no retry
 #
-# protocol.encryption.set = allow_incoming,enable_retry,prefer_plaintext
+# protocol.encryption.handshake.set = allow
+#
+# Stream (cipher negotiation after PE handshake succeeds):
+#   deny    - offer handshake-only; require handshake-only (no RC4)
+#   allow   - incoming: prefer handshake-only if offered, else RC4
+#             outgoing: offer both handshake-only and RC4
+#   prefer  - incoming: pick RC4 if offered, else handshake-only
+#             outgoing: offer both handshake-only and RC4
+#   require - offer RC4 only; require RC4
+#
+# Outgoing retry summary with handshake=allow (plain first):
+#   stream=allow/prefer -> plain BT -> PE (both)
+#   stream=deny         -> plain BT -> PE (handshake-only)
+#   stream=require      -> plain BT -> PE (RC4-only)
+#
+# Outgoing retry summary with handshake=prefer (PE first):
+#   stream=allow/prefer -> PE (both) -> plain BT
+#   stream=deny         -> PE (handshake-only) -> plain BT
+#   stream=require      -> PE (RC4-only) -> plain BT
+#
+# Negotiated stream cipher is logged at connection_handshake level.
+#
+# protocol.encryption.stream.set = allow
+#
+# Use protocol.encryption to inspect the effective policy.
 
 # Enable DHT support for trackerless torrents or when all trackers are down.
 # May be set to "disable" (completely disable DHT), "off" (do not start DHT),

doc/rtorrent.rc-example

@@ -23,8 +23,8 @@ execute.throw = sh, -c, (cat,\
     "\"",(cfg.watch),"/start\" ")
 
 # Listening port for incoming peer traffic (fixed; you can also randomize it)
-network.listen.port.range.set = 50000-50000
+network.port_range.set = 50000-50000
-network.listen.port.random.set = no
+network.port_random.set = no
 
 # Tracker-less torrent and UDP tracker support
 # (conservative settings for 'private' trackers, change for 'public')
@@ -42,7 +42,8 @@ throttle.min_peers.seed.set = 30
 throttle.max_peers.seed.set = 80
 trackers.numwant.set = 80
 
-protocol.encryption.set = allow_incoming,try_outgoing,enable_retry
+protocol.encryption.handshake.set = allow
+protocol.encryption.stream.set = prefer
 
 # Limits for file handle resources, this is optimized for
 # an `ulimit` of 1024 (a common default). You MUST leave

doc/rtorrent.rc.lua-example

@@ -72,7 +72,8 @@ rc.throttle.min_peers.seed = 30
 rc.throttle.max_peers.seed = 80
 rc.trackers.numwant = 80
 
-rc.protocol.encryption.set('allow_incoming', 'try_outgoing', 'enable_retry')
+rc.protocol.encryption.handshake.set('allow')
+rc.protocol.encryption.stream.set('prefer')
 
 -- Limits for file handle resources, this is optimized for
 -- an `ulimit` of 1024 (a common default). You MUST leave

doc/scripts/print_option_string.sh

@@ -12,7 +12,7 @@ echo "Client version: " `xmlrpc2scgi.py -p scgi://127.0.0.1:${PORT_NUMBER} syste
 echo
 echo "Generated by 'rtorrent/doc/scripts/print_option_string.sh' on `date -u`."
 
-for i in strings.choke_heuristics strings.choke_heuristics.upload strings.choke_heuristics.download strings.connection_type strings.encryption strings.ip_filter strings.ip_tos strings.log_group strings.tracker_event strings.tracker_mode; do
+for i in strings.choke_heuristics strings.choke_heuristics.upload strings.choke_heuristics.download strings.connection_type strings.encryption.handshake strings.encryption.stream strings.ip_filter strings.ip_tos strings.log_group strings.tracker_event strings.tracker_mode; do
   echo
   echo $i
   echo `echo $i | tr 'a-z_.' '-'`

src/Makefile.am

@@ -174,8 +174,6 @@ libsub_root_a_SOURCES = \
 	utils/list_focus.h \
 	utils/lockfile.cc \
 	utils/lockfile.h \
-	utils/waitpid_queue.cc \
-	utils/waitpid_queue.h \
 	utils/watch_ready_queue.cc \
 	utils/watch_ready_queue.h \
 	\
@@ -190,11 +188,12 @@ libsub_root_a_SOURCES = \
 	command_local.cc \
 	command_logging.cc \
 	command_network.cc \
+	encryption_config.cc \
+	encryption_config.h \
 	command_peer.cc \
 	command_throttle.cc \
 	command_tracker.cc \
 	command_scheduler.cc \
-	command_string.cc \
 	command_ui.cc \
 	control.cc \
 	control.h \

src/command_download.cc

@@ -655,8 +655,6 @@ initialize_command_download() {
   CMD2_DL("d.base_path.as_binary",            [](auto* download, auto) { return retrieve_d_base_path(download).object_as_binary(); });
   CMD2_DL("d.base_path.or_base64",            [](auto* download, auto) { return retrieve_d_base_path(download).object_utf8_or_base64(); });
   CMD2_DL("d.base_path.or_as_binary",         [](auto* download, auto) { return retrieve_d_base_path(download).object_utf8_or_as_binary(); });
-  CMD2_DL("d.base_path.realpath.or_empty",    [](auto* download, auto) { return resolve_path(retrieve_d_base_path(download).str()); });
-  CMD2_DL("d.base_path.realpath.or_throw",    [](auto* download, auto) { return resolve_path_or_throw(retrieve_d_base_path(download).str()); });
   CMD2_DL("d.base_filename",                  [](auto* download, auto) { return retrieve_d_base_filename(download).str(); });
   CMD2_DL("d.base_filename.hex",              [](auto* download, auto) { return retrieve_d_base_filename(download).object_hex(); });
   CMD2_DL("d.base_filename.base64",           [](auto* download, auto) { return retrieve_d_base_filename(download).object_base64(); });
@@ -773,11 +771,6 @@ initialize_command_download() {
   CMD2_DL_VAR_STRING_PUBLIC("d.tied_to_file", "rtorrent", "tied_to_file");
   CMD2_DL_VAR_STRING("d.loaded_file",  "rtorrent", "loaded_file");
 
-  CMD2_DL("d.tied_to_file.realpath.or_empty", [](auto* download, auto) { return resolve_path(rpc::convert_to_string(download_get_variable(download, "rtorrent", "tied_to_file"))); });
-  CMD2_DL("d.tied_to_file.realpath.or_throw", [](auto* download, auto) { return resolve_path_or_throw(rpc::convert_to_string(download_get_variable(download, "rtorrent", "tied_to_file"))); });
-  CMD2_DL("d.loaded_file.realpath.or_empty",  [](auto* download, auto) { return resolve_path(rpc::convert_to_string(download_get_variable(download, "rtorrent", "loaded_file"))); });
-  CMD2_DL("d.loaded_file.realpath.or_throw",  [](auto* download, auto) { return resolve_path_or_throw(rpc::convert_to_string(download_get_variable(download, "rtorrent", "loaded_file"))); });
-
   // The "state_changed" variable is required to be a valid unix time
   // value, it indicates the last time the torrent changed its state,
   // resume/pause.
@@ -885,8 +878,6 @@ initialize_command_download() {
   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",      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));
@@ -921,14 +912,6 @@ initialize_command_download() {
   rpc::rpc.mark_safe("d.local_id_html");
   rpc::rpc.mark_safe("d.bitfield");
   rpc::rpc.mark_safe("d.base_path");
-  rpc::rpc.mark_safe("d.base_path.realpath.or_empty");
-  rpc::rpc.mark_safe("d.base_path.realpath.or_throw");
-  rpc::rpc.mark_safe("d.directory.realpath.or_empty");
-  rpc::rpc.mark_safe("d.directory.realpath.or_throw");
-  rpc::rpc.mark_safe("d.tied_to_file.realpath.or_empty");
-  rpc::rpc.mark_safe("d.tied_to_file.realpath.or_throw");
-  rpc::rpc.mark_safe("d.loaded_file.realpath.or_empty");
-  rpc::rpc.mark_safe("d.loaded_file.realpath.or_throw");
   rpc::rpc.mark_safe("d.base_path.hex");
   rpc::rpc.mark_safe("d.base_path.base64");
   rpc::rpc.mark_safe("d.base_path.base64_as_binary");
@@ -991,7 +974,6 @@ initialize_command_download() {
   rpc::rpc.mark_safe("d.size_pex");
   rpc::rpc.mark_safe("d.completed_bytes");
   rpc::rpc.mark_safe("d.complete");
-  rpc::rpc.mark_safe("d.timestamp.started");
   rpc::rpc.mark_safe("d.timestamp.finished");
   rpc::rpc.mark_safe("d.bytes_done");
   rpc::rpc.mark_safe("d.peers_accounted");

src/command_dynamic.cc

@@ -444,20 +444,17 @@ initialize_command_dynamic() {
 
   CMD2_ANY         ("catch", std::bind(&cmd_catch, std::placeholders::_1, std::placeholders::_2));
 
-  CMD2_ANY_STRING  ("enum.log_group",                    [](auto, const auto& str) { return torrent::option_find_string_str(torrent::OPTION_LOG_GROUP, str); });
+  CMD2_ANY         ("strings.choke_heuristics",          std::bind(&torrent::option_list_strings, torrent::OPTION_CHOKE_HEURISTICS));
-
+  CMD2_ANY         ("strings.choke_heuristics.upload",   std::bind(&torrent::option_list_strings, torrent::OPTION_CHOKE_HEURISTICS_UPLOAD));
-  CMD2_ANY         ("strings.choke_heuristics",          [](auto, auto) { return torrent::option_list_strings(torrent::OPTION_CHOKE_HEURISTICS); });
+  CMD2_ANY         ("strings.choke_heuristics.download", std::bind(&torrent::option_list_strings, torrent::OPTION_CHOKE_HEURISTICS_DOWNLOAD));
-  CMD2_ANY         ("strings.choke_heuristics.upload",   [](auto, auto) { return torrent::option_list_strings(torrent::OPTION_CHOKE_HEURISTICS_UPLOAD); });
+  CMD2_ANY         ("strings.connection_type",           std::bind(&torrent::option_list_strings, torrent::OPTION_CONNECTION_TYPE));
-  CMD2_ANY         ("strings.choke_heuristics.download", [](auto, auto) { return torrent::option_list_strings(torrent::OPTION_CHOKE_HEURISTICS_DOWNLOAD); });
+  CMD2_ANY         ("strings.encryption.handshake",      std::bind(&torrent::option_list_strings, torrent::OPTION_ENCRYPTION_MODE));
-  CMD2_ANY         ("strings.connection_type",           [](auto, auto) { return torrent::option_list_strings(torrent::OPTION_CONNECTION_TYPE); });
+  CMD2_ANY         ("strings.encryption.stream",         std::bind(&torrent::option_list_strings, torrent::OPTION_ENCRYPTION_MODE));
-  CMD2_ANY         ("strings.encryption",                [](auto, auto) { return torrent::Object::create_list(); });
+  CMD2_ANY         ("strings.ip_filter",                 std::bind(&torrent::option_list_strings, torrent::OPTION_IP_FILTER));
-  CMD2_ANY         ("strings.encryption.handshake",      [](auto, auto) { return torrent::option_list_strings(torrent::OPTION_ENCRYPTION_HANDSHAKE); });
+  CMD2_ANY         ("strings.ip_tos",                    std::bind(&torrent::option_list_strings, torrent::OPTION_IP_TOS));
-  CMD2_ANY         ("strings.encryption.stream",         [](auto, auto) { return torrent::option_list_strings(torrent::OPTION_ENCRYPTION_STREAM); });
+  CMD2_ANY         ("strings.log_group",                 std::bind(&torrent::option_list_strings, torrent::OPTION_LOG_GROUP));
-  CMD2_ANY         ("strings.ip_filter",                 [](auto, auto) { return torrent::option_list_strings(torrent::OPTION_IP_FILTER); });
+  CMD2_ANY         ("strings.tracker_event",             std::bind(&torrent::option_list_strings, torrent::OPTION_TRACKER_EVENT));
-  CMD2_ANY         ("strings.ip_tos",                    [](auto, auto) { return torrent::option_list_strings(torrent::OPTION_IP_TOS); });
+  CMD2_ANY         ("strings.tracker_mode",              std::bind(&torrent::option_list_strings, torrent::OPTION_TRACKER_MODE));
-  CMD2_ANY         ("strings.log_group",                 [](auto, auto) { return torrent::option_list_strings(torrent::OPTION_LOG_GROUP); });
-  CMD2_ANY         ("strings.tracker_event",             [](auto, auto) { return torrent::option_list_strings(torrent::OPTION_TRACKER_EVENT); });
-  CMD2_ANY         ("strings.tracker_mode",              [](auto, auto) { return torrent::option_list_strings(torrent::OPTION_TRACKER_MODE); });
   // clang-format on
 
 #ifdef HAVE_XMLRPC_TINYXML2
@@ -472,13 +469,12 @@ initialize_command_dynamic() {
   rpc::rpc.mark_safe("method.rlookup");
   rpc::rpc.mark_safe("catch");
 
-  rpc::rpc.mark_safe("enum.log_group");
-
   rpc::rpc.mark_safe("strings.choke_heuristics");
   rpc::rpc.mark_safe("strings.choke_heuristics.upload");
   rpc::rpc.mark_safe("strings.choke_heuristics.download");
   rpc::rpc.mark_safe("strings.connection_type");
-  rpc::rpc.mark_safe("strings.encryption");
+  rpc::rpc.mark_safe("strings.encryption.handshake");
+  rpc::rpc.mark_safe("strings.encryption.stream");
   rpc::rpc.mark_safe("strings.ip_filter");
   rpc::rpc.mark_safe("strings.ip_tos");
   rpc::rpc.mark_safe("strings.log_group");

src/command_file.cc

@@ -116,8 +116,6 @@ initialize_command_file() {
   CMD2_FILE("f.frozen_path.as_binary",            [](auto* file, auto)   { return file->frozen_path().object_as_binary(); });
   CMD2_FILE("f.frozen_path.or_base64",            [](auto* file, auto)   { return file->frozen_path().object_utf8_or_base64(); });
   CMD2_FILE("f.frozen_path.or_as_binary",         [](auto* file, auto)   { return file->frozen_path().object_utf8_or_as_binary(); });
-  CMD2_FILE("f.frozen_path.realpath.or_empty",    [](auto* file, auto)   { return resolve_path(file->frozen_path().str()); });
-  CMD2_FILE("f.frozen_path.realpath.or_throw",    [](auto* file, auto)   { return resolve_path_or_throw(file->frozen_path().str()); });
 
   CMD2_FILE("f.match_depth_prev",       std::bind(&torrent::File::match_depth_prev, std::placeholders::_1));
   CMD2_FILE("f.match_depth_next",       std::bind(&torrent::File::match_depth_next, std::placeholders::_1));
@@ -131,8 +129,6 @@ initialize_command_file() {
   rpc::rpc.mark_safe("f.path_components");
   rpc::rpc.mark_safe("f.path_depth");
   rpc::rpc.mark_safe("f.frozen_path");
-  rpc::rpc.mark_safe("f.frozen_path.realpath.or_empty");
-  rpc::rpc.mark_safe("f.frozen_path.realpath.or_throw");
   rpc::rpc.mark_safe("f.frozen_path.hex");
   rpc::rpc.mark_safe("f.frozen_path.base64");
   rpc::rpc.mark_safe("f.frozen_path.base64_as_binary");

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

@@ -19,7 +19,6 @@ void initialize_command_groups();
 void initialize_command_throttle();
 void initialize_command_tracker();
 void initialize_command_scheduler();
-void initialize_command_string();
 void initialize_command_ui();
 
 void
@@ -38,5 +37,4 @@ initialize_commands() {
   initialize_command_throttle();
   initialize_command_tracker();
   initialize_command_scheduler();
-  initialize_command_string();
 }

src/command_local.cc

@@ -117,7 +117,7 @@ group_insert(const torrent::Object::list_type& args) {
   rpc::commands.call("method.insert", rpc::create_object_list("group." + name + ".ratio.enable", "simple",
                                                               "schedule=group." + name + ".ratio,5,60,on_ratio=" + name));
   rpc::commands.call("method.insert", rpc::create_object_list("group." + name + ".ratio.disable", "simple",
-                                                              "schedule.remove=group." + name + ".ratio"));
+                                                              "schedule_remove=group." + name + ".ratio"));
   rpc::commands.call("method.insert", rpc::create_object_list("group."  + name + ".ratio.command", "simple",
                                                               "d.try_close= ;d.ignore_commands.set=1"));
   rpc::commands.call("method.insert", rpc::create_object_list("group." + name + ".view", "string", view));
@@ -190,6 +190,10 @@ initialize_command_local() {
   core::DownloadList*    dList = control->core()->download_list();
   torrent::FileManager*  fileManager = torrent::file_manager();
 
+  if (rpc::call_command_value("method.use_deprecated") == 1) {
+    CMD_ANY_LIST    ("file.append",    std::bind(&cmd_file_append, std::placeholders::_2));
+  }
+
   CMD_ANY         ("system.hostname", std::bind(&system_hostname));
   CMD_ANY         ("system.pid",      std::bind(&getpid));
 
@@ -243,8 +247,6 @@ initialize_command_local() {
   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);
@@ -252,16 +254,12 @@ initialize_command_local() {
 
     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); });
+    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); });
 
-    if (i == 0) {
+    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); });
   }
@@ -298,13 +296,9 @@ initialize_command_local() {
   CMD_VAR_BOOL    ("pieces.hash.on_completion",       true);
 
   CMD_VAR_STRING  ("directory.default",               "./");
-  CMD_ANY         ("directory.default.realpath.or_empty", [](auto, auto)    { return resolve_path(rpc::call_command_string("directory.default")); });
-  CMD_ANY         ("directory.default.realpath.or_throw", [](auto, auto)    { return resolve_path_or_throw(rpc::call_command_string("directory.default")); });
 
   CMD_VAR_STRING  ("session.name",                    "");
   CMD_ANY         ("session.path",                    [](auto, auto)        { return session_thread::manager()->path(); });
-  CMD_ANY         ("session.path.realpath.or_empty",  [](auto, auto)        { return resolve_path(session_thread::manager()->path()); });
-  CMD_ANY         ("session.path.realpath.or_throw",  [](auto, auto)        { return resolve_path_or_throw(session_thread::manager()->path()); });
   CMD_ANY_STRING_V("session.path.set",                [](auto, auto& str)   { return session_thread::manager()->set_path(str); });
   CMD_ANY         ("session.use_lock",                [](auto, auto)        { return session_thread::manager()->use_lock(); });
   CMD_ANY_VALUE_V ("session.use_lock.set",            [](auto, auto& value) { return session_thread::manager()->set_use_lock(value); });
@@ -358,32 +352,18 @@ initialize_command_local() {
 
   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");
-  rpc::rpc.mark_safe("session.path.realpath.or_throw");
-  rpc::rpc.mark_safe("directory.default.realpath.or_empty");
-  rpc::rpc.mark_safe("directory.default.realpath.or_throw");
   rpc::rpc.mark_safe("session.use_lock");
   rpc::rpc.mark_safe("session.on_completion");
 

src/command_logging.cc

@@ -1,7 +1,6 @@
 #include "config.h"
 
 #include <fcntl.h>
-#include <iterator>
 #include <stdio.h>
 #include <unistd.h>
 #include <torrent/data/chunk_utils.h>
@@ -16,7 +15,6 @@
 #include "core/download.h"
 #include "core/download_list.h"
 #include "core/manager.h"
-#include "rpc/parse.h"
 #include "rpc/parse_commands.h"
 
 torrent::Object
@@ -40,32 +38,6 @@ apply_log_add_output(const torrent::Object::list_type& args) {
   return torrent::Object();
 }
 
-torrent::Object
-apply_log_print(const torrent::Object::list_type& args) {
-  if (args.size() < 2)
-    throw torrent::input_error("Invalid number of arguments.");
-
-  torrent::Object::value_type group;
-
-  if (args.front().is_value())
-    group = args.front().as_value();
-  else if (args.front().is_string())
-    group = torrent::option_find_string_str(torrent::OPTION_LOG_GROUP, args.front().as_string());
-  else
-    throw torrent::input_error("Invalid log group.");
-
-  if (group < 0 || group >= torrent::LOG_GROUP_MAX_SIZE)
-    throw torrent::input_error("Invalid log group.");
-
-  std::string message;
-
-  for (auto itr = std::next(args.begin()); itr != args.end(); ++itr)
-    rpc::print_object_std(&message, &*itr, 0);
-
-  torrent::log_groups[group].internal_print(message);
-  return torrent::Object();
-}
-
 // TODO: Deprecated.
 torrent::Object
 apply_log(const torrent::Object::string_type& arg, int logType) {
@@ -140,7 +112,6 @@ initialize_command_logging() {
   CMD2_ANY_STRING_V("log.close",            std::bind(&torrent::log_close_output_str, std::placeholders::_2));
 
   CMD2_ANY_LIST    ("log.add_output",       std::bind(&apply_log_add_output, std::placeholders::_2));
-  CMD2_ANY_LIST    ("log.print",            std::bind(&apply_log_print, std::placeholders::_2));
 
   CMD2_ANY_STRING  ("log.execute",          std::bind(&apply_log, std::placeholders::_2, 0));
   CMD2_ANY_STRING  ("log.vmmap.dump",       std::bind(&log_vmmap_dump, std::placeholders::_2));

src/command_network.cc

@@ -19,6 +19,7 @@
 #include <torrent/utils/log.h>
 #include <torrent/utils/option_strings.h>
 
+#include "encryption_config.h"
 #include "globals.h"
 #include "control.h"
 #include "command_helpers.h"
@@ -34,118 +35,6 @@
 #include <systemd/sd-daemon.h>
 #endif
 
-torrent::Object
-listen_port_range() {
-  auto port_range = torrent::runtime::client_config()->listen_port_range();
-
-  return std::to_string(port_range.first) + "-" + std::to_string(port_range.second);
-}
-
-void
-set_listen_port_range(const std::string& arg) {
-  unsigned int port_first{}, port_last{};
-
-  if (std::sscanf(arg.c_str(), "%i-%i", &port_first, &port_last) != 2)
-    throw torrent::input_error("Invalid port_range argument.");
-
-  if (port_first >= (1 << 16) || port_last >= (1 << 16))
-    throw torrent::input_error("Port range out-of-bounds.");
-
-  torrent::runtime::client_config()->set_listen_port_range(port_first, port_last);
-}
-
-torrent::Object
-get_encryption() {
-  auto encryption_modes = torrent::runtime::network_config()->encryption_modes();
-
-  return torrent::option_to_str_or_throw(torrent::OPTION_ENCRYPTION_HANDSHAKE, encryption_modes.first) + "," +
-    torrent::option_to_str_or_throw(torrent::OPTION_ENCRYPTION_STREAM, encryption_modes.second);
-}
-
-torrent::Object
-get_handshake_encryption() {
-  auto encryption_modes = torrent::runtime::network_config()->encryption_modes();
-
-  return torrent::option_to_str_or_throw(torrent::OPTION_ENCRYPTION_MODE, encryption_modes.first);
-}
-
-torrent::Object
-get_stream_encryption() {
-  auto encryption_modes = torrent::runtime::network_config()->encryption_modes();
-
-  return torrent::option_to_str_or_throw(torrent::OPTION_ENCRYPTION_MODE, encryption_modes.second);
-}
-
-torrent::Object
-apply_obsolete_encryption(const torrent::Object::list_type& args) {
-  torrent::encryption_mode handshake_mode{torrent::ENCRYPTION_MODE_ALLOW};
-  torrent::encryption_mode stream_mode{torrent::ENCRYPTION_MODE_ALLOW};
-
-  for (auto& itr : args) {
-    auto arg = itr.as_string();
-
-    if (arg == "none") {
-      handshake_mode = torrent::ENCRYPTION_MODE_DENY;
-      stream_mode    = torrent::ENCRYPTION_MODE_DENY;
-      break;
-
-    } else if (arg == "allow_incoming") {
-    } else if (arg == "try_outgoing") {
-    } else if (arg == "require") {
-      handshake_mode = torrent::ENCRYPTION_MODE_REQUIRE;
-
-    } else if (arg == "require_RC4" || arg == "require_rc4") {
-      handshake_mode = torrent::ENCRYPTION_MODE_REQUIRE;
-      stream_mode    = torrent::ENCRYPTION_MODE_REQUIRE;
-      break;
-
-    } else if (arg == "enable_retry") {
-    } else if (arg == "prefer_plaintext") {
-    } else {
-      throw torrent::input_error("Invalid encryption option: '" + arg + "'");
-    }
-  }
-
-  lt_log_print(torrent::LOG_WARN, "Obsolete encryption options used, use 'handshake_{deny,allow,prefer,require}, stream_{deny,allow,prefer,require}' instead.");
-
-  torrent::runtime::network_config()->set_encryption_modes(handshake_mode, stream_mode);
-  return {};
-}
-
-torrent::Object
-apply_encryption(const torrent::Object::list_type& args) {
-  if (args.empty())
-    throw torrent::input_error("No encryption options specified.");
-
-  torrent::encryption_mode encryption_mode, handshake_mode, stream_mode;
-
-  if (args.size() == 1) {
-    try {
-      encryption_mode = static_cast<torrent::encryption_mode>(torrent::option_find_string_str(torrent::OPTION_ENCRYPTION_MODE, args.front().as_string()));
-
-    } catch (torrent::input_error& e) {
-      return apply_obsolete_encryption(args);
-    }
-
-    torrent::runtime::network_config()->set_encryption_modes(encryption_mode, encryption_mode);
-    return {};
-  }
-
-  if (args.size() != 2)
-    return apply_obsolete_encryption(args);
-
-  try {
-    handshake_mode = static_cast<torrent::encryption_mode>(torrent::option_find_string_str(torrent::OPTION_ENCRYPTION_HANDSHAKE, args.front().as_string()));
-    stream_mode    = static_cast<torrent::encryption_mode>(torrent::option_find_string_str(torrent::OPTION_ENCRYPTION_STREAM, args.back().as_string()));
-
-  } catch (torrent::input_error& e) {
-    return apply_obsolete_encryption(args);
-  }
-
-  torrent::runtime::network_config()->set_encryption_modes(handshake_mode, stream_mode);
-  return {};
-}
-
 torrent::Object
 apply_tos(const torrent::Object::string_type& arg) {
   rpc::command_base::value_type value;
@@ -325,13 +214,9 @@ initialize_command_network() {
   CMD_ANY         ("network.listen.backlog",         [](auto, auto)        { return torrent::runtime::network_config()->listen_backlog(); });
   CMD_ANY_VALUE_V ("network.listen.backlog.set",     [](auto, auto& value) { return torrent::runtime::network_config()->set_listen_backlog(value); });
 
-  CMD_ANY         ("protocol.pex",                   [](auto, auto)        { return torrent::runtime::client_config()->is_pex_enabled(); });
+  CMD_VAR_BOOL    ("protocol.pex",               true);
-  CMD_ANY_VALUE_V ("protocol.pex.set",               [](auto, auto& value) { return torrent::runtime::client_config()->set_pex_enabled(value); });
 
-  CMD_ANY_LIST    ("protocol.encryption",            [](auto, auto)        { return get_encryption(); });
+  encryption_config::initialize_commands();
-  CMD_ANY_LIST    ("protocol.encryption.set",        [](auto, auto& args)  { return apply_encryption(args); });
-  CMD_ANY_LIST    ("protocol.encryption.handshake",  [](auto, auto)        { return get_handshake_encryption(); });
-  CMD_ANY_LIST    ("protocol.encryption.stream",     [](auto, auto)        { return get_stream_encryption(); });
 
   CMD_VAR_STRING  ("protocol.connection.leech",            "leech");
   CMD_VAR_STRING  ("protocol.connection.seed",             "seed");
@@ -402,10 +287,8 @@ initialize_command_network() {
   CMD_ANY         ("network.xmlrpc.size_limit",              [](auto, auto)                  { return rpc::rpc.size_limit(); });
   CMD_ANY_VALUE_V ("network.xmlrpc.size_limit.set",          [](auto, auto& arg)             { return rpc::rpc.set_size_limit(arg); });
 
-  CMD_ANY         ("network.rpc.use_xmlrpc",                 [](auto, auto)                  { return rpc::rpc.use_xmlrpc(); });
+  CMD_VAR_BOOL    ("network.rpc.use_xmlrpc",                 true);
-  CMD_ANY_VALUE_V ("network.rpc.use_xmlrpc.set",             [](auto, auto& arg)             { return rpc::rpc.set_use_xmlrpc(arg); });
+  CMD_VAR_BOOL    ("network.rpc.use_jsonrpc",                true);
-  CMD_ANY         ("network.rpc.use_jsonrpc",                [](auto, auto)                  { return rpc::rpc.use_jsonrpc(); });
-  CMD_ANY_VALUE_V ("network.rpc.use_jsonrpc.set",            [](auto, auto& arg)             { return rpc::rpc.set_use_jsonrpc(arg); });
 
   CMD_ANY         ("network.block.ipv4",                     [nw_config](auto, auto)         { return nw_config->is_block_ipv4(); });
   CMD_ANY_VALUE_V ("network.block.ipv4.set",                 [nw_config](auto, auto& value)  { return nw_config->set_block_ipv4(value); });

src/command_string.cc

@@ -1,365 +0,0 @@
-#include "config.h"
-
-#include <algorithm>
-#include <cctype>
-#include <iterator>
-#include <set>
-#include <string>
-#include <utility>
-#include <vector>
-#include <torrent/exceptions.h>
-#include <torrent/object.h>
-
-#include "rpc/parse.h"
-#include "rpc/rpc_manager.h"
-
-#include "globals.h"
-#include "control.h"
-#include "command_helpers.h"
-
-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
-// past the last character. Bytes that are not valid utf-8 lead bytes are
-// treated as single characters.
-std::vector<size_t>
-utf8_offsets(const std::string& text) {
-  std::vector<size_t> offsets;
-
-  for (size_t i = 0; i < text.size(); i++)
-    if (i == 0 || (static_cast<unsigned char>(text[i]) & 0xC0) != 0x80)
-      offsets.push_back(i);
-
-  offsets.push_back(text.size());
-  return offsets;
-}
-
-int64_t
-utf8_length(const std::string& text) {
-  int64_t result = 0;
-
-  for (size_t i = 0; i < text.size(); i++)
-    if (i == 0 || (static_cast<unsigned char>(text[i]) & 0xC0) != 0x80)
-      result++;
-
-  return result;
-}
-
-std::string
-utf8_substr(const std::string& text, const std::vector<size_t>& offsets, size_t first, size_t last) {
-  return text.substr(offsets[first], offsets[last] - offsets[first]);
-}
-
-std::set<std::string>
-utf8_character_set(const std::string& text) {
-  auto offsets = utf8_offsets(text);
-  std::set<std::string> result;
-
-  for (size_t i = 0; i + 1 < offsets.size(); i++)
-    result.insert(utf8_substr(text, offsets, i, i + 1));
-
-  return result;
-}
-
-std::string
-ascii_lowercase(std::string text) {
-  std::transform(text.begin(), text.end(), text.begin(), [](unsigned char c) { return std::tolower(c); });
-  return text;
-}
-
-// A 'max_count' of zero means the command accepts any number of arguments.
-void
-verify_argument_count(const char* name, const torrent::Object::list_type& args, size_t min_count, size_t max_count) {
-  if (args.size() < min_count || (max_count != 0 && args.size() > max_count))
-    throw torrent::input_error(std::string(name) + ": invalid number of arguments.");
-}
-
-const torrent::Object&
-argument_at(const torrent::Object::list_type& args, size_t index) {
-  return *std::next(args.begin(), index);
-}
-
-void
-flatten_argument(const torrent::Object& arg, std::vector<std::string>* dest) {
-  if (!arg.is_list()) {
-    dest->push_back(rpc::convert_to_string(arg));
-    return;
-  }
-
-  for (const auto& child : arg.as_list())
-    flatten_argument(child, dest);
-}
-
-// The {old, new} pairs shared by 'string.map' and 'string.replace'.
-std::pair<std::string, std::string>
-argument_to_pair(const char* name, const torrent::Object& arg) {
-  if (!arg.is_list() || arg.as_list().size() != 2)
-    throw torrent::input_error(std::string(name) + ": arguments after the text must be {old, new} pairs.");
-
-  return {rpc::convert_to_string(arg.as_list().front()), rpc::convert_to_string(arg.as_list().back())};
-}
-
-// Compares the first argument against every remaining argument, returning true
-// as soon as one of them matches.
-torrent::Object
-apply_string_predicate(const char* name, const torrent::Object::list_type& args, bool (*predicate)(const std::string&, const std::string&)) {
-  verify_argument_count(name, args, 2, 0);
-
-  auto text = rpc::convert_to_string(args.front());
-
-  for (auto itr = std::next(args.begin()); itr != args.end(); itr++)
-    if (predicate(text, rpc::convert_to_string(*itr)))
-      return int64_t(1);
-
-  return int64_t(0);
-}
-
-bool
-text_equals(const std::string& text, const std::string& other) {
-  return text == other;
-}
-
-bool
-text_starts_with(const std::string& text, const std::string& prefix) {
-  return text.size() >= prefix.size() && text.compare(0, prefix.size(), prefix) == 0;
-}
-
-bool
-text_ends_with(const std::string& text, const std::string& tail) {
-  return text.size() >= tail.size() && text.compare(text.size() - tail.size(), tail.size(), tail) == 0;
-}
-
-bool
-text_contains(const std::string& text, const std::string& needle) {
-  return text.find(needle) != std::string::npos;
-}
-
-bool
-text_contains_i(const std::string& text, const std::string& needle) {
-  return ascii_lowercase(text).find(ascii_lowercase(needle)) != std::string::npos;
-}
-
-torrent::Object
-apply_string_length(const torrent::Object::list_type& args) {
-  verify_argument_count("string.length", args, 1, 1);
-
-  return utf8_length(rpc::convert_to_string(args.front()));
-}
-
-torrent::Object
-apply_string_substr(const torrent::Object::list_type& args) {
-  verify_argument_count("string.substr", args, 1, 4);
-
-  auto text        = rpc::convert_to_string(args.front());
-  auto offsets     = utf8_offsets(text);
-  auto text_length = static_cast<int64_t>(offsets.size() - 1);
-
-  auto position = args.size() > 1 ? rpc::convert_to_value(argument_at(args, 1)) : 0;
-  auto fallback = args.size() > 3 ? rpc::convert_to_string(argument_at(args, 3)) : std::string();
-
-  // Negative positions are relative to the end of the string.
-  if (position < 0)
-    position += text_length;
-
-  if (position < 0 || position > text_length)
-    return fallback;
-
-  auto last = text_length;
-
-  if (args.size() > 2) {
-    auto count = rpc::convert_to_value(argument_at(args, 2));
-
-    if (count < 0)
-      throw torrent::input_error("string.substr: the character count cannot be negative.");
-
-    last = std::min(text_length, position + std::min(count, text_length));
-  }
-
-  return utf8_substr(text, offsets, position, last);
-}
-
-torrent::Object
-apply_string_split(const torrent::Object::list_type& args) {
-  verify_argument_count("string.split", args, 2, 2);
-
-  auto text   = rpc::convert_to_string(args.front());
-  auto delim  = rpc::convert_to_string(args.back());
-  auto result = torrent::Object::create_list();
-
-  // An empty delimiter splits the text into its utf-8 characters.
-  if (delim.empty()) {
-    auto offsets = utf8_offsets(text);
-
-    for (size_t i = 0; i + 1 < offsets.size(); i++)
-      result.as_list().push_back(utf8_substr(text, offsets, i, i + 1));
-
-    return result;
-  }
-
-  size_t first = 0;
-
-  while (true) {
-    auto pos = text.find(delim, first);
-
-    if (pos == std::string::npos) {
-      result.as_list().push_back(text.substr(first));
-      return result;
-    }
-
-    result.as_list().push_back(text.substr(first, pos - first));
-    first = pos + delim.size();
-  }
-}
-
-torrent::Object
-apply_string_join(const torrent::Object::list_type& args) {
-  verify_argument_count("string.join", args, 1, 0);
-
-  auto delim = rpc::convert_to_string(args.front());
-
-  std::vector<std::string> parts;
-
-  for (auto itr = std::next(args.begin()); itr != args.end(); itr++)
-    flatten_argument(*itr, &parts);
-
-  std::string result;
-
-  for (auto itr = parts.begin(); itr != parts.end(); itr++) {
-    if (itr != parts.begin())
-      result += delim;
-
-    result += *itr;
-  }
-
-  return result;
-}
-
-torrent::Object
-apply_string_pad(const char* name, const torrent::Object::list_type& args, bool pad_start) {
-  verify_argument_count(name, args, 2, 3);
-
-  auto text     = rpc::convert_to_string(args.front());
-  auto pad_size = rpc::convert_to_value(argument_at(args, 1));
-  auto padding  = args.size() > 2 ? rpc::convert_to_string(argument_at(args, 2)) : std::string(" ");
-
-  auto text_length = utf8_length(text);
-
-  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);
-    result += utf8_substr(padding, padding_offsets, index, index + 1);
-  }
-
-  return pad_start ? result + text : text + result;
-}
-
-torrent::Object
-apply_string_strip(const char* name, const torrent::Object::list_type& args, bool strip_start, bool strip_end) {
-  verify_argument_count(name, args, 1, 0);
-
-  auto text = rpc::convert_to_string(args.front());
-
-  std::string strippable;
-
-  for (auto itr = std::next(args.begin()); itr != args.end(); itr++)
-    strippable += rpc::convert_to_string(*itr);
-
-  if (args.size() == 1)
-    strippable = whitespace_characters;
-
-  auto characters = utf8_character_set(strippable);
-  auto offsets    = utf8_offsets(text);
-
-  size_t first = 0;
-  size_t last  = offsets.size() - 1;
-
-  while (strip_start && first < last && characters.count(utf8_substr(text, offsets, first, first + 1)) != 0)
-    first++;
-
-  while (strip_end && last > first && characters.count(utf8_substr(text, offsets, last - 1, last)) != 0)
-    last--;
-
-  return utf8_substr(text, offsets, first, last);
-}
-
-torrent::Object
-apply_string_map(const torrent::Object::list_type& args) {
-  verify_argument_count("string.map", args, 2, 0);
-
-  auto text = rpc::convert_to_string(args.front());
-
-  for (auto itr = std::next(args.begin()); itr != args.end(); itr++) {
-    auto pair = argument_to_pair("string.map", *itr);
-
-    if (text == pair.first)
-      return pair.second;
-  }
-
-  return text;
-}
-
-torrent::Object
-apply_string_replace(const torrent::Object::list_type& args) {
-  verify_argument_count("string.replace", args, 2, 0);
-
-  auto text = rpc::convert_to_string(args.front());
-
-  for (auto itr = std::next(args.begin()); itr != args.end(); itr++) {
-    auto pair = argument_to_pair("string.replace", *itr);
-
-    if (pair.first.empty())
-      throw torrent::input_error("string.replace: the replaced text cannot be empty.");
-
-    for (auto pos = text.find(pair.first); pos != std::string::npos; pos = text.find(pair.first, pos + pair.second.size()))
-      text.replace(pos, pair.first.size(), pair.second);
-  }
-
-  return text;
-}
-
-}
-
-void
-initialize_command_string() {
-  // clang-format off
-  CMD2_ANY_LIST("string.length",        [](auto, const auto& args) { return apply_string_length(args); });
-  CMD2_ANY_LIST("string.substr",     [](auto, const auto& args) { return apply_string_substr(args); });
-  CMD2_ANY_LIST("string.split",      [](auto, const auto& args) { return apply_string_split(args); });
-  CMD2_ANY_LIST("string.join",       [](auto, const auto& args) { return apply_string_join(args); });
-  CMD2_ANY_LIST("string.map",        [](auto, const auto& args) { return apply_string_map(args); });
-  CMD2_ANY_LIST("string.replace",    [](auto, const auto& args) { return apply_string_replace(args); });
-
-  CMD2_ANY_LIST("string.equals",     [](auto, const auto& args) { return apply_string_predicate("string.equals", args, &text_equals); });
-  CMD2_ANY_LIST("string.starts_with", [](auto, const auto& args) { return apply_string_predicate("string.starts_with", args, &text_starts_with); });
-  CMD2_ANY_LIST("string.ends_with",   [](auto, const auto& args) { return apply_string_predicate("string.ends_with", args, &text_ends_with); });
-  CMD2_ANY_LIST("string.contains",   [](auto, const auto& args) { return apply_string_predicate("string.contains", args, &text_contains); });
-  CMD2_ANY_LIST("string.contains_i", [](auto, const auto& args) { return apply_string_predicate("string.contains_i", args, &text_contains_i); });
-
-  CMD2_ANY_LIST("string.lpad",       [](auto, const auto& args) { return apply_string_pad("string.lpad", args, true); });
-  CMD2_ANY_LIST("string.rpad",       [](auto, const auto& args) { return apply_string_pad("string.rpad", args, false); });
-
-  CMD2_ANY_LIST("string.strip",      [](auto, const auto& args) { return apply_string_strip("string.strip", args, true, true); });
-  CMD2_ANY_LIST("string.lstrip",     [](auto, const auto& args) { return apply_string_strip("string.lstrip", args, true, false); });
-  CMD2_ANY_LIST("string.rstrip",     [](auto, const auto& args) { return apply_string_strip("string.rstrip", args, false, true); });
-  // clang-format on
-
-  for (const auto name : {"string.length", "string.substr", "string.split", "string.join", "string.map", "string.replace",
-                          "string.equals", "string.starts_with", "string.ends_with", "string.contains", "string.contains_i",
-                          "string.lpad", "string.rpad", "string.strip", "string.lstrip", "string.rstrip"})
-    rpc::rpc.mark_safe(name);
-}

src/control.h

@@ -6,7 +6,7 @@
 #include <memory>
 #include <sys/types.h>
 #include <torrent/torrent.h>
-#include <torrent/system/scheduler.h>
+#include <torrent/utils/scheduler.h>
 
 namespace ui {
   class Root;
@@ -107,8 +107,8 @@ private:
   mode_t              m_umask;
   std::string         m_workingDirectory;
 
-  torrent::system::SchedulerEntry m_task_shutdown;
+  torrent::utils::SchedulerEntry m_task_shutdown;
-  torrent::system::SchedulerEntry m_task_shutdown_clear_requests;
+  torrent::utils::SchedulerEntry m_task_shutdown_clear_requests;
 
   int                 m_clear_requests_count{};
 

src/core/dht_manager.h

@@ -2,7 +2,7 @@
 #define RTORRENT_CORE_DHT_MANAGER_H
 
 #include <torrent/object.h>
-#include <torrent/system/scheduler.h>
+#include <torrent/utils/scheduler.h>
 
 namespace core {
 
@@ -42,8 +42,8 @@ private:
   uint64_t            m_dhtPrevBytesUp;
   uint64_t            m_dhtPrevBytesDown;
 
-  torrent::system::SchedulerEntry m_update_timeout;
+  torrent::utils::SchedulerEntry m_update_timeout;
-  torrent::system::SchedulerEntry m_stop_timeout;
+  torrent::utils::SchedulerEntry m_stop_timeout;
 
   bool                m_warned{};
   bool                m_set_by_user{};

src/core/download_factory.cc

@@ -15,7 +15,6 @@
 #include <torrent/rate.h>
 #include <torrent/data/file_utils.h>
 #include <torrent/net/http_stack.h>
-#include <torrent/runtime/client_config.h>
 #include <torrent/utils/string_manip.h>
 
 #include "control.h"
@@ -35,10 +34,8 @@ is_network_uri(const std::string& uri) {
     std::strncmp(uri.c_str(), "ftp://", 6) == 0;
 }
 
-static constexpr const char* session_invalid_message = "Session data is invalid, ignoring it";
-
 static std::unique_ptr<torrent::Object>
-download_factory_load_stream(const char* filename, bool* is_invalid) {
+download_factory_load_stream(const char* filename) {
   std::fstream stream(filename, std::ios::in | std::ios::binary);
 
   if (!stream.is_open())
@@ -47,10 +44,8 @@ download_factory_load_stream(const char* filename, bool* is_invalid) {
   auto obj = std::make_unique<torrent::Object>();
   stream >> *obj;
 
-  if (!stream.good() || !obj->is_map()) {
+  if (!stream.good())
-    *is_invalid = true;
     return std::unique_ptr<torrent::Object>();
-  }
 
   return obj;
 }
@@ -165,13 +160,8 @@ DownloadFactory::receive_commit() {
 
 void
 DownloadFactory::receive_success() {
-  bool session_invalid = false;
+  auto rtorrent_object          = download_factory_load_stream((expand_path(m_uri) + ".rtorrent").c_str());
-
+  auto libtorrent_resume_object = download_factory_load_stream((expand_path(m_uri) + ".libtorrent_resume").c_str());
-  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 (session_invalid)
-    lt_log_print(torrent::LOG_ERROR, "%s: %s", session_invalid_message, m_uri.c_str());
 
   uint32_t tracker_key;
 
@@ -193,14 +183,6 @@ DownloadFactory::receive_success() {
     return;
   }
 
-  if (session_invalid) {
-    download->set_hash_failed(true);
-    download->set_message(session_invalid_message);
-
-    if (m_printLog)
-      m_manager->push_log_std(std::string(session_invalid_message) + ": \"" + m_uri + "\"");
-  }
-
   torrent::Object* root = download->bencode();
 
   if (download->download()->info()->is_meta_download()) {
@@ -289,24 +271,11 @@ DownloadFactory::receive_success() {
   if (!m_session && m_variables["tied_to_file"].as_value())
     rpc::call_command("d.tied_to_file.set", m_uri.empty() ? m_variables["tied_file"] : m_uri, rpc::make_target(download));
 
-  rpc::call_command("d.peer_exchange.set", torrent::runtime::client_config()->is_pex_enabled(), rpc::make_target(download));
+  rpc::call_command("d.peer_exchange.set", rpc::call_command_value("protocol.pex"), rpc::make_target(download));
 
-  try {
+  torrent::resume_load_addresses(*download->download(), resumeObject);
-    torrent::resume_load_addresses(*download->download(), resumeObject);
+  torrent::resume_load_file_priorities(*download->download(), resumeObject);
-    torrent::resume_load_file_priorities(*download->download(), resumeObject);
+  torrent::resume_load_tracker_settings(*download->download(), resumeObject);
-    torrent::resume_load_tracker_settings(*download->download(), resumeObject);
-
-  } catch (const torrent::input_error& e) {
-    std::string msg = std::string(session_invalid_message) + ": " + e.what();
-
-    lt_log_print(torrent::LOG_ERROR, "%s: %s", msg.c_str(), m_uri.c_str());
-
-    if (m_printLog)
-      m_manager->push_log_std(msg + ": \"" + m_uri + "\"");
-
-    download->set_hash_failed(true);
-    download->set_message(msg);
-  }
 
   // The action of inserting might cause the torrent to be
   // opened/started or such. Figure out a nicer way of handling this.

src/core/download_factory.h

@@ -9,7 +9,7 @@
 #include <iosfwd>
 
 #include <torrent/object.h>
-#include <torrent/system/scheduler.h>
+#include <torrent/utils/scheduler.h>
 
 #include "http_queue.h"
 
@@ -79,9 +79,9 @@ private:
   command_list_type         m_commands;
   torrent::Object::map_type m_variables;
 
-  slot_void                       m_slot_finished;
+  slot_void                      m_slot_finished;
-  torrent::system::SchedulerEntry m_task_load;
+  torrent::utils::SchedulerEntry m_task_load;
-  torrent::system::SchedulerEntry m_task_commit;
+  torrent::utils::SchedulerEntry m_task_commit;
 };
 
 bool is_network_uri(const std::string& uri);

src/core/view.h

@@ -18,7 +18,7 @@
 #include <string>
 #include <vector>
 #include <torrent/object.h>
-#include <torrent/system/scheduler.h>
+#include <torrent/utils/scheduler.h>
 
 #include "globals.h"
 
@@ -153,8 +153,8 @@ private:
 
   std::chrono::microseconds m_last_changed{};
 
-  signal_void                     m_signal_changed;
+  signal_void                    m_signal_changed;
-  torrent::system::SchedulerEntry m_delay_changed;
+  torrent::utils::SchedulerEntry m_delay_changed;
 };
 
 } // namespace core

src/display/manager.h

@@ -1,7 +1,7 @@
 #ifndef RTORRENT_DISPLAY_MANAGER_H
 #define RTORRENT_DISPLAY_MANAGER_H
 
-#include <torrent/system/scheduler.h>
+#include <torrent/utils/scheduler.h>
 
 #include "display/frame.h"
 
@@ -31,9 +31,9 @@ private:
   bool                m_force_redraw{false};
   Frame               m_root_frame;
 
-  std::chrono::microseconds          m_time_last_update{};
+  std::chrono::microseconds         m_time_last_update{};
-  torrent::system::ExternalScheduler m_scheduler;
+  torrent::utils::ExternalScheduler m_scheduler;
-  torrent::system::SchedulerEntry    m_task_update;
+  torrent::utils::SchedulerEntry    m_task_update;
 };
 
 }

src/display/utils.cc

@@ -345,7 +345,7 @@ print_status_info(char* first, char* last) {
   if (!torrent::up_throttle_global()->is_throttled()) {
     first = print_buffer(first, last, "[Throttle off");
   } else {
-    first = print_buffer(first, last, "[Throttle %3i", (int)(torrent::up_throttle_global()->max_rate() / 1024));
+    first = print_buffer(first, last, "[Throttle %3i", torrent::up_throttle_global()->max_rate() / 1024);
 
     if (!throttle_up_names.empty())
       first = print_status_throttle_limit(first, last, true, throttle_up_names);
@@ -354,7 +354,7 @@ print_status_info(char* first, char* last) {
   if (!torrent::down_throttle_global()->is_throttled()) {
     first = print_buffer(first, last, " / off KB]");
   } else {
-    first = print_buffer(first, last, " / %3i", (int)(torrent::down_throttle_global()->max_rate() / 1024));
+    first = print_buffer(first, last, " / %3i", torrent::down_throttle_global()->max_rate() / 1024);
 
     if (!throttle_down_names.empty())
       first = print_status_throttle_limit(first, last, false, throttle_down_names);

src/display/window.h

@@ -2,7 +2,7 @@
 #define RTORRENT_WINDOW_BASE_H
 
 #include <functional>
-#include <torrent/system/scheduler.h>
+#include <torrent/utils/scheduler.h>
 #include <torrent/system/thread.h>
 
 #include "canvas.h"
@@ -99,7 +99,7 @@ protected:
   extent_type         m_max_width;
   extent_type         m_max_height;
 
-  torrent::system::SchedulerEntry m_task_update;
+  torrent::utils::SchedulerEntry m_task_update;
 };
 
 // Return a range with a distance of no more than __distance and

src/display/window_http_queue.h

@@ -47,7 +47,7 @@ private:
   signal_curl_get::iterator m_conn_insert;
   signal_curl_get::iterator m_conn_erase;
 
-  torrent::system::SchedulerEntry m_task_deactivate;
+  torrent::utils::SchedulerEntry m_task_deactivate;
 };
 
 }

src/display/window_log.h

@@ -1,8 +1,8 @@
 #ifndef RTORRENT_DISPLAY_WINDOW_LOG_H
 #define RTORRENT_DISPLAY_WINDOW_LOG_H
 
-#include <torrent/system/scheduler.h>
 #include <torrent/utils/log_buffer.h>
+#include <torrent/utils/scheduler.h>
 
 #include "window.h"
 
@@ -22,12 +22,10 @@ public:
 private:
   inline iterator     find_older();
 
-  torrent::log_buffer*            m_log;
+  torrent::log_buffer*           m_log;
-  torrent::system::SchedulerEntry m_task_update;
+  torrent::utils::SchedulerEntry m_task_update;
 
-  align_cacheline
+  align_cacheline std::atomic<bool> m_log_updating{};
-
-  std::atomic<bool>   m_log_updating{};
 };
 
 }

src/display/window_peer_list.cc

@@ -16,6 +16,21 @@
 
 namespace display {
 
+namespace {
+
+char
+connection_type_char(const torrent::Peer* p) {
+  if (p->is_encrypted())
+    return p->is_incoming() ? 'R' : 'L';
+
+  if (p->is_obfuscated())
+    return p->is_incoming() ? 'H' : 'h';
+
+  return p->is_incoming() ? 'r' : 'l';
+}
+
+} // namespace
+
 WindowPeerList::WindowPeerList(core::Download* d, PList* l, PList::iterator* f) :
   Window(new Canvas, 0, 0, 0, extent_full, extent_full),
   m_download(d),
@@ -35,6 +50,7 @@ WindowPeerList::redraw() {
   m_canvas->print(x, y, "UP");      x += 7;
   m_canvas->print(x, y, "DOWN");    x += 7;
   m_canvas->print(x, y, "PEER");    x += 7;
+  // CT: R/H/r or L/h/l (RC4 / handshake-only / plain) + peer type (u/p/ )
   m_canvas->print(x, y, "CT/RE/LO"); x += 10;
   m_canvas->print(x, y, "QS");      x += 6;
   m_canvas->print(x, y, "DONE");    x += 6;
@@ -95,7 +111,7 @@ WindowPeerList::redraw() {
       peerType = ' ';
 
     m_canvas->print(x, y, "%c%c/%c%c/%c%c",
-                    p->is_encrypted() ? (p->is_incoming() ? 'R' : 'L') : (p->is_incoming() ? 'r' : 'l'),
+                    connection_type_char(p),
                     peerType,
                     p->is_down_choked() ? std::tolower(remoteChoked) : remoteChoked,
 

src/encryption_config.cc

@@ -0,0 +1,88 @@
+#include "config.h"
+
+#include "encryption_config.h"
+
+#include <torrent/runtime/network_config.h>
+#include <torrent/runtime/runtime.h>
+#include <torrent/utils/option_strings.h>
+
+#include "command_helpers.h"
+#include "globals.h"
+
+namespace encryption_config {
+namespace {
+
+Policy
+current_policy() {
+  return torrent::runtime::network_config()->encryption_policy();
+}
+
+} // namespace
+
+Policy
+default_policy() {
+  Policy policy;
+  policy.handshake = Policy::Mode::allow;
+  policy.stream    = Policy::Mode::allow;
+  return policy;
+}
+
+std::string
+mode_to_string(Policy::Mode value) {
+  return torrent::option_to_str_or_throw(torrent::OPTION_ENCRYPTION_MODE,
+                                         static_cast<unsigned int>(value));
+}
+
+void
+apply_mode_value(Policy& policy, Policy::Mode Policy::*field, const std::string& value) {
+  policy.*field = static_cast<Policy::Mode>(
+    torrent::option_find_string_str(torrent::OPTION_ENCRYPTION_MODE, value));
+}
+
+std::string
+summary_string(const Policy& policy) {
+  return "handshake=" + mode_to_string(policy.handshake)
+       + " stream=" + mode_to_string(policy.stream);
+}
+
+void
+apply_policy(const Policy& policy) {
+  torrent::runtime::network_config()->set_encryption_policy(policy);
+}
+
+torrent::Object
+apply_handshake_set(const std::string& value) {
+  Policy policy = current_policy();
+  apply_mode_value(policy, &Policy::handshake, value);
+  apply_policy(policy);
+  return torrent::Object();
+}
+
+torrent::Object
+apply_stream_set(const std::string& value) {
+  Policy policy = current_policy();
+  apply_mode_value(policy, &Policy::stream, value);
+  apply_policy(policy);
+  return torrent::Object();
+}
+
+void
+initialize_commands() {
+  apply_policy(default_policy());
+
+  CMD2_ANY("protocol.encryption", [](auto, auto) { return summary_string(current_policy()); });
+
+  CMD2_ANY("protocol.encryption.handshake", [](auto, auto) { return mode_to_string(current_policy().handshake); });
+  CMD2_ANY_STRING_V("protocol.encryption.handshake.set", [](auto, auto& str) { return apply_handshake_set(str); });
+
+  CMD2_ANY("protocol.encryption.stream", [](auto, auto) { return mode_to_string(current_policy().stream); });
+  CMD2_ANY_STRING_V("protocol.encryption.stream.set", [](auto, auto& str) { return apply_stream_set(str); });
+
+  rpc::rpc.mark_safe("protocol.encryption");
+  rpc::rpc.mark_safe("protocol.encryption.handshake");
+  rpc::rpc.mark_safe("protocol.encryption.handshake.set");
+  rpc::rpc.mark_safe("protocol.encryption.stream");
+  rpc::rpc.mark_safe("protocol.encryption.stream.set");
+}
+
+} // namespace encryption_config

src/encryption_config.h

@@ -0,0 +1,29 @@
+#ifndef RTORRENT_ENCRYPTION_CONFIG_H
+#define RTORRENT_ENCRYPTION_CONFIG_H
+
+#include <cstdint>
+#include <string>
+
+#include <torrent/runtime/encryption_policy.h>
+#include <torrent/object.h>
+
+namespace encryption_config {
+
+using Policy = torrent::EncryptionPolicy;
+
+Policy              default_policy();
+
+std::string         mode_to_string(Policy::Mode value);
+void                apply_mode_value(Policy& policy, Policy::Mode Policy::*field, const std::string& value);
+
+std::string         summary_string(const Policy& policy);
+
+void                apply_policy(const Policy& policy);
+torrent::Object     apply_handshake_set(const std::string& value);
+torrent::Object     apply_stream_set(const std::string& value);
+
+void                initialize_commands();
+
+} // namespace encryption_config
+
+#endif

src/globals.cc

@@ -3,7 +3,6 @@
 #include "globals.h"
 
 #include <cstdlib>
-#include <stdlib.h>
 #include <torrent/exceptions.h>
 
 rpc::ip_table_list ip_tables;
@@ -29,32 +28,3 @@ expand_path(const std::string& path) {
 
   return path;
 }
-
-// Resolves a path to a canonical one with no symlinks or relative components,
-// so it can safely be handed to an external script. Returns an empty string if
-// the path does not name an existing file or directory.
-std::string
-resolve_path(const std::string& path) {
-  if (path.empty())
-    return std::string();
-
-  char* resolved = ::realpath(expand_path(path).c_str(), nullptr);
-
-  if (resolved == nullptr)
-    return std::string();
-
-  std::string result(resolved);
-  std::free(resolved);
-
-  return result;
-}
-
-std::string
-resolve_path_or_throw(const std::string& path) {
-  auto result = resolve_path(path);
-
-  if (result.empty())
-    throw torrent::input_error("Could not resolve path: '" + path + "'.");
-
-  return result;
-}

src/globals.h

@@ -11,8 +11,6 @@ extern rpc::ip_table_list ip_tables;
 extern Control*           control;
 
 std::string expand_path(const std::string& path);
-std::string resolve_path(const std::string& path);
-std::string resolve_path_or_throw(const std::string& path);
 
 namespace rpc {
 class SCgi;

src/input/input_event.h

@@ -2,11 +2,12 @@
 #define RTORRENT_INPUT_INPUT_EVENT_H
 
 #include <functional>
-#include <torrent/system/event.h>
+
+#include <torrent/event.h>
 
 namespace input {
 
-class InputEvent : public torrent::system::Event {
+class InputEvent : public torrent::Event {
 public:
   typedef std::function<void (int)> slot_int;
 

src/main.cc

@@ -301,6 +301,9 @@ main(int argc, char** argv) {
        "schedule = low_diskspace,5,60,((close_low_diskspace,500M))\n"
        "schedule = prune_file_status,3600,86400,((system.file_status_cache.prune))\n"
 
+       "protocol.encryption.handshake.set=allow\n"
+       "protocol.encryption.stream.set=allow\n"
+
        "ui.color.focus.set=reverse\n"
     );
 
@@ -319,8 +322,6 @@ main(int argc, char** argv) {
     CMD_REDIRECT("ratio.max.set",         "group.seeding.ratio.max.set");
     CMD_REDIRECT("ratio.upload.set",      "group.seeding.ratio.upload.set");
 
-    CMD_REDIRECT("encryption",            "protocol.encryption.set");
-
     CMD_REDIRECT("check_hash",            "pieces.hash.on_completion.set");
 
     CMD_REDIRECT("connection_leech",      "protocol.connection.leech.set");
@@ -344,9 +345,8 @@ main(int argc, char** argv) {
     CMD_REDIRECT("directory",             "directory.default.set");
     CMD_REDIRECT("session",               "session.path.set");
 
-    CMD_REDIRECT_NO_EXPORT("port_range",  "network.listen.port.range.set");
+    CMD_REDIRECT("scgi_port",             "network.scgi.open_port");
-    CMD_REDIRECT_NO_EXPORT("scgi_port",   "network.scgi.open_port");
+    CMD_REDIRECT("scgi_local",            "network.scgi.open_local");
-    CMD_REDIRECT_NO_EXPORT("scgi_local",  "network.scgi.open_local");
 
     CMD_REDIRECT("to_gm_time",            "convert.gm_time");
     CMD_REDIRECT("to_gm_date",            "convert.gm_date");
@@ -390,14 +390,17 @@ main(int argc, char** argv) {
       CMD_REDIRECT("schedule2",        "schedule");
       CMD_REDIRECT("schedule_remove2", "schedule.remove");
 
+      // TODO: Remove file.append when cleaning these up.
+
       CMD_REDIRECT("bind",                  "network.bind_address.set");
       CMD_REDIRECT("ip",                    "network.local_address.set");
+      CMD_REDIRECT("port_range",            "network.port_range.set");
 
       // TODO: Check if dht is on by default.
       CMD_REDIRECT("dht",                   "dht.mode.set");
 
-      CMD_REDIRECT("port_random",           "network.listen.port.random.set");
+      CMD_REDIRECT("port_random",           "network.port_random.set");
-      CMD_REDIRECT("proxy_address",         "network.proxy.http.set");
+      CMD_REDIRECT("proxy_address",         "network.proxy_address.set");
 
       CMD_REDIRECT("key_layout",            "keys.layout.set");
 

src/rpc/command_scheduler_item.h

@@ -5,7 +5,7 @@
 
 #include <functional>
 #include <torrent/object.h>
-#include <torrent/system/scheduler.h>
+#include <torrent/utils/scheduler.h>
 
 namespace rpc {
 
@@ -43,7 +43,7 @@ private:
   uint32_t                  m_interval{};
   std::chrono::microseconds m_time_scheduled;
 
-  torrent::system::SchedulerEntry m_task;
+  torrent::utils::SchedulerEntry m_task;
 
   // Flags for various things.
 };

src/rpc/exec_file.cc

@@ -1,22 +1,23 @@
 #include "config.h"
 
-#include "rpc/exec_file.h"
+#include <cassert>
-
+#include <cerrno>
-// #include <cassert>
+#include <cstring>
-// #include <cerrno>
+#include <fcntl.h>
-// #include <cstring>
+#include <spawn.h>
-// #include <fcntl.h>
+#include <string>
-// #include <spawn.h>
-// #include <string>
 #include <unistd.h>
-// #include <sys/types.h>
+#include <sys/types.h>
-#include <sys/uio.h>
+#include <sys/wait.h>
-// #include <torrent/net/fd.h>
+#include <torrent/net/fd.h>
 #include <torrent/system/thread.h>
-#include <torrent/system/spawn_process.h>
 #include <torrent/system/types.h>
 
-#include "rpc/parse.h"
+#include "exec_file.h"
+#include "parse.h"
+
+// Standard POSIX environment pointer
+extern char** environ;
 
 namespace rpc {
 
@@ -24,56 +25,159 @@ namespace rpc {
 
 int
 ExecFile::execute(const char* file, char* const* argv, int flags) {
-  torrent::system::SpawnProcess spawn_process;
+  assert(!((flags & flag_capture) && (flags & flag_background)));
 
-  spawn_process.set_log_fd(m_log_fd);
+  // Write the executed command and its parameters to the log fd.
-  spawn_process.set_background(flags & flag_background);
+  [[maybe_unused]] int result;
-  spawn_process.set_capture_output(flags & flag_capture);
 
   if (m_log_fd != -1) {
-    std::vector<struct iovec> iovecs;
+    for (char* const* itr = argv; *itr != NULL; itr++) {
-    iovecs.reserve(32);
+      if (itr == argv)
-    iovecs.push_back({const_cast<char*>("\n---\n"), 5});
+        result = write(m_log_fd, "\n---\n", sizeof("\n---\n"));
+      else
+        result = write(m_log_fd, " ", 1);
 
-    for (auto* itr = argv; *itr != nullptr; itr++) {
+      result = write(m_log_fd, *itr, std::strlen(*itr));
-      if (itr != argv)
-        iovecs.push_back({const_cast<char*>(" "), 1});
-
-      iovecs.push_back({*itr, std::strlen(*itr)});
     }
 
-    iovecs.push_back({const_cast<char*>("\n---\n"), 5});
+    result = write(m_log_fd, "\n---\n", sizeof("\n---\n"));
-
-    [[maybe_unused]] int result = ::writev(m_log_fd, iovecs.data(), iovecs.size());
   }
 
-  int spawn_status = spawn_process.execute(file, argv);
+  posix_spawn_file_actions_t actions{};
+
+  if (posix_spawn_file_actions_init(&actions) != 0)
+    throw torrent::internal_error("ExecFile::execute(...) posix_spawn_file_actions_init failed.");
+
+  posix_spawnattr_t attr;
+  posix_spawnattr_init(&attr);
+
+  // Try to avoid leaking open fds to the spawned process. Prefer POSIX_SPAWN_CLOEXEC_DEFAULT
+  // (macOS-only) or posix_spawn_file_actions_addclosefrom_np (glibc >= 2.34, FreeBSD >= 13.1).
+  //
+  // Other platforms like musl libc, OpenBSD and NetBSD must rely on explicit O_CLOEXEC.
+
+  // Handle standard input redirection (/dev/null), posix_spawn_file_actions_addopen handles opening
+  // and dup2 natively
+  if (posix_spawn_file_actions_addopen(&actions, 0, "/dev/null", O_RDWR, 0) != 0) {
+    // Fallback if open fails inside action setup
+    posix_spawn_file_actions_addclose(&actions, 0);
+  }
+
+  int pipe_0 = -1;
+  int pipe_1 = -1;
+
+  // Handle standard output redirection
+  if (flags & flag_capture) {
+    torrent::fd_open_pipe(pipe_0, pipe_1);
+
+    posix_spawn_file_actions_adddup2(&actions, pipe_1, 1);
+
+    // Ensure the write end of the pipe is closed in the child after duplicating.
+    posix_spawn_file_actions_addclose(&actions, pipe_0);
+    posix_spawn_file_actions_addclose(&actions, pipe_1);
+
+  } else if (m_log_fd != -1) {
+    posix_spawn_file_actions_adddup2(&actions, m_log_fd, 1);
+
+  } else {
+    posix_spawn_file_actions_addopen(&actions, 1, "/dev/null", O_RDWR, 0);
+  }
+
+  if (m_log_fd != -1) {
+    posix_spawn_file_actions_adddup2(&actions, m_log_fd, 2);
+  } else {
+    posix_spawn_file_actions_addopen(&actions, 2, "/dev/null", O_RDWR, 0);
+  }
+
+  short spawn_flags = 0;
+
+#if defined(POSIX_SPAWN_CLOEXEC_DEFAULT)
+  spawn_flags |= POSIX_SPAWN_CLOEXEC_DEFAULT;
+#elif defined(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSEFROM_NP)
+  posix_spawn_file_actions_addclosefrom_np(&actions, 3);
+#endif
+
+  if (flags & flag_background) {
+#ifdef POSIX_SPAWN_SETSID
+    spawn_flags |= POSIX_SPAWN_SETSID;
+#else
+    spawn_flags |= POSIX_SPAWN_SETPGROUP;
+    posix_spawnattr_setpgroup(&attr, 0);
+#endif
+  }
+
+  posix_spawnattr_setflags(&attr, spawn_flags);
+
+  pid_t child_pid{};
+  int   spawn_status = posix_spawnp(&child_pid, file, &actions, &attr, argv, environ);
+
+  posix_spawn_file_actions_destroy(&actions);
+  posix_spawnattr_destroy(&attr);
 
   if (spawn_status != 0) {
-    if (m_log_fd != -1) {
+    if (pipe_0 != -1)
-      auto prefix    = "\n--- posix_spawn failed: ";
+      torrent::fd_close(pipe_0);
-      auto errno_str = torrent::system::errno_enum_str(spawn_status) + " ---\n";
 
-      struct iovec iovecs[2] = {
+    if (pipe_1 != -1)
-        {const_cast<char*>(prefix), std::strlen(prefix)},
+      torrent::fd_close(pipe_1);
-        {const_cast<char*>(errno_str.c_str()), errno_str.size()},
-      };
-
-      [[maybe_unused]] int result = ::writev(m_log_fd, iovecs, 2);
-    }
 
     throw torrent::input_error("ExecFile::execute() posix_spawn failed: " + torrent::system::errno_enum_str(spawn_status));
   }
 
+  if (flags & flag_capture) {
+    m_capture = std::string();
+    torrent::fd_close(pipe_1);
+
+    char buffer[4096];
+    ssize_t length;
+
+    do {
+      length = read(pipe_0, buffer, sizeof(buffer));
+
+      if (length > 0)
+        m_capture += std::string(buffer, length);
+
+    } while (length > 0);
+
+    torrent::fd_close(pipe_0);
+
+    if (m_log_fd != -1) {
+      result = write(m_log_fd, "Captured output:\n", sizeof("Captured output:\n"));
+      result = write(m_log_fd, m_capture.data(), m_capture.length());
+    }
+  }
+
   if (flags & flag_background) {
-    m_waitpid_queue.close_pid(spawn_process.child_pid());
+    if (m_log_fd != -1)
+      result = write(m_log_fd, "\n--- Running in Background ---\n", sizeof("\n--- Running in Background ---\n"));
+
     return 0;
   }
 
-  if (flags & flag_capture)
+  int status;
-    m_capture = spawn_process.capture_child_output();
 
-  return spawn_process.wait_for_child();
+  while (::waitpid(child_pid, &status, 0) == -1) {
+    switch (errno) {
+    case EINTR:
+      continue;
+    case ECHILD:
+      throw torrent::internal_error("ExecFile::execute(...) waitpid failed with ECHILD, child process not found.");
+    case EINVAL:
+      throw torrent::internal_error("ExecFile::execute(...) waitpid failed with EINVAL.");
+    default:
+      throw torrent::internal_error("ExecFile::execute(...) waitpid failed with unexpected error: " + std::string(std::strerror(errno)));
+    }
+  };
+
+  // Check return value?
+  if (m_log_fd != -1) {
+    if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
+      result = write(m_log_fd, "\n--- Success ---\n", sizeof("\n--- Success ---\n"));
+    else
+      result = write(m_log_fd, "\n--- Error ---\n", sizeof("\n--- Error ---\n"));
+  }
+
+  return status;
 }
 
 torrent::Object
@@ -133,4 +237,4 @@ ExecFile::execute_object(const torrent::Object& rawArgs, int flags) {
   return torrent::Object((int64_t)status);
 }
 
-} // namespace rpc
+}

src/rpc/exec_file.h

@@ -3,8 +3,6 @@
 
 #include <torrent/object.h>
 
-#include "utils/waitpid_queue.h"
-
 namespace rpc {
 
 class ExecFile {
@@ -26,8 +24,6 @@ public:
 private:
   int                 m_log_fd{-1};
   std::string         m_capture;
-
-  utils::WaitpidQueue m_waitpid_queue;
 };
 
 }

src/rpc/jsonrpc.cc

@@ -258,8 +258,11 @@ JsonRpc::process(const char* in_buffer, uint32_t length, slot_write callback) {
 
     return callback(response_str.c_str(), response_str.size());
 
-  } catch (json::exception& e) {
+  } catch (json::parse_error& e) {
-    // Exception strings may contain invalid UTF-8, 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());
+  } 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/rpc_manager.cc

@@ -113,20 +113,25 @@ bool
 RpcManager::process(RPCType type, const char* in_buffer, uint32_t length, slot_response_callback callback) {
   switch (type) {
   case RPCType::XML:
-    if (!m_xmlrpc.is_valid() || !m_use_xmlrpc) {
+    // TODO: 'network.rpc.use_xmlrpc' should be a bool in RpcManager, not a command variable.
+    if (m_xmlrpc.is_valid() && rpc::call_command_value("network.rpc.use_xmlrpc")) {
+      return m_xmlrpc.process(in_buffer, length, callback);
+
+    } else {
       const std::string response = "<?xml version=\"1.0\"?><methodResponse><fault><value><struct><member><name>faultCode</name><value><i8>-501</i8></value></member><member><name>faultString</name><value><string>XML-RPC not supported</string></value></member></struct></value></fault></methodResponse>";
       return callback(response.c_str(), response.size());
     }
-
+    break;
-    return m_xmlrpc.process(in_buffer, length, callback);
 
   case RPCType::JSON:
-    if (!m_use_jsonrpc) {
+    if (rpc::call_command_value("network.rpc.use_jsonrpc")) {
+      return m_jsonrpc.process(in_buffer, length, callback);
+
+    } else {
       const std::string response = "{\"jsonrpc\":\"2.0\",\"error\":{\"code\":-32601,\"message\":\"JSON-RPC not supported\"},\"id\":null}";
       return callback(response.c_str(), response.size());
     }
-
+    break;
-    return m_jsonrpc.process(in_buffer, length, callback);
 
   default:
     throw torrent::input_error("invalid parameters: unknown RPC type");
@@ -167,6 +172,32 @@ RpcManager::cleanup() {
   m_jsonrpc.cleanup();
 }
 
+bool
+RpcManager::is_type_enabled(RPCType type) const {
+  switch (type) {
+  case RPCType::XML:
+    return m_is_xmlrpc_enabled;
+  case RPCType::JSON:
+    return m_is_jsonrpc_enabled;
+  default:
+    throw torrent::input_error("invalid parameters: unknown RPC type");
+  }
+}
+
+void
+RpcManager::set_type_enabled(RPCType type, bool enabled) {
+  switch (type) {
+  case RPCType::XML:
+    m_is_xmlrpc_enabled = enabled;
+    break;
+  case RPCType::JSON:
+    m_is_jsonrpc_enabled = enabled;
+    break;
+  default:
+    throw torrent::input_error("invalid parameters: unknown RPC type");
+  }
+}
+
 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

@@ -67,11 +67,8 @@ public:
   int                 dialect()                     { return m_xmlrpc.dialect(); }
   void                set_dialect(int dialect)      { m_xmlrpc.set_dialect(dialect); }
 
-  bool                use_xmlrpc() const;
+  bool                is_type_enabled(RPCType type) const;
-  void                set_use_xmlrpc(bool v);
+  void                set_type_enabled(RPCType type, bool enabled);
-
-  bool                use_jsonrpc() const;
-  void                set_use_jsonrpc(bool v);
 
   bool                process(RPCType type, const char* in_buffer, uint32_t length, slot_response_callback callback);
   bool                process_untrusted(RPCType type, const char* in_buffer, uint32_t length, slot_response_callback callback);
@@ -105,9 +102,8 @@ private:
   JsonRpc       m_jsonrpc;
 
   bool          m_handlers_initialized{};
-
+  bool          m_is_jsonrpc_enabled{true};
-  bool          m_use_jsonrpc{true};
+  bool          m_is_xmlrpc_enabled{true};
-  bool          m_use_xmlrpc{true};
 
   std::atomic<bool>         m_scgi_allow_compression{true};
   std::atomic<unsigned int> m_scgi_min_compress_size{1000};
@@ -120,11 +116,6 @@ private:
 
 extern RpcManager rpc;
 
-inline bool RpcManager::use_xmlrpc() const      { return m_use_xmlrpc; }
-inline void RpcManager::set_use_xmlrpc(bool v)  { m_use_xmlrpc = v; }
-inline bool RpcManager::use_jsonrpc() const     { return m_use_jsonrpc; }
-inline void RpcManager::set_use_jsonrpc(bool v) { m_use_jsonrpc = v; }
-
 } // namespace rpc
 
 #endif

src/rpc/scgi.h

@@ -3,13 +3,13 @@
 
 #include <array>
 #include <memory>
-#include <torrent/system/event.h>
+#include <torrent/event.h>
 
 #include "rpc/scgi_task.h"
 
 namespace rpc {
 
-class SCgi : public torrent::system::Event {
+class SCgi : public torrent::Event {
 public:
   static const int max_tasks = 100;
 

src/rpc/scgi_task.cc

@@ -94,12 +94,8 @@ SCgiTask::event_read() {
   if (m_content_length == 0)
     read_length--;
 
-  if (read_length <= 0) {
+  if (read_length <= 0)
-    if (m_content_length == 0)
-      return close();
-
     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);
 

src/rpc/scgi_task.h

@@ -4,13 +4,13 @@
 #include <memory>
 #include <mutex>
 #include <vector>
-#include <torrent/system/event.h>
+#include <torrent/event.h>
 
 namespace rpc {
 
 class SCgi;
 
-class SCgiTask : public torrent::system::Event {
+class SCgiTask : public torrent::Event {
 public:
   static constexpr int default_buffer_size = 8191;
   static constexpr int max_header_size     = 2000;

src/rpc/xmlrpc_c.cc

@@ -451,11 +451,6 @@ XmlRpc::process(const char* inBuffer, uint32_t length, slot_write slotWrite) {
   if (local_env.fault_occurred && local_env.fault_code == XMLRPC_INTERNAL_ERROR)
     throw torrent::internal_error("Internal error in XMLRPC.");
 
-  if (memblock == nullptr) {
-    xmlrpc_env_clean(&local_env);
-    return false;
-  }
-
   bool result = slotWrite((const char*)xmlrpc_mem_block_contents(memblock),
                           xmlrpc_mem_block_size(memblock));
 

src/rpc/xmlrpc_tinyxml2.cc

@@ -49,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");
@@ -95,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 ||
@@ -108,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);
@@ -139,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();
+      map[name_element->GetText()] = std::move(xml_value_to_object(child->FirstChildElement("value")));
-
-      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")));
     }
 
     return map_raw;
@@ -155,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));
@@ -315,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
@@ -328,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"});

src/setup.cc

@@ -38,7 +38,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("ip", arg); });
-    optionParser.insert_option('p', [](auto& arg) { rpc::call_command_set_string("network.listen.port.range.set", arg); });
+    optionParser.insert_option('p', [](auto& arg) { rpc::call_command_set_string("network.port_range.set", arg); });
     optionParser.insert_option('s', [](auto& arg) { rpc::call_command_set_string("session", arg); });
 
     optionParser.insert_option('O',      [](auto& arg) { rpc::parse_command_single_std(arg); });

src/ui/download_list.cc

@@ -89,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() == d)
+  if (*current_view()->focus() == d && current_view()->focus() < current_view()->end_visible())
       current_view()->next_focus();
 }
 

src/ui/element_peer_list.cc

@@ -111,7 +111,7 @@ ElementPeerList::create_info() {
   element->push_column("Client:",    te_command("p.client_version="));
   element->push_column("Options:",   te_command("p.options_str="));
   element->push_column("Connected:", te_command("if=$p.is_incoming=,incoming,outgoing"));
-  element->push_column("Encrypted:", te_command("if=$p.is_encrypted=,yes,$p.is_obfuscated=,handshake,no"));
+  element->push_column("Encrypted:", te_command("if=$p.is_encrypted=,yes,$if=$p.is_obfuscated=\\,handshake\\,no"));
 
   element->push_back("");
   element->push_column("Snubbed:",   te_command("if=$p.is_snubbed=,yes,no"));

src/ui/root.cc

@@ -4,7 +4,6 @@
 
 #include <fstream>
 #include <stdexcept>
-#include <string>
 #include <string.h>
 #include <torrent/throttle.h>
 #include <torrent/torrent.h>
@@ -355,9 +354,8 @@ Root::reset_input_history_attributes(ui::DownloadList::Input type) {
 
 void
 Root::set_input_history_size(int size) {
-  if (size < 1 || size > max_input_history_size)
+  if (size < 1)
-    throw torrent::input_error("Input history size must be between 1 and " +
+    throw torrent::input_error("Invalid input history size.");
-                               std::to_string(max_input_history_size) + ".");
 
   for (auto& [entry, category] : m_input_history) {
     // Reserve the latest input history entries if new size is smaller than original.

src/ui/root.h

@@ -54,8 +54,6 @@ public:
   typedef std::vector<std::string> InputHistoryCategory;
   typedef std::map<int, InputHistoryCategory> InputHistory;
 
-  static constexpr int max_input_history_size = 4096;
-
   Root();
 
   void                init(Control* c);

src/utils/waitpid_queue.cc

@@ -1,107 +0,0 @@
-#include "config.h"
-
-#include "utils/waitpid_queue.h"
-
-#include <sys/wait.h>
-#include <torrent/exceptions.h>
-
-namespace utils {
-
-WaitpidQueue::WaitpidQueue() {
-  m_worker = std::async(std::launch::async, [this]() {
-      auto wait_time  = 50ms;
-
-      while (true) {
-        if (!m_queue.empty()) {
-          auto start_time = std::chrono::steady_clock::now();
-
-          while (std::chrono::steady_clock::now() - start_time < wait_time) {
-            if (m_should_shutdown.load(std::memory_order_acquire))
-              return;
-
-            std::this_thread::sleep_for(50ms);
-
-            if (m_wakeup_worker.load(std::memory_order_acquire))
-              break;
-          }
-
-        } else {
-          m_wakeup_worker.wait(false, std::memory_order_acquire);
-        }
-
-        // Adds a small delay to allow new processes to finish if they're quickly spawned and
-        // terminated.
-        std::this_thread::sleep_for(50ms);
-
-        std::set<pid_t> queue;
-
-        {
-          std::lock_guard<std::mutex> guard(m_mutex);
-
-          if (m_should_shutdown)
-            return;
-
-          if (m_queue.empty())
-            throw torrent::internal_error("WaitpidQueue worker thread woke up but queue is empty.");
-
-          queue = m_queue;
-
-          m_wakeup_worker.store(false, std::memory_order_release);
-        }
-
-        wait_time = std::min(10 * 1000ms, wait_time * 2);
-
-        for (auto pid : queue) {
-          if (::waitpid(pid, nullptr, WNOHANG) == 0)
-            continue;
-
-          {
-            std::lock_guard<std::mutex> guard(m_mutex);
-
-            if (m_queue.erase(pid) != 1)
-              throw torrent::internal_error("WaitpidQueue worker thread could not find pid in queue.");
-          }
-
-          wait_time = std::max(50ms, wait_time / 2);
-
-          m_remaining.fetch_sub(1, std::memory_order_release);
-          m_remaining.notify_all();
-        }
-      }
-    });
-}
-
-// We don't wait for the worker thread to finish as waitpid isn't needed to be called on shutdown.
-WaitpidQueue::~WaitpidQueue() {
-  {
-    std::lock_guard<std::mutex> guard(m_mutex);
-    m_should_shutdown = true;
-  }
-
-  m_wakeup_worker.store(true, std::memory_order_release);
-  m_wakeup_worker.notify_all();
-}
-
-void
-WaitpidQueue::close_pid(pid_t pid) {
-  if (pid < 0)
-    throw torrent::internal_error("WaitpidQueue::close_pid() called with invalid pid.");
-
-  m_remaining.fetch_add(1, std::memory_order_acquire);
-
-  {
-    std::lock_guard<std::mutex> guard(m_mutex);
-    m_queue.insert(pid);
-  }
-
-  m_wakeup_worker.store(true, std::memory_order_release);
-  m_wakeup_worker.notify_all();
-}
-
-void
-WaitpidQueue::wait_for(uint32_t max_remaining) {
-  while (m_remaining.load(std::memory_order_acquire) > max_remaining)
-    m_remaining.wait(max_remaining, std::memory_order_acquire);
-}
-
-} // namespace torrent::utils

src/utils/waitpid_queue.h

@@ -1,46 +0,0 @@
-#ifndef RTORRENT_UTILS_WAITPID_QUEUE_H
-#define RTORRENT_UTILS_WAITPID_QUEUE_H
-
-#include <future>
-#include <set>
-#include <torrent/system/common.h>
-
-namespace utils {
-
-class WaitpidQueue {
-public:
-  WaitpidQueue();
-  ~WaitpidQueue();
-
-  uint32_t            size() const;
-
-  void                close_pid(int pid);
-
-  void                wait_for(uint32_t max_remaining);
-
-  // TODO: Add a signal handler to tell the worker thread to wake up. Use a counter to batch wakeups.
-
-private:
-  WaitpidQueue(const WaitpidQueue&) = delete;
-  WaitpidQueue& operator=(const WaitpidQueue&) = delete;
-
-  std::future<void>   m_worker;
-
-  align_cacheline
-
-  std::mutex          m_mutex;
-  std::set<pid_t>     m_queue;
-
-  align_cacheline
-
-  std::atomic<bool>     m_wakeup_worker{};
-  std::atomic<bool>     m_should_shutdown{};
-
-  std::atomic<uint32_t> m_remaining{};
-};
-
-inline uint32_t WaitpidQueue::size() const { return m_remaining.load(std::memory_order_acquire); }
-
-} // namespace utils
-
-#endif

src/utils/watch_ready_queue.h

@@ -9,7 +9,7 @@
 #include <utility>
 #include <vector>
 
-#include <torrent/system/scheduler.h>
+#include <torrent/utils/scheduler.h>
 
 namespace utils {
 
@@ -49,12 +49,10 @@ private:
   void               update_status(Entry* entry);
   void               schedule();
 
-  std::map<std::string, Entry> m_entries;
+  std::map<std::string, Entry>   m_entries;
-  std::vector<Entry*>          m_entry_queue;
+  std::vector<Entry*>            m_entry_queue;
-
+  torrent::utils::SchedulerEntry m_task_process;
-  bool                         m_active{true};
+  bool                           m_active{true};
-
-  torrent::system::SchedulerEntry m_task_process;
 };
 
 }

test/Makefile.am

@@ -49,12 +49,8 @@ rtorrent_Test_Rpc_SOURCES = $(rtorrent_Test_Common) \
 rtorrent_Test_Src_SOURCES = $(rtorrent_Test_Common) \
 	src/test_command_dynamic.cc \
 	src/test_command_dynamic.h \
-	src/test_command_local.cc \
+	src/test_encryption_config.cc \
-	src/test_command_local.h \
+	src/test_encryption_config.h \
-	src/test_command_path.cc \
-	src/test_command_path.h \
-	src/test_command_string.cc \
-	src/test_command_string.h \
 	src/test_watch_ready_queue.cc \
 	src/test_watch_ready_queue.h
 

test/helpers/mock_compare.h

@@ -2,10 +2,9 @@
 #define LIBTORRENT_HELPERS_MOCK_COMPARE_H
 
 #include <algorithm>
-#include <map>
 #include <type_traits>
+#include <torrent/event.h>
 #include <torrent/net/socket_address.h>
-#include <torrent/system/event.h>
 
 // Compare arguments to mock functions with what is expected. The lhs
 // are the expected arguments, rhs are the ones called with.
@@ -14,13 +13,13 @@ template <typename Arg>
 inline bool mock_compare_arg(Arg lhs, Arg rhs) { return lhs == rhs; }
 
 template <int I, typename A, typename... Args>
-std::enable_if_t<I == 1, int>
+typename std::enable_if<I == 1, int>::type
 mock_compare_tuple(const std::tuple<A, Args...>& lhs, const std::tuple<Args...>& rhs) {
   return mock_compare_arg(std::get<I>(lhs), std::get<I - 1>(rhs)) ? 0 : 1;
 }
 
 template <int I, typename A, typename... Args>
-std::enable_if_t<1 < I, int>
+typename std::enable_if<1 < I, int>::type
 mock_compare_tuple(const std::tuple<A, Args...>& lhs, const std::tuple<Args...>& rhs) {
   auto res = mock_compare_tuple<I - 1>(lhs, rhs);
 
@@ -71,37 +70,24 @@ void mock_compare_add(T* v) {
 // Specialize:
 //
 
-constexpr int mock_compare_gt_two_int = -0xFD30;
-
-template <>
-inline bool mock_compare_arg<int>(int lhs, int rhs) {
-  if (lhs == mock_compare_gt_two_int)
-    return rhs > 2;
-  if (rhs == mock_compare_gt_two_int)
-    return lhs > 2;
-
-  return lhs == rhs;
-}
-
 template <>
 inline bool mock_compare_arg<sockaddr*>(sockaddr* lhs, sockaddr* rhs) {
   return lhs != nullptr && rhs != nullptr && torrent::sa_equal(lhs, rhs);
 }
-
 template <>
 inline bool mock_compare_arg<const sockaddr*>(const sockaddr* lhs, const sockaddr* rhs) {
   return lhs != nullptr && rhs != nullptr && torrent::sa_equal(lhs, rhs);
 }
 
 template <>
-inline bool mock_compare_arg<torrent::system::Event*>(torrent::system::Event* lhs, torrent::system::Event* rhs) {
+inline bool mock_compare_arg<torrent::Event*>(torrent::Event* lhs, torrent::Event* rhs) {
-  if (mock_compare_map<torrent::system::Event>::is_key(lhs)) {
+  if (mock_compare_map<torrent::Event>::is_key(lhs)) {
-    if (!mock_compare_map<torrent::system::Event>::has_value(rhs)) {
+    if (!mock_compare_map<torrent::Event>::has_value(rhs)) {
-      mock_compare_map<torrent::system::Event>::values[lhs] = rhs;
+      mock_compare_map<torrent::Event>::values[lhs] = rhs;
       return true;
     }
 
-    return mock_compare_map<torrent::system::Event>::has_key(lhs) && mock_compare_map<torrent::system::Event>::get(lhs) == rhs;
+    return mock_compare_map<torrent::Event>::has_key(lhs) && mock_compare_map<torrent::Event>::get(lhs) == rhs;
   }
 
   return lhs == rhs;

test/helpers/mock_function.cc

@@ -6,9 +6,9 @@
 #include <iostream>
 #include <unistd.h>
 
+#include "torrent/event.h"
 #include "torrent/net/socket_address.h"
 #include "torrent/net/fd.h"
-#include "torrent/system/event.h"
 #include "torrent/utils/log.h"
 #include "torrent/utils/random.h"
 
@@ -32,7 +32,7 @@ mock_clear(bool ignore_assert) {
   MOCK_CLEANUP_MAP(torrent::random_uniform_uint16);
   MOCK_CLEANUP_MAP(torrent::random_uniform_uint32);
 
-  mock_compare_map<torrent::system::Event>::values.clear();
+  mock_compare_map<torrent::Event>::values.clear();
 }
 } // namespace
 
@@ -55,9 +55,7 @@ mock_redirect_defaults([[maybe_unused]] mock_redirect_flags flags) {
 
   mock_redirect(torrent::fd__close, std::function<int(int fildes)>([](int fildes) { return ::close(fildes); }));
   mock_redirect(torrent::fd__fcntl_int, std::function<int(int fildes, int cmd, int arg)>([](int fildes, int cmd, int arg) { return ::fcntl(fildes, cmd, arg); }));
-  mock_redirect(torrent::fd__setsockopt_int, std::function<int(int socket, int level, int option_name, int option_value)>([](int socket, int level, int option_name, int option_value) {
+  mock_redirect(torrent::fd__setsockopt_int, std::function<int(int socket, int level, int option_name, int option_value)>([](int socket, int level, int option_name, int option_value) { return ::setsockopt(socket, level, option_name, &option_value, sizeof(int)); }));
-      return ::setsockopt(socket, level, option_name, &option_value, sizeof(int));
-    }));
   mock_redirect(torrent::fd__socket, std::function<int(int domain, int type, int protocol)>([](int domain, int type, int protocol) { return ::socket(domain, type, protocol); }));
 }
 
@@ -114,6 +112,69 @@ int fd__socket(int domain, int type, int protocol) {
   return mock_call<int>(__func__, &torrent::fd__socket, domain, type, protocol);
 }
 
+//
+// Mock functions for 'torrent/common.h':
+//
+
+namespace this_thread {
+
+void event_open(Event* event) {
+  MOCK_LOG("fd:%i type_name:%s", event->file_descriptor(), event->type_name());
+  return mock_call<void>(__func__, &torrent::this_thread::event_open, event);
+}
+
+void event_open_and_count(Event* event) {
+  MOCK_LOG("fd:%i type_name:%s", event->file_descriptor(), event->type_name());
+  return mock_call<void>(__func__, &torrent::this_thread::event_open_and_count, event);
+}
+
+void event_close_and_count(Event* event) {
+  MOCK_LOG("fd:%i type_name:%s", event->file_descriptor(), event->type_name());
+  return mock_call<void>(__func__, &torrent::this_thread::event_close_and_count, event);
+}
+
+void event_closed_and_count(Event* event) {
+  MOCK_LOG("fd:%i type_name:%s", event->file_descriptor(), event->type_name());
+  return mock_call<void>(__func__, &torrent::this_thread::event_closed_and_count, event);
+}
+
+void event_insert_read(Event* event) {
+  MOCK_LOG("fd:%i type_name:%s", event->file_descriptor(), event->type_name());
+  return mock_call<void>(__func__, &torrent::this_thread::event_insert_read, event);
+}
+
+void event_insert_write(Event* event) {
+  MOCK_LOG("fd:%i type_name:%s", event->file_descriptor(), event->type_name());
+  return mock_call<void>(__func__, &torrent::this_thread::event_insert_write, event);
+}
+
+void event_insert_error(Event* event) {
+  MOCK_LOG("fd:%i type_name:%s", event->file_descriptor(), event->type_name());
+  return mock_call<void>(__func__, &torrent::this_thread::event_insert_error, event);
+}
+
+void event_remove_read(Event* event) {
+  MOCK_LOG("fd:%i type_name:%s", event->file_descriptor(), event->type_name());
+  return mock_call<void>(__func__, &torrent::this_thread::event_remove_read, event);
+}
+
+void event_remove_write(Event* event) {
+  MOCK_LOG("fd:%i type_name:%s", event->file_descriptor(), event->type_name());
+  return mock_call<void>(__func__, &torrent::this_thread::event_remove_write, event);
+}
+
+void event_remove_error(Event* event) {
+  MOCK_LOG("fd:%i type_name:%s", event->file_descriptor(), event->type_name());
+  return mock_call<void>(__func__, &torrent::this_thread::event_remove_error, event);
+}
+
+void event_remove_and_close(Event* event) {
+  MOCK_LOG("fd:%i type_name:%s", event->file_descriptor(), event->type_name());
+  return mock_call<void>(__func__, &torrent::this_thread::event_remove_and_close, event);
+}
+
+}
+
 //
 // Mock functions for 'torrent/utils/random.h':
 //

test/helpers/test_main_thread.cc

@@ -8,6 +8,7 @@
 #include "torrent/exceptions.h"
 #include "torrent/net/resolver.h"
 #include "torrent/utils/log.h"
+#include "torrent/utils/scheduler.h"
 
 std::unique_ptr<TestMainThread>
 TestMainThread::create() {

test/rpc/test_parse_options.cc

@@ -169,3 +169,19 @@ TestParseOptions::test_flag_libtorrent() {
 
   FLAG_LT_LOG_ASSERT_ERROR("resume_data|rpc_dump");
 }
+
+#define FLAGS_LT_IP_TOS_ASSERT(flags, result)                           \
+  CPPUNIT_ASSERT(rpc::parse_option_flags(flags, std::bind(&torrent::option_find_string_str, torrent::OPTION_IP_TOS, std::placeholders::_1)) == (result))
+
+#define FLAGS_LT_IP_TOS_ASSERT_ERROR(flags)                             \
+  ASSERT_CATCH_INPUT_ERROR(rpc::parse_option_flags(flags, std::bind(&torrent::option_find_string_str, torrent::OPTION_IP_TOS, std::placeholders::_1)))
+
+void
+TestParseOptions::test_flags_libtorrent() {
+  FLAGS_LT_IP_TOS_ASSERT("throughput", torrent::option_find_string(torrent::OPTION_IP_TOS, "throughput"));
+  FLAGS_LT_IP_TOS_ASSERT("lowdelay | throughput",
+                         torrent::option_find_string(torrent::OPTION_IP_TOS, "lowdelay")
+                       | torrent::option_find_string(torrent::OPTION_IP_TOS, "throughput"));
+
+  FLAGS_LT_IP_TOS_ASSERT_ERROR("throughput_");
+}

test/rpc/test_parse_options.h

@@ -14,6 +14,7 @@ class TestParseOptions : public test_fixture {
   CPPUNIT_TEST(test_flags_print_flags);
 
   CPPUNIT_TEST(test_flag_libtorrent);
+  CPPUNIT_TEST(test_flags_libtorrent);
 
   CPPUNIT_TEST_SUITE_END();
 
@@ -29,4 +30,5 @@ public:
   void test_flags_print_flags();
 
   void test_flag_libtorrent();
+  void test_flags_libtorrent();
 };

test/src/test_command_local.cc

@@ -1,54 +0,0 @@
-#include "config.h"
-
-#include "test/src/test_command_local.h"
-
-#include <torrent/torrent.h>
-#include <torrent/runtime/socket_manager.h>
-#include <torrent/utils/option_strings.h>
-
-#include "control.h"
-#include "globals.h"
-#include "rpc/parse_commands.h"
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestCommandLocal);
-
-void initialize_command_local();
-
-void
-TestCommandLocal::setUp() {
-  torrent::initialize_main_thread();
-  torrent::initialize();
-
-  if (control == nullptr)
-    control = new Control;
-
-  if (!rpc::commands.has("system.sockets.size"))
-    initialize_command_local();
-}
-
-void
-TestCommandLocal::tearDown() {
-  torrent::cleanup();
-}
-
-void
-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);
-
-    for (const auto suffix : {".size", ".max_size", ".min_alloc", ".max_alloc"})
-      if (rpc::commands.has(name + suffix))
-        CPPUNIT_ASSERT_NO_THROW(rpc::commands.call(name + suffix));
-
-    const bool has_allocation = category != torrent::runtime::category_generic;
-
-    CPPUNIT_ASSERT(rpc::commands.has(name + ".size"));
-    CPPUNIT_ASSERT(rpc::commands.has(name + ".max_size"));
-    CPPUNIT_ASSERT(rpc::commands.has(name + ".min_alloc"));
-
-    CPPUNIT_ASSERT_EQUAL(has_allocation, rpc::commands.has(name + ".max_alloc"));
-    CPPUNIT_ASSERT_EQUAL(has_allocation, rpc::commands.has(name + ".min_alloc.set"));
-    CPPUNIT_ASSERT_EQUAL(has_allocation, rpc::commands.has(name + ".max_alloc.set"));
-  }
-}

test/src/test_command_local.h

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

test/src/test_command_path.cc

@@ -1,116 +0,0 @@
-#include "config.h"
-
-#include "test/src/test_command_path.h"
-
-#include <cstdlib>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <torrent/exceptions.h>
-#include <torrent/torrent.h>
-
-#include "control.h"
-#include "globals.h"
-#include "rpc/parse_commands.h"
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestCommandPath);
-
-void initialize_command_local();
-
-void
-TestCommandPath::setUp() {
-  char temp_dir[] = "/tmp/rtorrent_test_path_XXXXXX";
-
-  CPPUNIT_ASSERT(mkdtemp(temp_dir) != nullptr);
-
-  // The temporary directory itself may sit behind a symlink, as /tmp does on
-  // macOS, so resolve it up front to keep the expected values exact.
-  m_temp_dir = resolve_path(temp_dir);
-
-  CPPUNIT_ASSERT(!m_temp_dir.empty());
-  CPPUNIT_ASSERT_EQUAL(0, mkdir((m_temp_dir + "/data").c_str(), 0755));
-  CPPUNIT_ASSERT_EQUAL(0, symlink((m_temp_dir + "/data").c_str(), (m_temp_dir + "/link").c_str()));
-}
-
-void
-TestCommandPath::tearDown() {
-  unlink((m_temp_dir + "/link").c_str());
-  rmdir((m_temp_dir + "/data").c_str());
-  rmdir(m_temp_dir.c_str());
-}
-
-void
-TestCommandPath::test_resolves_symlink() {
-  CPPUNIT_ASSERT_EQUAL(m_temp_dir + "/data", resolve_path(m_temp_dir + "/link"));
-
-  // A path that lies below a symlinked directory is resolved as well.
-  CPPUNIT_ASSERT_EQUAL(0, mkdir((m_temp_dir + "/data/below").c_str(), 0755));
-  CPPUNIT_ASSERT_EQUAL(m_temp_dir + "/data/below", resolve_path(m_temp_dir + "/link/below"));
-  rmdir((m_temp_dir + "/data/below").c_str());
-}
-
-void
-TestCommandPath::test_removes_relative_components() {
-  CPPUNIT_ASSERT_EQUAL(m_temp_dir, resolve_path(m_temp_dir + "/data/.."));
-  CPPUNIT_ASSERT_EQUAL(m_temp_dir + "/data", resolve_path(m_temp_dir + "/./data"));
-  CPPUNIT_ASSERT_EQUAL(m_temp_dir + "/data", resolve_path(m_temp_dir + "/data/"));
-
-  // Trailing slashes and duplicated separators collapse.
-  CPPUNIT_ASSERT_EQUAL(m_temp_dir + "/data", resolve_path(m_temp_dir + "//data//"));
-}
-
-void
-TestCommandPath::test_expands_tilde() {
-  const char* home = std::getenv("HOME");
-
-  if (home == nullptr || *home == '\0')
-    return;
-
-  CPPUNIT_ASSERT_EQUAL(resolve_path(home), resolve_path("~"));
-  CPPUNIT_ASSERT_THROW(resolve_path("~root/somewhere"), torrent::input_error);
-}
-
-void
-TestCommandPath::test_missing_path_throws() {
-  CPPUNIT_ASSERT_THROW(resolve_path_or_throw(""), torrent::input_error);
-  CPPUNIT_ASSERT_THROW(resolve_path_or_throw(m_temp_dir + "/does_not_exist"), torrent::input_error);
-  CPPUNIT_ASSERT_EQUAL(m_temp_dir + "/data", resolve_path_or_throw(m_temp_dir + "/link"));
-}
-
-void
-TestCommandPath::test_missing_path_is_empty() {
-  CPPUNIT_ASSERT_EQUAL(std::string(), resolve_path(""));
-  CPPUNIT_ASSERT_EQUAL(std::string(), resolve_path(m_temp_dir + "/does_not_exist"));
-  CPPUNIT_ASSERT_EQUAL(std::string(), resolve_path(m_temp_dir + "/does_not_exist/below"));
-
-  // A dangling symlink does not name an existing path either.
-  CPPUNIT_ASSERT_EQUAL(0, symlink((m_temp_dir + "/gone").c_str(), (m_temp_dir + "/dangling").c_str()));
-  CPPUNIT_ASSERT_EQUAL(std::string(), resolve_path(m_temp_dir + "/dangling"));
-  unlink((m_temp_dir + "/dangling").c_str());
-}
-
-void
-TestCommandPath::test_commands() {
-  torrent::initialize_main_thread();
-  torrent::initialize();
-
-  if (control == nullptr)
-    control = new Control;
-
-  if (!rpc::commands.has("directory.default.realpath.or_empty"))
-    initialize_command_local();
-
-  rpc::commands.call_command("directory.default.set", m_temp_dir + "/link");
-
-  CPPUNIT_ASSERT_EQUAL(m_temp_dir + "/link", rpc::commands.call_command("directory.default", torrent::Object()).as_string());
-  CPPUNIT_ASSERT_EQUAL(m_temp_dir + "/data", rpc::commands.call_command("directory.default.realpath.or_empty", torrent::Object()).as_string());
-  CPPUNIT_ASSERT_EQUAL(m_temp_dir + "/data", rpc::commands.call_command("directory.default.realpath.or_throw", torrent::Object()).as_string());
-
-  // A directory that has not been created yet resolves to nothing, and the
-  // or_throw variant reports it instead.
-  rpc::commands.call_command("directory.default.set", m_temp_dir + "/missing");
-
-  CPPUNIT_ASSERT_EQUAL(std::string(), rpc::commands.call_command("directory.default.realpath.or_empty", torrent::Object()).as_string());
-  CPPUNIT_ASSERT_THROW(rpc::commands.call_command("directory.default.realpath.or_throw", torrent::Object()), torrent::input_error);
-
-  torrent::cleanup();
-}

test/src/test_command_path.h

@@ -1,30 +0,0 @@
-#include "test/helpers/test_fixture.h"
-
-#include <string>
-
-class TestCommandPath : public test_fixture {
-  CPPUNIT_TEST_SUITE(TestCommandPath);
-
-  CPPUNIT_TEST(test_resolves_symlink);
-  CPPUNIT_TEST(test_removes_relative_components);
-  CPPUNIT_TEST(test_expands_tilde);
-  CPPUNIT_TEST(test_missing_path_is_empty);
-  CPPUNIT_TEST(test_missing_path_throws);
-  CPPUNIT_TEST(test_commands);
-
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  void setUp();
-  void tearDown();
-
-  void test_resolves_symlink();
-  void test_removes_relative_components();
-  void test_expands_tilde();
-  void test_missing_path_is_empty();
-  void test_missing_path_throws();
-  void test_commands();
-
-private:
-  std::string m_temp_dir;
-};

test/src/test_command_string.cc

@@ -1,261 +0,0 @@
-#include "config.h"
-
-#include "test/src/test_command_string.h"
-
-#include "rpc/parse_commands.h"
-
-CPPUNIT_TEST_SUITE_REGISTRATION(TestCommandString);
-
-void initialize_command_string();
-
-namespace {
-
-torrent::Object
-args(std::initializer_list<torrent::Object> objects) {
-  auto result = torrent::Object::create_list();
-
-  for (const auto& object : objects)
-    result.as_list().push_back(object);
-
-  return result;
-}
-
-std::string
-call_string(const char* key, std::initializer_list<torrent::Object> objects) {
-  return rpc::commands.call_command(key, args(objects)).as_string();
-}
-
-int64_t
-call_value(const char* key, std::initializer_list<torrent::Object> objects) {
-  return rpc::commands.call_command(key, args(objects)).as_value();
-}
-
-torrent::Object::list_type
-call_list(const char* key, std::initializer_list<torrent::Object> objects) {
-  return rpc::commands.call_command(key, args(objects)).as_list();
-}
-
-// Runs a command the way a line in the configuration file would.
-torrent::Object
-parse(const char* command) {
-  return rpc::parse_command_single(rpc::make_target(), command);
-}
-
-}
-
-void
-TestCommandString::setUp() {
-  if (!rpc::commands.has("string.length"))
-    initialize_command_string();
-}
-
-void
-TestCommandString::tearDown() {
-}
-
-void
-TestCommandString::test_length() {
-  CPPUNIT_ASSERT_EQUAL(int64_t(0), call_value("string.length", {""}));
-  CPPUNIT_ASSERT_EQUAL(int64_t(3), call_value("string.length", {"abc"}));
-
-  // The length is counted in utf-8 characters, not bytes.
-  CPPUNIT_ASSERT_EQUAL(int64_t(5), call_value("string.length", {"héllo"}));
-  CPPUNIT_ASSERT_EQUAL(int64_t(3), call_value("string.length", {"日本語"}));
-
-  // Values are converted to their string representation.
-  CPPUNIT_ASSERT_EQUAL(int64_t(4), call_value("string.length", {int64_t(1234)}));
-}
-
-void
-TestCommandString::test_equals() {
-  CPPUNIT_ASSERT_EQUAL(int64_t(1), call_value("string.equals", {"abc", "abc"}));
-  CPPUNIT_ASSERT_EQUAL(int64_t(0), call_value("string.equals", {"abc", "abd"}));
-  CPPUNIT_ASSERT_EQUAL(int64_t(0), call_value("string.equals", {"abc", "ab"}));
-
-  CPPUNIT_ASSERT_EQUAL(int64_t(1), call_value("string.equals", {"abc", "x", "abc"}));
-  CPPUNIT_ASSERT_EQUAL(int64_t(0), call_value("string.equals", {"abc", "x", "y"}));
-
-  CPPUNIT_ASSERT_EQUAL(int64_t(1), call_value("string.equals", {int64_t(42), "42"}));
-}
-
-void
-TestCommandString::test_starts_with() {
-  CPPUNIT_ASSERT_EQUAL(int64_t(1), call_value("string.starts_with", {"abcdef", "abc"}));
-  CPPUNIT_ASSERT_EQUAL(int64_t(1), call_value("string.starts_with", {"abcdef", ""}));
-  CPPUNIT_ASSERT_EQUAL(int64_t(0), call_value("string.starts_with", {"abcdef", "bcd"}));
-  CPPUNIT_ASSERT_EQUAL(int64_t(0), call_value("string.starts_with", {"ab", "abc"}));
-
-  CPPUNIT_ASSERT_EQUAL(int64_t(1), call_value("string.starts_with", {"abcdef", "x", "ab"}));
-}
-
-void
-TestCommandString::test_ends_with() {
-  CPPUNIT_ASSERT_EQUAL(int64_t(1), call_value("string.ends_with", {"abcdef", "def"}));
-  CPPUNIT_ASSERT_EQUAL(int64_t(1), call_value("string.ends_with", {"abcdef", ""}));
-  CPPUNIT_ASSERT_EQUAL(int64_t(0), call_value("string.ends_with", {"abcdef", "cde"}));
-  CPPUNIT_ASSERT_EQUAL(int64_t(0), call_value("string.ends_with", {"ef", "def"}));
-
-  CPPUNIT_ASSERT_EQUAL(int64_t(1), call_value("string.ends_with", {"a.torrent", ".rar", ".torrent"}));
-}
-
-void
-TestCommandString::test_contains() {
-  CPPUNIT_ASSERT_EQUAL(int64_t(1), call_value("string.contains", {"abcdef", "cde"}));
-  CPPUNIT_ASSERT_EQUAL(int64_t(0), call_value("string.contains", {"abcdef", "ace"}));
-  CPPUNIT_ASSERT_EQUAL(int64_t(1), call_value("string.contains", {"abcdef", "x", "bcd"}));
-
-  CPPUNIT_ASSERT_EQUAL(int64_t(0), call_value("string.contains", {"retracker.local", "RETRACKER"}));
-  CPPUNIT_ASSERT_EQUAL(int64_t(1), call_value("string.contains_i", {"retracker.local", "RETRACKER"}));
-  CPPUNIT_ASSERT_EQUAL(int64_t(1), call_value("string.contains_i", {"RETRACKER.LOCAL", "retracker"}));
-  CPPUNIT_ASSERT_EQUAL(int64_t(0), call_value("string.contains_i", {"abcdef", "xyz"}));
-}
-
-void
-TestCommandString::test_substr() {
-  CPPUNIT_ASSERT_EQUAL(std::string("abcdef"), call_string("string.substr", {"abcdef"}));
-  CPPUNIT_ASSERT_EQUAL(std::string("cdef"), call_string("string.substr", {"abcdef", int64_t(2)}));
-  CPPUNIT_ASSERT_EQUAL(std::string("cde"), call_string("string.substr", {"abcdef", int64_t(2), int64_t(3)}));
-  CPPUNIT_ASSERT_EQUAL(std::string("cdef"), call_string("string.substr", {"abcdef", int64_t(2), int64_t(100)}));
-  CPPUNIT_ASSERT_EQUAL(std::string(""), call_string("string.substr", {"abcdef", int64_t(2), int64_t(0)}));
-
-  // Negative positions are relative to the end of the string.
-  CPPUNIT_ASSERT_EQUAL(std::string("ef"), call_string("string.substr", {"abcdef", int64_t(-2)}));
-  CPPUNIT_ASSERT_EQUAL(std::string("e"), call_string("string.substr", {"abcdef", int64_t(-2), int64_t(1)}));
-
-  // Out-of-bounds positions return the default value.
-  CPPUNIT_ASSERT_EQUAL(std::string(""), call_string("string.substr", {"abcdef", int64_t(10)}));
-  CPPUNIT_ASSERT_EQUAL(std::string("n/a"), call_string("string.substr", {"abcdef", int64_t(10), int64_t(1), "n/a"}));
-  CPPUNIT_ASSERT_EQUAL(std::string("n/a"), call_string("string.substr", {"abcdef", int64_t(-10), int64_t(1), "n/a"}));
-
-  // Positions and counts are in utf-8 characters, not bytes.
-  CPPUNIT_ASSERT_EQUAL(std::string("本"), call_string("string.substr", {"日本語", int64_t(1), int64_t(1)}));
-  CPPUNIT_ASSERT_EQUAL(std::string("本語"), call_string("string.substr", {"日本語", int64_t(-2)}));
-}
-
-void
-TestCommandString::test_split() {
-  auto parts = call_list("string.split", {"a,b,c", ","});
-
-  CPPUNIT_ASSERT_EQUAL(size_t(3), parts.size());
-  CPPUNIT_ASSERT_EQUAL(std::string("a"), parts.front().as_string());
-  CPPUNIT_ASSERT_EQUAL(std::string("c"), parts.back().as_string());
-
-  // Empty fields are preserved.
-  CPPUNIT_ASSERT_EQUAL(size_t(3), call_list("string.split", {"a,,b", ","}).size());
-  CPPUNIT_ASSERT_EQUAL(size_t(1), call_list("string.split", {"abc", ","}).size());
-
-  // A multi-character delimiter is matched as a whole.
-  CPPUNIT_ASSERT_EQUAL(size_t(2), call_list("string.split", {"a::b", "::"}).size());
-
-  // An empty delimiter splits the text into its utf-8 characters.
-  auto characters = call_list("string.split", {"日本語", ""});
-
-  CPPUNIT_ASSERT_EQUAL(size_t(3), characters.size());
-  CPPUNIT_ASSERT_EQUAL(std::string("日"), characters.front().as_string());
-}
-
-void
-TestCommandString::test_join() {
-  CPPUNIT_ASSERT_EQUAL(std::string("a, b"), call_string("string.join", {", ", "a", "b"}));
-  CPPUNIT_ASSERT_EQUAL(std::string("ab"), call_string("string.join", {"", "a", "b"}));
-  CPPUNIT_ASSERT_EQUAL(std::string(""), call_string("string.join", {", "}));
-  CPPUNIT_ASSERT_EQUAL(std::string("a"), call_string("string.join", {", ", "a"}));
-  CPPUNIT_ASSERT_EQUAL(std::string("1-2"), call_string("string.join", {"-", int64_t(1), int64_t(2)}));
-
-  // Lists are flattened, so the output of string.split can be joined again.
-  CPPUNIT_ASSERT_EQUAL(std::string("a-b-c"), call_string("string.join", {"-", args({"a", "b"}), "c"}));
-}
-
-void
-TestCommandString::test_pad() {
-  CPPUNIT_ASSERT_EQUAL(std::string("  7"), call_string("string.lpad", {"7", int64_t(3)}));
-  CPPUNIT_ASSERT_EQUAL(std::string("7  "), call_string("string.rpad", {"7", int64_t(3)}));
-  CPPUNIT_ASSERT_EQUAL(std::string("007"), call_string("string.lpad", {"7", int64_t(3), "0"}));
-  CPPUNIT_ASSERT_EQUAL(std::string("700"), call_string("string.rpad", {"7", int64_t(3), "0"}));
-
-  // Text that is already long enough is returned unchanged.
-  CPPUNIT_ASSERT_EQUAL(std::string("abcd"), call_string("string.lpad", {"abcd", int64_t(2)}));
-  CPPUNIT_ASSERT_EQUAL(std::string("abcd"), call_string("string.rpad", {"abcd", int64_t(4)}));
-
-  // Multi-character padding is repeated, and an empty padding is a no-op.
-  CPPUNIT_ASSERT_EQUAL(std::string("axyx"), call_string("string.rpad", {"a", int64_t(4), "xy"}));
-  CPPUNIT_ASSERT_EQUAL(std::string("a"), call_string("string.rpad", {"a", int64_t(4), ""}));
-
-  // Padding is counted in utf-8 characters, not bytes.
-  CPPUNIT_ASSERT_EQUAL(std::string("00日"), call_string("string.lpad", {"日", int64_t(3), "0"}));
-}
-
-void
-TestCommandString::test_strip() {
-  CPPUNIT_ASSERT_EQUAL(std::string("a b"), call_string("string.strip", {"  a b  "}));
-  CPPUNIT_ASSERT_EQUAL(std::string("a"), call_string("string.strip", {"\t\n a \r\n"}));
-  CPPUNIT_ASSERT_EQUAL(std::string("a  "), call_string("string.lstrip", {"  a  "}));
-  CPPUNIT_ASSERT_EQUAL(std::string("  a"), call_string("string.rstrip", {"  a  "}));
-
-  CPPUNIT_ASSERT_EQUAL(std::string("a"), call_string("string.strip", {"xxaxx", "x"}));
-  CPPUNIT_ASSERT_EQUAL(std::string("a"), call_string("string.strip", {"/x/a/x/", "/", "x"}));
-  CPPUNIT_ASSERT_EQUAL(std::string(""), call_string("string.strip", {"aaa", "a"}));
-  CPPUNIT_ASSERT_EQUAL(std::string("  a  "), call_string("string.strip", {"  a  ", ""}));
-
-  // The strippable argument is a set of utf-8 characters.
-  CPPUNIT_ASSERT_EQUAL(std::string("a"), call_string("string.strip", {"日a日", "日"}));
-}
-
-void
-TestCommandString::test_map() {
-  CPPUNIT_ASSERT_EQUAL(std::string("b"), call_string("string.map", {"a", args({"a", "b"})}));
-  CPPUNIT_ASSERT_EQUAL(std::string("c"), call_string("string.map", {"c", args({"a", "b"})}));
-
-  // Only whole-string matches are replaced.
-  CPPUNIT_ASSERT_EQUAL(std::string("ab"), call_string("string.map", {"ab", args({"a", "b"})}));
-
-  // The first matching pair wins.
-  CPPUNIT_ASSERT_EQUAL(std::string("y"), call_string("string.map", {"x", args({"a", "b"}), args({"x", "y"}), args({"x", "z"})}));
-}
-
-void
-TestCommandString::test_replace() {
-  CPPUNIT_ASSERT_EQUAL(std::string("a+b+c"), call_string("string.replace", {"a-b-c", args({"-", "+"})}));
-  CPPUNIT_ASSERT_EQUAL(std::string("abc"), call_string("string.replace", {"a-b-c", args({"-", ""})}));
-  CPPUNIT_ASSERT_EQUAL(std::string("a-b-c"), call_string("string.replace", {"a-b-c", args({"x", "y"})}));
-
-  // Pairs are applied in order, left to right.
-  CPPUNIT_ASSERT_EQUAL(std::string("xby"), call_string("string.replace", {"abc", args({"a", "x"}), args({"c", "y"})}));
-
-  // A replacement that contains the replaced text terminates.
-  CPPUNIT_ASSERT_EQUAL(std::string("aaaa"), call_string("string.replace", {"aa", args({"a", "aa"})}));
-}
-
-void
-TestCommandString::test_invalid_arguments() {
-  CPPUNIT_ASSERT_THROW(rpc::commands.call_command("string.length", torrent::Object()), torrent::input_error);
-  CPPUNIT_ASSERT_THROW(call_string("string.length", {"a", "b"}), torrent::input_error);
-  CPPUNIT_ASSERT_THROW(call_value("string.equals", {"a"}), torrent::input_error);
-  CPPUNIT_ASSERT_THROW(call_value("string.contains", {"a"}), torrent::input_error);
-  CPPUNIT_ASSERT_THROW(call_list("string.split", {"a"}), torrent::input_error);
-  CPPUNIT_ASSERT_THROW(call_string("string.lpad", {"a"}), torrent::input_error);
-
-  // The character count of string.substr cannot be negative.
-  CPPUNIT_ASSERT_THROW(call_string("string.substr", {"abc", int64_t(0), int64_t(-1)}), torrent::input_error);
-
-  // Both string.map and string.replace require {old, new} pairs.
-  CPPUNIT_ASSERT_THROW(call_string("string.map", {"a", "b"}), torrent::input_error);
-  CPPUNIT_ASSERT_THROW(call_string("string.replace", {"a", args({"a", "b", "c"})}), torrent::input_error);
-  CPPUNIT_ASSERT_THROW(call_string("string.replace", {"a", args({"", "b"})}), torrent::input_error);
-}
-
-void
-TestCommandString::test_config_syntax() {
-  CPPUNIT_ASSERT_EQUAL(int64_t(3), parse("string.length=abc").as_value());
-  CPPUNIT_ASSERT_EQUAL(int64_t(1), parse("string.contains=retracker.local,retracker").as_value());
-  CPPUNIT_ASSERT_EQUAL(int64_t(1), parse("string.starts_with=udp://tracker.example.com,http://,udp://").as_value());
-  CPPUNIT_ASSERT_EQUAL(std::string("cde"), parse("string.substr=abcdef,2,3").as_string());
-  CPPUNIT_ASSERT_EQUAL(std::string("padded"), parse("string.strip=\"  padded  \"").as_string());
-
-  // The {old, new} pairs are written as a block in the configuration file.
-  CPPUNIT_ASSERT_EQUAL(std::string("a+b+c"), parse("string.replace=a-b-c,{-,+}").as_string());
-  CPPUNIT_ASSERT_EQUAL(std::string("y"), parse("string.map=x,{a,b},{x,y}").as_string());
-
-  // Commands nest, so a split can be joined back together.
-  CPPUNIT_ASSERT_EQUAL(std::string("a-b-c"), parse("string.join=-,(string.split,a.b.c,.)").as_string());
-}

test/src/test_command_string.h

@@ -1,41 +0,0 @@
-#include "test/helpers/test_fixture.h"
-
-class TestCommandString : public test_fixture {
-  CPPUNIT_TEST_SUITE(TestCommandString);
-
-  CPPUNIT_TEST(test_length);
-  CPPUNIT_TEST(test_equals);
-  CPPUNIT_TEST(test_starts_with);
-  CPPUNIT_TEST(test_ends_with);
-  CPPUNIT_TEST(test_contains);
-  CPPUNIT_TEST(test_substr);
-  CPPUNIT_TEST(test_split);
-  CPPUNIT_TEST(test_join);
-  CPPUNIT_TEST(test_pad);
-  CPPUNIT_TEST(test_strip);
-  CPPUNIT_TEST(test_map);
-  CPPUNIT_TEST(test_replace);
-  CPPUNIT_TEST(test_invalid_arguments);
-  CPPUNIT_TEST(test_config_syntax);
-
-  CPPUNIT_TEST_SUITE_END();
-
-public:
-  void setUp();
-  void tearDown();
-
-  void test_length();
-  void test_equals();
-  void test_starts_with();
-  void test_ends_with();
-  void test_contains();
-  void test_substr();
-  void test_split();
-  void test_join();
-  void test_pad();
-  void test_strip();
-  void test_map();
-  void test_replace();
-  void test_invalid_arguments();
-  void test_config_syntax();
-};

test/src/test_encryption_config.cc

@@ -0,0 +1,45 @@
+#include "config.h"
+
+#include "test/src/test_encryption_config.h"
+
+#include <torrent/runtime/encryption_policy.h>
+
+#include "encryption_config.h"
+
+CPPUNIT_TEST_SUITE_REGISTRATION(TestEncryptionConfig);
+
+void
+TestEncryptionConfig::test_default_policy() {
+  const auto policy = encryption_config::default_policy();
+
+  CPPUNIT_ASSERT(policy.handshake == encryption_config::Policy::Mode::allow);
+  CPPUNIT_ASSERT(policy.stream == encryption_config::Policy::Mode::allow);
+
+  CPPUNIT_ASSERT_EQUAL(std::string("handshake=allow stream=allow"),
+                       encryption_config::summary_string(policy));
+}
+
+void
+TestEncryptionConfig::test_granular_round_trip() {
+  auto round_trip_handshake = [](const std::string& value) {
+    encryption_config::Policy policy;
+    encryption_config::apply_mode_value(policy, &encryption_config::Policy::handshake, value);
+    return encryption_config::mode_to_string(policy.handshake);
+  };
+
+  CPPUNIT_ASSERT_EQUAL(std::string("deny"), round_trip_handshake("deny"));
+  CPPUNIT_ASSERT_EQUAL(std::string("allow"), round_trip_handshake("allow"));
+  CPPUNIT_ASSERT_EQUAL(std::string("prefer"), round_trip_handshake("prefer"));
+  CPPUNIT_ASSERT_EQUAL(std::string("require"), round_trip_handshake("require"));
+
+  auto round_trip_stream = [](const std::string& value) {
+    encryption_config::Policy policy;
+    encryption_config::apply_mode_value(policy, &encryption_config::Policy::stream, value);
+    return encryption_config::mode_to_string(policy.stream);
+  };
+
+  CPPUNIT_ASSERT_EQUAL(std::string("deny"), round_trip_stream("deny"));
+  CPPUNIT_ASSERT_EQUAL(std::string("allow"), round_trip_stream("allow"));
+  CPPUNIT_ASSERT_EQUAL(std::string("prefer"), round_trip_stream("prefer"));
+  CPPUNIT_ASSERT_EQUAL(std::string("require"), round_trip_stream("require"));
+}

test/src/test_encryption_config.h

@@ -0,0 +1,12 @@
+#include "test/helpers/test_fixture.h"
+
+class TestEncryptionConfig : public test_fixture {
+  CPPUNIT_TEST_SUITE(TestEncryptionConfig);
+  CPPUNIT_TEST(test_default_policy);
+  CPPUNIT_TEST(test_granular_round_trip);
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+  void test_default_policy();
+  void test_granular_round_trip();
+};