PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-02-02 02:44:15 +00:00
Code Issues Releases Activity

add RouterInfo block before RelayIntro

Browse Source
This commit is contained in:
orignal 2022-05-06 15:02:09 -04:00
parent c22ab7e1fc
commit 1a1871e8cd
2 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
libi2pd/SSU2.cpp
View File

@ -473,25 +473,12 @@ namespace transport
memset (header.h.flags, 0, 3); memset (header.h.flags, 0, 3);
header.h.flags[0] = 1; // frag, total fragments always 1 header.h.flags[0] = 1; // frag, total fragments always 1
// payload // payload
uint8_t payload[SSU2_MTU]; const size_t maxPayloadSize = SSU2_MAX_PAYLOAD_SIZE - 48; // part 2
size_t payloadSize = i2p::context.GetRouterInfo ().GetBufferLen (); uint8_t payload[maxPayloadSize + 16];
payload[0] = eSSU2BlkRouterInfo; size_t payloadSize = CreateRouterInfoBlock (payload, maxPayloadSize, i2p::context.GetSharedRouterInfo ());
if (payloadSize < 1024) // TODO: check is RouterInfo doesn't fit and split by two fragments
{ if (payloadSize < maxPayloadSize)
memcpy (payload + 5, i2p::context.GetRouterInfo ().GetBuffer (), payloadSize); payloadSize += CreatePaddingBlock (payload + payloadSize, maxPayloadSize - payloadSize);
payload[3] = 0; // flag
}
else
{
i2p::data::GzipDeflator deflator;
payloadSize = deflator.Deflate (i2p::context.GetRouterInfo ().GetBuffer (),
i2p::context.GetRouterInfo ().GetBufferLen (), payload + 5, SSU2_MTU -5);
payload[3] = SSU2_ROUTER_INFO_FLAG_GZIP; // flag
}
htobe16buf (payload + 1, payloadSize + 2);
payload[4] = 1; // frag
payloadSize += 5;
payloadSize += CreatePaddingBlock (payload + payloadSize, SSU2_MTU - payloadSize);
// KDF for Session Confirmed part 1 // KDF for Session Confirmed part 1
m_NoiseState->MixHash (header.buf, 16); // h = SHA256(h || header) m_NoiseState->MixHash (header.buf, 16); // h = SHA256(h || header)
// Encrypt part 1 // Encrypt part 1
@ -1160,9 +1147,14 @@ namespace transport
std::make_pair (shared_from_this (), i2p::util::GetSecondsSinceEpoch ()) ); std::make_pair (shared_from_this (), i2p::util::GetSecondsSinceEpoch ()) );
// send relay intro to Charlie // send relay intro to Charlie
uint8_t payload[SSU2_MTU]; auto r = i2p::data::netdb.FindRouter (GetRemoteIdentity ()->GetIdentHash ()); // Alice's RI
size_t payloadSize = CreateRelayIntroBlock (payload, SSU2_MTU, buf + 1, len -1); uint8_t payload[SSU2_MAX_PAYLOAD_SIZE];
payloadSize += CreatePaddingBlock (payload + payloadSize, SSU2_MTU - payloadSize); size_t payloadSize = r ? CreateRouterInfoBlock (payload, SSU2_MAX_PAYLOAD_SIZE - len - 32, r) : 0;
if (!payloadSize && r)
SendFragmentedMessage (CreateDatabaseStoreMsg (r));
payloadSize += CreateRelayIntroBlock (payload + payloadSize, SSU2_MAX_PAYLOAD_SIZE - payloadSize, buf + 1, len -1);
if (payloadSize < SSU2_MAX_PAYLOAD_SIZE)
payloadSize += CreatePaddingBlock (payload + payloadSize, SSU2_MAX_PAYLOAD_SIZE - payloadSize);
session->SendData (payload, payloadSize); session->SendData (payload, payloadSize);
} }
@ -1189,9 +1181,9 @@ namespace transport
} }
// send relay response to Bob // send relay response to Bob
uint8_t payload[SSU2_MTU]; uint8_t payload[SSU2_MAX_PAYLOAD_SIZE];
size_t payloadSize = CreateRelayResponseBlock (payload, SSU2_MTU, bufbe32toh (buf + 33)); size_t payloadSize = CreateRelayResponseBlock (payload, SSU2_MAX_PAYLOAD_SIZE, bufbe32toh (buf + 33));
payloadSize += CreatePaddingBlock (payload + payloadSize, SSU2_MTU - payloadSize); payloadSize += CreatePaddingBlock (payload + payloadSize, SSU2_MAX_PAYLOAD_SIZE - payloadSize);
SendData (payload, payloadSize); SendData (payload, payloadSize);
// send HolePunch // send HolePunch
@ -1308,6 +1300,28 @@ namespace transport
return size + 3; return size + 3;
} }
size_t SSU2Session::CreateRouterInfoBlock (uint8_t * buf, size_t len, std::shared_ptr<const i2p::data::RouterInfo> r)
{
if (!r || len < 5) return 0;
buf[0] = eSSU2BlkRouterInfo;
size_t size = r->GetBufferLen ();
if (size + 5 < len)
{
memcpy (buf + 5, r->GetBuffer (), size);
buf[3] = 0; // flag
}
else
{
i2p::data::GzipDeflator deflator;
size = deflator.Deflate (r->GetBuffer (), r->GetBufferLen (), buf + 5, len - 5);
if (!size) return 0; // doesn't fit
buf[3] = SSU2_ROUTER_INFO_FLAG_GZIP; // flag
}
htobe16buf (buf + 1, size + 2); // size
buf[4] = 1; // frag
return size + 5;
}
size_t SSU2Session::CreateAckBlock (uint8_t * buf, size_t len) size_t SSU2Session::CreateAckBlock (uint8_t * buf, size_t len)
{ {
if (len < 8) return 0; if (len < 8) return 0;

1
libi2pd/SSU2.h
View File

@ -203,6 +203,7 @@ namespace transport
void HandleRelayResponse (const uint8_t * buf, size_t len); void HandleRelayResponse (const uint8_t * buf, size_t len);
size_t CreateAddressBlock (uint8_t * buf, size_t len, const boost::asio::ip::udp::endpoint& ep); size_t CreateAddressBlock (uint8_t * buf, size_t len, const boost::asio::ip::udp::endpoint& ep);
size_t CreateRouterInfoBlock (uint8_t * buf, size_t len, std::shared_ptr<const i2p::data::RouterInfo> r);
size_t CreateAckBlock (uint8_t * buf, size_t len); size_t CreateAckBlock (uint8_t * buf, size_t len);
size_t CreatePaddingBlock (uint8_t * buf, size_t len, size_t minSize = 0); size_t CreatePaddingBlock (uint8_t * buf, size_t len, size_t minSize = 0);
size_t CreateI2NPBlock (uint8_t * buf, size_t len, std::shared_ptr<I2NPMessage>&& msg); size_t CreateI2NPBlock (uint8_t * buf, size_t len, std::shared_ptr<I2NPMessage>&& msg);