jiigen666/i2pd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeff Becker
2018-01-15 08:25:58 -05:00
parent 207212557e fd1aeeac92
commit 43a751ee0b
124 changed files with 3097 additions and 3100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libi2pd_client/SAM.cpp
View File

@@ -247,7 +247,7 @@ namespace client
if (!strcmp (m_Buffer, SAM_SESSION_CREATE))
ProcessSessionCreate (separator + 1, bytes_transferred - (separator - m_Buffer) - 1);
else if (!strcmp (m_Buffer, SAM_STREAM_CONNECT))
ProcessStreamConnect (separator + 1, bytes_transferred - (separator - m_Buffer) - 1, bytes_transferred - (eol - m_Buffer) - 1);
ProcessStreamConnect (separator + 1, bytes_transferred - (separator - m_Buffer) - 1, bytes_transferred - (eol - m_Buffer) - 1);
else if (!strcmp (m_Buffer, SAM_STREAM_ACCEPT))
ProcessStreamAccept (separator + 1, bytes_transferred - (separator - m_Buffer) - 1);
else if (!strcmp (m_Buffer, SAM_DEST_GENERATE))
@@ -413,11 +413,11 @@ namespace client
if (session)
{
if (rem > 0) // handle follow on data
{
{
memmove (m_Buffer, buf + len + 1, rem); // buf is a pointer to m_Buffer's content
m_BufferOffset = rem;
m_BufferOffset = rem;
}
else
else
m_BufferOffset = 0;
auto dest = std::make_shared<i2p::data::IdentityEx> ();
@@ -714,7 +714,7 @@ namespace client
}
else // no more data
Terminate ("no more data");
}
}
}
}
@@ -763,7 +763,7 @@ namespace client
{
auto s = shared_from_this ();
m_Owner.GetService ().post ([s] { s->Terminate ("stream read error (op aborted)"); });
}
}
}
else
{
@@ -997,7 +997,7 @@ namespace client
{
// extract signature type
i2p::data::SigningKeyType signatureType = i2p::data::SIGNING_KEY_TYPE_DSA_SHA1;
i2p::data::CryptoKeyType cryptoType = i2p::data::CRYPTO_KEY_TYPE_ELGAMAL;
i2p::data::CryptoKeyType cryptoType = i2p::data::CRYPTO_KEY_TYPE_ELGAMAL;
if (params)
{
auto it = params->find (SAM_PARAM_SIGNATURE_TYPE);