mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd synced 2024-11-10 08:00:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

don't send own hash for peer test msg 1

Browse Source
This commit is contained in:
orignal 2022-06-02 18:23:51 -04:00
parent 84aec9fe31
commit a04abd304a
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libi2pd/SSU2.cpp
View File

@ -1576,14 +1576,20 @@ namespace transport
const uint8_t * routerHash, const uint8_t * signedData, size_t signedDataLen) const uint8_t * routerHash, const uint8_t * signedData, size_t signedDataLen)
{ {
buf[0] = eSSU2BlkPeerTest; buf[0] = eSSU2BlkPeerTest;
size_t payloadSize = 3/* msg, code, flag */ + 32/* router hash */ + signedDataLen; size_t payloadSize = 3/* msg, code, flag */ + signedDataLen;
if (routerHash) payloadSize += 32; // router hash
if (payloadSize + 3 > len) return 0; if (payloadSize + 3 > len) return 0;
htobe16buf (buf + 1, payloadSize); // size htobe16buf (buf + 1, payloadSize); // size
buf[3] = msg; // msg buf[3] = msg; // msg
buf[4] = 0; // code, TODO: buf[4] = 0; // code, TODO:
buf[5] = 0; //flag buf[5] = 0; //flag
memcpy (buf + 6, routerHash, 32); // router hash size_t offset = 6;
memcpy (buf + 38, signedData, signedDataLen); if (routerHash)
{
memcpy (buf + offset, routerHash, 32); // router hash
offset += 32;
}
memcpy (buf + offset, signedData, signedDataLen);
return payloadSize + 3; return payloadSize + 3;
} }
@ -1607,8 +1613,7 @@ namespace transport
s.Insert (GetRemoteIdentity ()->GetIdentHash (), 32); // bhash s.Insert (GetRemoteIdentity ()->GetIdentHash (), 32); // bhash
s.Insert (signedData, 7 + asz); // ver, nonce, ts, asz, Alice's endpoint s.Insert (signedData, 7 + asz); // ver, nonce, ts, asz, Alice's endpoint
s.Sign (i2p::context.GetPrivateKeys (), signedData + 7 + asz); s.Sign (i2p::context.GetPrivateKeys (), signedData + 7 + asz);
return CreatePeerTestBlock (buf, len, 1, i2p::context.GetIdentHash (), return CreatePeerTestBlock (buf, len, 1, nullptr, signedData, 7 + asz + i2p::context.GetIdentity ()->GetSignatureLen ());
signedData, 7 + asz + i2p::context.GetIdentity ()->GetSignatureLen ());
} }
std::shared_ptr<const i2p::data::RouterInfo> SSU2Session::ExtractRouterInfo (const uint8_t * buf, size_t size) std::shared_ptr<const i2p::data::RouterInfo> SSU2Session::ExtractRouterInfo (const uint8_t * buf, size_t size)