Rename settings() to network_settings().

include/bitcoin/network/net.hpp

@@ -62,7 +62,10 @@ class BCT_API net
 
     DELETE_COPY_MOVE(net);
 
-    /// Construct an instance.
+    /// Construct an instance from config.
+    net(const configuration& config, const logger& log) NOEXCEPT;
+
+    /// Construct an instance from settings (deprecated).
     net(const settings& settings, const logger& log) NOEXCEPT;
 
     /// Calls close().

include/bitcoin/network/protocols/protocol.hpp

@@ -182,7 +182,7 @@ class BCT_API protocol
     virtual uint64_t nonce() const NOEXCEPT;
 
     /// Network settings.
-    virtual const network::settings& settings() const NOEXCEPT;
+    virtual const network::settings& network_settings() const NOEXCEPT;
 
     /// Channel identifier (for broadcast identification).
     virtual uint64_t identifier() const NOEXCEPT;

include/bitcoin/network/protocols/protocol_rpc.hpp

@@ -29,13 +29,13 @@
 namespace libbitcoin {
 namespace network {
 
-template <typename Interface>
+template <typename Channel>
 class protocol_rpc
  : public protocol
 {
 public:
-    typedef std::shared_ptr<protocol_rpc<Interface>> ptr;
-    using channel_t = channel_rpc<Interface>;
+    typedef std::shared_ptr<protocol_rpc<Channel>> ptr;
+    using channel_t = Channel;
     using options_t = channel_t::options_t;
 
 protected:
@@ -65,8 +65,8 @@ class protocol_rpc
 } // namespace network
 } // namespace libbitcoin
 
-#define TEMPLATE template <typename Interface>
-#define CLASS protocol_rpc<Interface>
+#define TEMPLATE template <typename Channel>
+#define CLASS protocol_rpc<Channel>
 
 #include <bitcoin/network/impl/protocols/protocol_rpc.ipp>
 

include/bitcoin/network/sessions/session.hpp

@@ -130,7 +130,7 @@ class BCT_API session
     /// -----------------------------------------------------------------------
 
     /// Access network configuration settings.
-    const network::settings& settings() const NOEXCEPT;
+    const network::settings& network_settings() const NOEXCEPT;
 
     /// Arbitrary identifier of the session (for net subscriber).
     uint64_t identifier() const NOEXCEPT;

include/bitcoin/network/settings.hpp

@@ -260,6 +260,19 @@ struct BCT_API settings
         const messages::peer::address_item& item) const NOEXCEPT;
 };
 
+/// Network configuration, thread safe.
+class BCT_API configuration
+{
+public:
+    inline configuration(system::chain::selection context) NOEXCEPT
+      : network(context)
+    {
+    }
+
+    /// Settings.
+    network::settings network;
+};
+
 } // namespace network
 } // namespace libbitcoin
 

src/net.cpp

@@ -81,7 +81,7 @@ connectors_ptr net::create_connectors(size_t count) NOEXCEPT
     const auto connects = to_shared<connectors>();
     connects->reserve(count);
 
-    const auto maximum = settings_.outbound.maximum_request;
+    const auto maximum = network_settings().outbound.maximum_request;
     for (size_t connect{}; connect < count; ++connect)
         connects->push_back(create_connector(maximum));
 
@@ -92,15 +92,15 @@ connectors_ptr net::create_connectors(size_t count) NOEXCEPT
 connector::ptr net::create_connector(size_t maximum) NOEXCEPT
 {
     return emplace_shared<connector>(log, strand(), service(),
-        settings_.connect_timeout(), maximum, connect_suspended_);
+        network_settings().connect_timeout(), maximum, connect_suspended_);
 }
 
 // seed
 connector::ptr net::create_connector() NOEXCEPT
 {
     return emplace_shared<connector>(log, strand(), service(),
-        settings_.outbound.seeding_timeout(),
-        settings_.outbound.maximum_request, connect_suspended_);
+        network_settings().outbound.seeding_timeout(),
+        network_settings().outbound.maximum_request, connect_suspended_);
 }
 
 // Start sequence.
@@ -168,7 +168,7 @@ void net::do_run(const result_handler& handler) NOEXCEPT
     }
 
     // Start manual connections.
-    for (const auto& peer: settings_.manual.peers)
+    for (const auto& peer: network_settings().manual.peers)
         do_connect(peer);
 
     // Start inbound connections.
