ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix WebSockets treatment of ping timer:

Browse Source 
This solves a problem that caused a hang on shutdown related to
the lifetime of the ping timer completion handlers used in WebSockets.

* Turn the ping timer back on
* Use std::weak_ptr for WebSockets timer callbacks.
* Disable WebSocket pings if frequency in the .cfg is non-positive.
This commit is contained in:
Tom Ritchford
2015-04-20 15:37:39 -04:00
committed by Vinnie Falco
parent 2dbb7301fb
commit 29d644e9d3
4 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ripple/websocket/Connection.h
View File

@@ -139,7 +139,6 @@ ConnectionImpl <WebSocket>::ConnectionImpl (
, m_handler (handler)
, m_connection (cpConnection)
{
setPingTimer ();
}
template <class WebSocket>

1
src/ripple/websocket/Handler.h
View File

@@ -208,6 +208,7 @@ public:
cpClient,
makeBeastEndpoint (remoteEndpoint),
WebSocket::getStrand (*cpClient).get_io_service ());
connection->setPingTimer ();
auto result = mMap.emplace (cpClient, std::move (connection));
assert (result.second);

21
src/ripple/websocket/WebSocket02.cpp
View File

@@ -20,6 +20,7 @@
#include <ripple/websocket/WebSocket02.h>
#include <ripple/websocket/Handler.h>
#include <ripple/websocket/Server.h>
#include <beast/weak_fn.h>
// This file contains websocket::WebSocket02 implementations for the WebSocket
// generic functions as well as methods on Server and ConnectionImpl.
@@ -72,22 +73,22 @@ boost::asio::io_service::strand& WebSocket02::getStrand (Connection& con)
template <>
void ConnectionImpl <WebSocket02>::setPingTimer ()
{
#if 0
auto freq = getConfig ().WEBSOCKET_PING_FREQ;
if (freq <= 0)
return;
connection_ptr ptr = m_connection.lock ();
if (ptr)
{
this->m_pingTimer.expires_from_now (boost::posix_time::seconds
(getConfig ().WEBSOCKET_PING_FREQ));
this->m_pingTimer.expires_from_now (boost::posix_time::seconds (freq));
auto pt = [this] (boost::system::error_code const& e)
{
this->pingTimer (e);
};
this->m_pingTimer.async_wait (ptr->get_strand ().wrap (pt));
this->m_pingTimer.async_wait (
ptr->get_strand ().wrap (
std::bind (
beast::weak_fn (&ConnectionImpl <WebSocket02>::pingTimer,
shared_from_this()),
beast::asio::placeholders::error)));
}
#endif
}
template <>

14
src/ripple/websocket/WebSocket04.cpp
View File

@@ -22,6 +22,7 @@
#include <ripple/websocket/Server.h>
#include <boost/make_shared.hpp>
#include <beast/weak_fn.h>
namespace ripple {
namespace websocket {
@@ -114,16 +115,19 @@ EndpointPtr04 WebSocket04::makeEndpoint (HandlerPtr&& handler)
template <>
void ConnectionImpl <WebSocket04>::setPingTimer ()
{
auto freq = getConfig ().WEBSOCKET_PING_FREQ;
if (freq <= 0)
return;
if (auto con = m_connection.lock ())
{
auto t = boost::posix_time::seconds (getConfig ().WEBSOCKET_PING_FREQ);
auto t = boost::posix_time::seconds (freq);
auto ms = t.total_milliseconds();
con->set_timer (
ms,
[this] (WebSocket04::ErrorCode const& e)
{
this->pingTimer (e);
});
std::bind (
beast::weak_fn (&ConnectionImpl <WebSocket04>::pingTimer,
shared_from_this()),
beast::asio::placeholders::error));
}
}