Browse Source

cleanup acceptor for AcceptOnce

pull/839/head
orignal 8 years ago
parent
commit
1f76dc78d8
  1. 14
      Streaming.cpp
  2. 2
      Streaming.h

14
Streaming.cpp

@ -1091,16 +1091,18 @@ namespace stream @@ -1091,16 +1091,18 @@ namespace stream
}
else // we must save old acceptor and set it back
{
auto oldAcceptor = m_Acceptor;
m_Acceptor = [acceptor, oldAcceptor, this](std::shared_ptr<Stream> stream)
{
acceptor (stream); // m_Acceptor might be set after
m_Acceptor = oldAcceptor; // so we must restore old one before
};
m_Acceptor = std::bind (&StreamingDestination::AcceptOnceAcceptor, this,
std::placeholders::_1, acceptor, m_Acceptor);
}
});
}
void StreamingDestination::AcceptOnceAcceptor (std::shared_ptr<Stream> stream, Acceptor acceptor, Acceptor prev)
{
m_Acceptor = prev;
acceptor (stream);
}
void StreamingDestination::HandlePendingIncomingTimer (const boost::system::error_code& ecode)
{
if (ecode != boost::asio::error::operation_aborted)

2
Streaming.h

@ -281,6 +281,8 @@ namespace stream @@ -281,6 +281,8 @@ namespace stream
private:
void AcceptOnceAcceptor (std::shared_ptr<Stream> stream, Acceptor acceptor, Acceptor prev);
void HandleNextPacket (Packet * packet);
std::shared_ptr<Stream> CreateNewIncomingStream ();
void HandlePendingIncomingTimer (const boost::system::error_code& ecode);

Loading…
Cancel
Save