PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-02-09 18:04:15 +00:00
Code Issues Releases Activity

read incoming data util it's available

Browse Source
This commit is contained in:
orignal 2014-12-25 10:42:49 -05:00
parent 66c2c7f789
commit 46ea2291fe
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
AddressBook.cpp
View File

@ -311,10 +311,14 @@ namespace client
std::string addr = s.substr(pos); std::string addr = s.substr(pos);
i2p::data::IdentityEx ident; i2p::data::IdentityEx ident;
ident.FromBase64(addr); if (ident.FromBase64(addr))
m_Addresses[name] = ident.GetIdentHash (); {
m_Storage->AddAddress (ident); m_Addresses[name] = ident.GetIdentHash ();
numAddresses++; m_Storage->AddAddress (ident);
numAddresses++;
}
else
LogPrint (eLogError, "Malformed address ", addr, " for ", name);
} }
} }
LogPrint (eLogInfo, numAddresses, " addresses processed"); LogPrint (eLogInfo, numAddresses, " addresses processed");
@ -453,17 +457,20 @@ namespace client
{ {
std::condition_variable newDataReceived; std::condition_variable newDataReceived;
std::mutex newDataReceivedMutex; std::mutex newDataReceivedMutex;
std::unique_lock<std::mutex> l(newDataReceivedMutex);
stream->AsyncReceive (boost::asio::buffer (buf, 4096), stream->AsyncReceive (boost::asio::buffer (buf, 4096),
[&](const boost::system::error_code& ecode, std::size_t bytes_transferred) [&](const boost::system::error_code& ecode, std::size_t bytes_transferred)
{ {
if (!ecode) if (bytes_transferred)
response.write ((char *)buf, bytes_transferred); response.write ((char *)buf, bytes_transferred);
else else
end = true; {
newDataReceived.notify_one (); if (ecode != boost::asio::error::timed_out || !stream->IsOpen ())
end = true;
}
newDataReceived.notify_all ();
}, },
30); // wait for 30 seconds 30); // wait for 30 seconds
std::unique_lock<std::mutex> l(newDataReceivedMutex);
newDataReceived.wait (l); newDataReceived.wait (l);
} }
// parse response // parse response