@@ -581,7 +581,7 @@ bool net::store_nonce(const channel_peer& channel) NOEXCEPT
 {
     BC_ASSERT(stranded());
 
-    if (settings_.inbound.enable_loopback || channel.inbound())
+    if (network_settings().inbound.enable_loopback || channel.inbound())
         return true;
 
     if (!nonces_.insert(channel.nonce()).second)
@@ -597,7 +597,7 @@ bool net::unstore_nonce(const channel_peer& channel) NOEXCEPT
 {
     BC_ASSERT(stranded());
 
-    if (settings_.inbound.enable_loopback || channel.inbound())
+    if (network_settings().inbound.enable_loopback || channel.inbound())
         return true;
 
     if (!to_bool(nonces_.erase(channel.nonce())))
@@ -613,7 +613,7 @@ bool net::is_loopback(const channel_peer& channel) const NOEXCEPT
 {
     BC_ASSERT(stranded());
 
-    if (settings_.inbound.enable_loopback || !channel.inbound())
+    if (network_settings().inbound.enable_loopback || !channel.inbound())
         return false;
 
     return to_bool(nonces_.count(channel.peer_version()->nonce));

src/protocols/protocol.cpp

@@ -144,9 +144,9 @@ uint64_t protocol::nonce() const NOEXCEPT
     return channel_->nonce();
 }
 
-const network::settings& protocol::settings() const NOEXCEPT
+const network::settings& protocol::network_settings() const NOEXCEPT
 {
-    return session_->settings();
+    return session_->network_settings();
 }
 
 uint64_t protocol::identifier() const NOEXCEPT

src/protocols/protocol_address_in_209.cpp

@@ -75,7 +75,7 @@ void protocol_address_in_209::start() NOEXCEPT
 address::cptr protocol_address_in_209::filter(
     const address_items& items) const NOEXCEPT
 {
-    const size_t cap = settings().outbound.host_pool_capacity;
+    const size_t cap = network_settings().outbound.host_pool_capacity;
     const size_t gap = cap - address_count();
 
     // Take at least the gap or what we can get.
@@ -96,7 +96,7 @@ address::cptr protocol_address_in_209::filter(
     addresses.resize(select);
     std::erase_if(addresses, [&](const auto& address) NOEXCEPT
     {
-        return settings().excluded(address);
+        return network_settings().excluded(address);
     });
 
     return message;

src/protocols/protocol_address_out_209.cpp

@@ -56,7 +56,7 @@ void protocol_address_out_209::start() NOEXCEPT
         return;
 
     // Advertise self if configured for inbound and with self address(es).
-    if (settings().inbound.advertise())
+    if (network_settings().inbound.advertise())
     {
         SEND(selfs(), handle_send, _1);
     }

src/protocols/protocol_peer.cpp

@@ -83,8 +83,8 @@ void protocol_peer::set_negotiated_version(uint32_t value) NOEXCEPT
 address protocol_peer::selfs() const NOEXCEPT
 {
     const auto time_now = unix_time();
-    const auto services = settings().services_maximum;
-    const auto& selfs = settings().inbound.selfs;
+    const auto services = network_settings().services_maximum;
+    const auto& selfs = network_settings().inbound.selfs;
 
     address message{};
     message.addresses.reserve(selfs.size());

src/protocols/protocol_ping_106.cpp

@@ -39,7 +39,7 @@ protocol_ping_106::protocol_ping_106(const session::ptr& session,
     const channel::ptr& channel) NOEXCEPT
   : protocol_peer(session, channel),
     timer_(std::make_shared<deadline>(session->log, channel->strand(),
-        session->settings().channel_heartbeat())),
+        session->network_settings().channel_heartbeat())),
     tracker<protocol_ping_106>(session->log)
 {
 }

src/protocols/protocol_seed_209.cpp

@@ -44,7 +44,7 @@ protocol_seed_209::protocol_seed_209(const session::ptr& session,
     const channel::ptr& channel) NOEXCEPT
   : protocol_peer(session, channel),
     timer_(std::make_shared<deadline>(session->log, channel->strand(),
-        session->settings().outbound.seeding_timeout())),
+        session->network_settings().outbound.seeding_timeout())),
     tracker<protocol_seed_209>(session->log)
 {
 }
@@ -117,7 +117,7 @@ void protocol_seed_209::handle_send_get_address(const code& ec) NOEXCEPT
 address::cptr protocol_seed_209::filter(
     const address_items& items) const NOEXCEPT
 {
-    const size_t cap = settings().outbound.host_pool_capacity;
+    const size_t cap = network_settings().outbound.host_pool_capacity;
     const size_t gap = cap - address_count();
 
     // Take at least the gap or what we can get.
@@ -138,7 +138,7 @@ address::cptr protocol_seed_209::filter(
     addresses.resize(select);
     std::erase_if(addresses, [&](const auto& address) NOEXCEPT
     {
-        return settings().excluded(address);
+        return network_settings().excluded(address);
     });
 
     return message;
@@ -208,7 +208,7 @@ bool protocol_seed_209::handle_receive_get_address(const code& ec,
         return false;
 
     // Advertise self if configured for inbound and with self address(es).
-    if (settings().inbound.advertise())
+    if (network_settings().inbound.advertise())
     {
         SEND(selfs(), handle_send_address, _1);
         return true;

src/protocols/protocol_version_106.cpp

@@ -45,8 +45,8 @@ using namespace std::placeholders;
 protocol_version_106::protocol_version_106(const session::ptr& session,
     const channel::ptr& channel) NOEXCEPT
   : protocol_version_106(session, channel,
-      session->settings().services_minimum,
-      session->settings().services_maximum)
+      session->network_settings().services_minimum,
+      session->network_settings().services_maximum)
 {
 }
 
@@ -57,14 +57,14 @@ protocol_version_106::protocol_version_106(const session::ptr& session,
     uint64_t maximum_services) NOEXCEPT
   : protocol_peer(session, channel),
     inbound_(channel->inbound()),
-    minimum_version_(session->settings().protocol_minimum),
-    maximum_version_(session->settings().protocol_maximum),
+    minimum_version_(session->network_settings().protocol_minimum),
+    maximum_version_(session->network_settings().protocol_maximum),
     minimum_services_(minimum_services),
     maximum_services_(maximum_services),
-    invalid_services_(session->settings().invalid_services),
-    maximum_skew_minutes_(session->settings().maximum_skew_minutes),
+    invalid_services_(session->network_settings().invalid_services),
+    maximum_skew_minutes_(session->network_settings().maximum_skew_minutes),
     timer_(std::make_shared<deadline>(session->log, channel->strand(),
-        session->settings().channel_handshake())),
+        session->network_settings().channel_handshake())),
     tracker<protocol_version_106>(session->log)
 {
 }
@@ -110,12 +110,12 @@ messages::peer::version protocol_version_106::version_factory(
         {
             timestamp,
             maximum_services_,
-            settings().inbound.first_self().to_ip_address(),
-            settings().inbound.first_self().port(),
+            network_settings().inbound.first_self().to_ip_address(),
+            network_settings().inbound.first_self().port(),
         },
 
         nonce(),
-        settings().user_agent,
+        network_settings().user_agent,
         possible_narrow_cast<uint32_t>(start_height()),
         relay
     };

src/protocols/protocol_version_70001.cpp

@@ -38,9 +38,9 @@ using namespace network::messages::peer;
 protocol_version_70001::protocol_version_70001(const session::ptr& session,
     const channel::ptr& channel) NOEXCEPT
   : protocol_version_70001(session, channel,
-        session->settings().services_minimum,
-        session->settings().services_maximum,
-        session->settings().enable_relay)
+        session->network_settings().services_minimum,
+        session->network_settings().services_maximum,
+        session->network_settings().enable_relay)
 {
 }
 

src/protocols/protocol_version_70002.cpp

@@ -39,9 +39,9 @@ using namespace std::placeholders;
 protocol_version_70002::protocol_version_70002(const session::ptr& session,
     const channel::ptr& channel) NOEXCEPT
   : protocol_version_70002(session, channel,
-        session->settings().services_minimum,
-        session->settings().services_maximum,
-        session->settings().enable_relay)
+        session->network_settings().services_minimum,
+        session->network_settings().services_maximum,
+        session->network_settings().enable_relay)
 {
 }
 

