Call expires_after and async_wait inside Host::createTimer

Author: gumb0

libp2p/Host.cpp

@@ -1200,3 +1200,11 @@ void Host::forEachPeer(
             return;
 }
 
+std::unique_ptr<ba::steady_timer> Host::createTimer(std::chrono::seconds const& _expiryTime,
+    std::function<void(const boost::system::error_code& error)>&& _f)
+{
+    std::unique_ptr<ba::steady_timer> timer{new ba::steady_timer{m_ioContext}};
+    timer->expires_after(_expiryTime);
+    timer->async_wait(_f);
+    return timer;
+}

libp2p/Host.h

@@ -266,10 +266,10 @@ class Host: public Worker
 
     std::shared_ptr<CapabilityHostFace> capabilityHost() const { return m_capabilityHost; }
 
-    std::shared_ptr<ba::steady_timer> createTimer()
-    {
-        return std::make_shared<ba::steady_timer>(m_ioContext);
-    }
+    /// Execute work on the network thread after @a _expiryTime delay.
+    /// Returned timer should be kept alive until delay is over.
+    std::unique_ptr<ba::steady_timer> createTimer(std::chrono::seconds const& _expiryTime,
+        std::function<void(const boost::system::error_code& error)>&& _f);
 
 protected:
     /*

libp2p/Session.cpp

@@ -299,23 +299,24 @@ void Session::disconnect(DisconnectReason _reason)
     RLPStream s;
     prep(s, DisconnectPacket, 1) << (int)_reason;
     sealAndSend(s);
-    auto disconnectTimer = m_server->createTimer();
+
     auto self(shared_from_this());
-    disconnectTimer->expires_after(std::chrono::seconds(2));
-    disconnectTimer->async_wait([self, this, _reason](boost::system::error_code) {
-        bi::tcp::socket& socket = m_socket->ref();
-        if (socket.is_open())
-            try
-            {
-                boost::system::error_code ec;
-                LOG(m_netLoggerDetail) << "Closing (" << reasonOf(_reason) << ") connection with";
-                socket.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ec);
-                socket.close();
-            }
-            catch (...)
-            {
-            }
-    });
+    m_disconnectTimer = m_server->createTimer(
+        std::chrono::seconds(2), [self, this, _reason](boost::system::error_code) {
+            bi::tcp::socket& socket = m_socket->ref();
+            if (socket.is_open())
+                try
+                {
+                    boost::system::error_code ec;
+                    LOG(m_netLoggerDetail)
+                        << "Closing (" << reasonOf(_reason) << ") connection with";
+                    socket.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ec);
+                    socket.close();
+                }
+                catch (...)
+                {
+                }
+        });
 
     drop(_reason);
 }

libp2p/Session.h

@@ -177,6 +177,8 @@ class Session: public SessionFace, public std::enable_shared_from_this<SessionFa
 
     std::set<std::string> m_disabledCapabilities;
 
+    std::unique_ptr<ba::steady_timer> m_disconnectTimer;
+
     std::string m_logSuffix;
 
     Logger m_netLogger{createLogger(VerbosityDebug, "net")};