ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +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

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 <>