src/protocols/protocol_version_70016.cpp

@@ -43,10 +43,10 @@ using namespace std::placeholders;
 protocol_version_70016::protocol_version_70016(const session::ptr& session,
     const channel::ptr& channel) NOEXCEPT
   : protocol_version_70016(session, channel,
-        session->settings().services_minimum,
-        session->settings().services_maximum,
-        session->settings().enable_relay,
-        session->settings().enable_reject)
+        session->network_settings().services_minimum,
+        session->network_settings().services_maximum,
+        session->network_settings().enable_relay,
+        session->network_settings().enable_reject)
 {
 }
 

src/sessions/session.cpp

@@ -251,7 +251,7 @@ void session::do_handle_channel_stopped(const code& ec,
 void session::defer(result_handler&& handler) NOEXCEPT
 {
     BC_ASSERT(stranded());
-    defer(settings().retry_timeout(), std::move(handler));
+    defer(network_settings().retry_timeout(), std::move(handler));
 }
 
 void session::defer(const steady_clock::duration& timeout,
@@ -387,7 +387,7 @@ asio::strand& session::strand() NOEXCEPT
     return network_.strand();
 }
 
-const network::settings& session::settings() const NOEXCEPT
+const network::settings& session::network_settings() const NOEXCEPT
 {
     return network_.network_settings();
 }