PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-17 19:59:57 +00:00
Code Issues Releases Activity

fix last commit, it was broken

Browse Source
This commit is contained in:
Jeff Becker 2016-12-23 07:38:41 -05:00
parent 3dcc4e6bc1
commit 7be951b962
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
I2PTunnel.cpp
View File

@ -177,7 +177,7 @@ namespace client
{ {
if (bytes_transferred > 0) if (bytes_transferred > 0)
Write (m_StreamBuffer, bytes_transferred); // postpone termination Write (m_StreamBuffer, bytes_transferred); // postpone termination
else if (ecode == boost::asio::error::timed_out && && m_Stream && m_Stream->IsOpen ()) else if (ecode == boost::asio::error::timed_out && m_Stream && m_Stream->IsOpen ())
StreamReceive (); StreamReceive ();
else else
Terminate (); Terminate ();
@ -553,7 +553,6 @@ namespace client
++itr; ++itr;
} }
} }
<<<<<<< HEAD
void I2PUDPClientTunnel::ExpireStale(const uint64_t delta) { void I2PUDPClientTunnel::ExpireStale(const uint64_t delta) {
std::lock_guard<std::mutex> lock(m_SessionsMutex); std::lock_guard<std::mutex> lock(m_SessionsMutex);