Merge pull request #421 from evoskuil/master

Have session use p2p::create_key().
libbitcoin · Jul 31, 2024 · 014414d · 014414d
2 parents a48593f + e07ed8f
commit 014414d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/include/bitcoin/network/p2p.hpp b/include/bitcoin/network/p2p.hpp
@@ -196,6 +196,10 @@ class BCT_API p2p
         return session;
     }
 
+    /// Create unique identifier (sequential), requires strand.
+    virtual object_key create_key() NOEXCEPT;
+
+    /// Sequences.
     virtual void do_start(const result_handler& handler) NOEXCEPT;
     virtual void do_run(const result_handler& handler) NOEXCEPT;
     virtual void do_close() NOEXCEPT;
@@ -234,7 +238,6 @@ class BCT_API p2p
 private:
     code subscribe_close(stop_handler&& handler, object_key key) NOEXCEPT;
     connectors_ptr create_connectors(size_t count) NOEXCEPT;
-    object_key create_key() NOEXCEPT;
 
     virtual code start_hosts() NOEXCEPT;
     virtual code stop_hosts() NOEXCEPT;

diff --git a/include/bitcoin/network/sessions/session.hpp b/include/bitcoin/network/sessions/session.hpp
@@ -266,8 +266,7 @@ class BCT_API session
     const uint64_t identifier_;
     std::atomic_bool stopped_{ true };
 
-    // These are not thread safe.
-    object_key keys_{};
+    // This is not thread safe.
     subscriber stop_subscriber_;
 };
 

diff --git a/src/sessions/session.cpp b/src/sessions/session.cpp
@@ -447,22 +447,16 @@ channel::ptr session::create_channel(const socket::ptr& socket,
     static memory memory{};
 
     // Channel id must be created using create_key().
-    const auto id = create_key();
-    return std::make_shared<channel>(memory, log, socket, settings(), id, quiet);
+    return std::make_shared<channel>(memory, log, socket, settings(),
+        create_key(), quiet);
 }
 
 // At one object/session/ns, this overflows in ~585 years (and handled).
 session::object_key session::create_key() NOEXCEPT
 {
     BC_ASSERT_MSG(stranded(), "strand");
 
-    if (is_zero(++keys_))
-    {
-        BC_ASSERT_MSG(false, "overflow");
-        LOGF("Session object overflow.");
-    }
-
-    return keys_;
+    return network_.create_key();
 }
 
 // Properties.