From 250af7f24748344762b88a2ebf97502e819af5f1 Mon Sep 17 00:00:00 2001 From: orignal Date: Sun, 5 Apr 2015 13:56:41 -0400 Subject: [PATCH] fixed race condition --- NetDb.h | 2 +- Streaming.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NetDb.h b/NetDb.h index c912049b..7b515e2a 100644 --- a/NetDb.h +++ b/NetDb.h @@ -90,7 +90,7 @@ namespace data void Reseed (); - // for web interface and stats + // for web interface int GetNumRouters () const { return m_RouterInfos.size (); }; int GetNumFloodfills () const { return m_Floodfills.size (); }; int GetNumLeaseSets () const { return m_LeaseSets.size (); }; diff --git a/Streaming.h b/Streaming.h index d1de1e41..ff1527f9 100644 --- a/Streaming.h +++ b/Streaming.h @@ -235,8 +235,8 @@ namespace stream s->HandleReceiveTimer (boost::asio::error::make_error_code (boost::asio::error::operation_aborted), buffer, handler); else { - m_ReceiveTimer.expires_from_now (boost::posix_time::seconds(timeout)); - m_ReceiveTimer.async_wait ([=](const boost::system::error_code& ecode) + s->m_ReceiveTimer.expires_from_now (boost::posix_time::seconds(timeout)); + s->m_ReceiveTimer.async_wait ([=](const boost::system::error_code& ecode) { s->HandleReceiveTimer (ecode, buffer, handler); }); } });