Archives/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2024-11-11 19:10:55 +00:00
Code Issues Projects Releases Wiki Activity

read reamaining data from closed stream

Browse Source
This commit is contained in:
orignal 2014-12-26 08:55:24 -05:00
parent bbe403fb40
commit 64df22def8
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
AddressBook.cpp
View File

@ -462,17 +462,18 @@ namespace client
{ {
if (bytes_transferred) if (bytes_transferred)
response.write ((char *)buf, bytes_transferred); response.write ((char *)buf, bytes_transferred);
else if (ecode == boost::asio::error::timed_out || !stream->IsOpen ())
{ end = true;
if (ecode != boost::asio::error::timed_out || !stream->IsOpen ())
end = true;
}
newDataReceived.notify_all (); newDataReceived.notify_all ();
}, },
30); // wait for 30 seconds 30); // wait for 30 seconds
std::unique_lock<std::mutex> l(newDataReceivedMutex); std::unique_lock<std::mutex> l(newDataReceivedMutex);
newDataReceived.wait (l); newDataReceived.wait (l);
} }
// process remaining buffer
while (size_t len = stream->ReadSome (buf, 4096))
response.write ((char *)buf, len);
// parse response // parse response
std::string version; std::string version;
response >> version; // HTTP version response >> version; // HTTP version

3
Streaming.h
View File

@ -100,6 +100,7 @@ namespace stream
template<typename Buffer, typename ReceiveHandler> template<typename Buffer, typename ReceiveHandler>
void AsyncReceive (const Buffer& buffer, ReceiveHandler handler, int timeout = 0); void AsyncReceive (const Buffer& buffer, ReceiveHandler handler, int timeout = 0);
size_t ReadSome (uint8_t * buf, size_t len) { return ConcatenatePackets (buf, len); };
void Close (); void Close ();
void Cancel () { m_ReceiveTimer.cancel (); }; void Cancel () { m_ReceiveTimer.cancel (); };
@ -225,7 +226,7 @@ namespace stream
else else
// socket closed // socket closed
handler (m_IsReset ? boost::asio::error::make_error_code (boost::asio::error::connection_reset) : handler (m_IsReset ? boost::asio::error::make_error_code (boost::asio::error::connection_reset) :
boost::asio::error::make_error_code (boost::asio::error::operation_aborted), 0); boost::asio::error::make_error_code (boost::asio::error::operation_aborted), received);
} }
else else
// timeout expired // timeout expired