Merge remote-tracking branch 'purple/openssl'

This commit is contained in:
Jeff Becker 2016-12-31 08:42:42 -05:00
commit 88f9b69e2a
7 changed files with 49 additions and 32 deletions

View file

@ -464,7 +464,7 @@ namespace transport
{
RAND_bytes((uint8_t *)&m_SentRelayTag, 4);
if (!m_SentRelayTag) m_SentRelayTag = 1;
m_Server.AddRelay (m_SentRelayTag, m_RemoteEndpoint);
m_Server.AddRelay (m_SentRelayTag, shared_from_this ());
}
htobe32buf (payload, m_SentRelayTag);
payload += 4; // relay tag