Merge remote-tracking branch 'purple/openssl' into websocks

This commit is contained in:
Jeff Becker 2016-12-31 17:08:49 -05:00
commit c5f8e2249e
4 changed files with 9 additions and 50 deletions

View file

@ -464,7 +464,6 @@ namespace transport
{
RAND_bytes((uint8_t *)&m_SentRelayTag, 4);
if (!m_SentRelayTag) m_SentRelayTag = 1;
m_Server.AddRelay (m_SentRelayTag, shared_from_this ());
}
htobe32buf (payload, m_SentRelayTag);
payload += 4; // relay tag
@ -893,6 +892,8 @@ namespace transport
transports.PeerConnected (shared_from_this ());
if (m_IsPeerTest)
SendPeerTest ();
if (m_SentRelayTag)
m_Server.AddRelay (m_SentRelayTag, shared_from_this ());
m_LastActivityTimestamp = i2p::util::GetSecondsSinceEpoch ();
}