Stuff.

src/command_network.cc

@@ -10,6 +10,7 @@
 #include <torrent/net/http_stack.h>
 #include <torrent/net/socket_address.h>
 #include <torrent/runtime/network_config.h>
+#include <torrent/runtime/network_manager.h>
 #include <torrent/runtime/proxy_manager.h>
 #include <torrent/runtime/runtime.h>
 #include <torrent/runtime/socket_manager.h>
@@ -225,7 +226,8 @@ initialize_command_network() {
   CMD_VAR_BOOL    ("network.port_random", true);
   CMD_VAR_STRING  ("network.port_range",  "6881-6999");
 
-  CMD_ANY         ("network.listen.port",        [](auto, auto)                 { return torrent::runtime::listen_port(); });
+  CMD_ANY         ("network.listen.port",        [](auto, auto)                 { return torrent::runtime::network_manager()->listen_port(); });
+  CMD_ANY_VALUE_V ("network.listen.port.set",    [](auto, auto& value)          { return torrent::runtime::network_manager()->set_listen_port(value); });
   CMD_ANY         ("network.listen.backlog",     [nw_config](auto, auto)        { return nw_config->listen_backlog(); });
   CMD_ANY_VALUE_V ("network.listen.backlog.set", [nw_config](auto, auto& value) { return nw_config->set_listen_backlog(value); });
 

src/command_tracker.cc

@@ -142,7 +142,7 @@ initialize_command_tracker() {
       lt_log_print(torrent::LOG_DHT_ERROR, "dht.port.set is no longer supported, use dht.override_port.set", 0);
     });
   CMD2_ANY            ("dht.override_port",     [](auto, auto)        { return torrent::runtime::network_config()->override_dht_port(); });
-  CMD2_ANY_VALUE_V    ("dht.override_port.set", [](auto, auto& value) { return torrent::runtime::network_config()->set_override_dht_port(value); });
+  CMD2_ANY_VALUE_V    ("dht.override_port.set", [](auto, auto& value) { return torrent::runtime::network_manager()->set_dht_port(value); });
 
   CMD2_ANY_STRING     ("dht.add_node",          [](auto, auto& str)   { return apply_dht_add_node(str); });
   CMD2_ANY            ("dht.statistics",        [](auto, auto)        { return control->dht_manager()->dht_statistics(); });

src/main.cc

@@ -455,7 +455,9 @@ main(int argc, char** argv) {
     torrent::net_thread::http_stack()->set_user_agent(USER_AGENT);
     torrent::runtime::initialize_network();
 
-    control->core()->listen_open();
+    // TODO: Move to initialize_network().
+    if (torrent::runtime::listen_port() == 0)
+      control->core()->listen_open();
 
     // Load session torrents and perform scheduled tasks to ensure session torrents are loaded
     // before arg torrents.