Merge remote-tracking branch 'purple/openssl' into i2cp-session-reconfig

This commit is contained in:
Jeff Becker 2018-02-26 07:58:03 -05:00
commit 2f7cfddfc4
No known key found for this signature in database
GPG key ID: F357B3B42F6F9B05
166 changed files with 5382 additions and 4393 deletions

View file

@ -310,13 +310,13 @@ namespace tunnel
}
if (!failed)
{
uint32_t msgID;
uint32_t msgID;
RAND_bytes ((uint8_t *)&msgID, 4);
{
std::unique_lock<std::mutex> l(m_TestsMutex);
m_Tests[msgID] = std::make_pair (*it1, *it2);
m_Tests[msgID] = std::make_pair (*it1, *it2);
}
(*it1)->SendTunnelDataMsg ((*it2)->GetNextIdentHash (), (*it2)->GetNextTunnelID (),
(*it1)->SendTunnelDataMsg ((*it2)->GetNextIdentHash (), (*it2)->GetNextTunnelID (),
CreateDeliveryStatusMsg (msgID));
++it1; ++it2;
}