dandri/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2026-08-06 23:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle Datagram2

Browse Source
This commit is contained in:
orignal
2025-07-21 21:19:53 -04:00
parent 49569d36e5
commit e47cc8495b
2 changed files with 76 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libi2pd/Datagram.cpp
+71 -1
View File
@@ -160,6 +160,76 @@ namespace datagram
LogPrint (eLogWarning, "DatagramDestination: no receiver for raw datagram");
}
void DatagramDestination::HandleDatagram2 (uint16_t fromPort, uint16_t toPort, const uint8_t * buf, size_t len,
i2p::garlic::ECIESX25519AEADRatchetSession * from)
{
if (len < 433)
{
LogPrint (eLogWarning, "Datagram: datagram2 is too short ", len);
return;
}
i2p::data::IdentityEx identity;
size_t identityLen = identity.FromBuffer (buf, len);
if (!identityLen) return;
size_t signatureLen = identity.GetSignatureLen ();
if (signatureLen + identityLen > len) return;
std::shared_ptr<i2p::data::LeaseSet> ls;
bool verified = false;
if (from)
{
ls = m_Owner->FindLeaseSet (identity.GetIdentHash ());
if (ls)
{
uint8_t staticKey[32];
ls->Encrypt (nullptr, staticKey);
if (!memcmp (from->GetRemoteStaticKey (), staticKey, 32))
verified = true;
else
{
LogPrint (eLogError, "Datagram: Remote LeaseSet static key mismatch for datagram2 from ",
identity.GetIdentHash ().ToBase32 ());
return;
}
}
}
if (!verified)
{
std::vector<uint8_t> signedData (len + 32 - identityLen - signatureLen);
memcpy (signedData.data (), identity.GetIdentHash (), 32);
memcpy (signedData.data () + 32, buf + identityLen, signedData.size () - 32);
if (!identity.Verify (signedData.data (), signedData.size (), buf + len - signatureLen))
{
LogPrint (eLogWarning, "Datagram: datagram2 signature verification failed");
return;
}
}
uint16_t flags = bufbe16toh (buf + identityLen);
size_t offset = identityLen + 2;
if (flags & DATAGRAM2_FLAG_OPTIONS)
offset += bufbe16toh (buf + offset) + 2;
if (offset > len - signatureLen)
{
LogPrint (eLogWarning, "Datagram: datagram2 is too short ", len - signatureLen, " expected ", offset);
return;
}
if (flags & DATAGRAM2_FLAG_OFFLINE_SIGNATURE)
{
LogPrint (eLogWarning, "Datagram: datagram2 offline signature is not supported");
return;
}
auto session = ObtainSession (identity.GetIdentHash());
session->SetVersion (eDatagramV2);
if (ls) session->SetRemoteLeaseSet (ls);
session->Ack();
auto r = FindReceiver(toPort);
if(r)
r(identity, fromPort, toPort, buf + offset, len - offset - signatureLen);
else
LogPrint (eLogWarning, "DatagramDestination: no receiver for port ", toPort);
}
void DatagramDestination::HandleDatagram3 (uint16_t fromPort, uint16_t toPort, const uint8_t * buf, size_t len,
i2p::garlic::ECIESX25519AEADRatchetSession * from)
{
@@ -297,7 +367,7 @@ namespace datagram
HandleDatagram (fromPort, toPort, uncompressed, uncompressedLen, from);
break;
case i2p::client::PROTOCOL_TYPE_DATAGRAM2:
// TODO:
HandleDatagram2 (fromPort, toPort, uncompressed, uncompressedLen, from);
break;
default:
LogPrint (eLogInfo, "Datagram: unknown protocol type ", protocolType);
libi2pd/Datagram.h
+5 -1
View File
@@ -51,7 +51,9 @@ namespace datagram
eDatagramV2 = 2,
eDatagramV3 = 3,
};
constexpr uint16_t DATAGRAM2_FLAG_OPTIONS = 0x10;
constexpr uint16_t DATAGRAM2_FLAG_OFFLINE_SIGNATURE = 0x20;
constexpr uint16_t DATAGRAM3_FLAG_OPTIONS = 0x10;
class DatagramSession : public std::enable_shared_from_this<DatagramSession>
@@ -163,6 +165,8 @@ namespace datagram
void HandleDatagram (uint16_t fromPort, uint16_t toPort, const uint8_t * buf, size_t len,
i2p::garlic::ECIESX25519AEADRatchetSession * from);
void HandleRawDatagram (uint16_t fromPort, uint16_t toPort, const uint8_t * buf, size_t len);
void HandleDatagram2 (uint16_t fromPort, uint16_t toPort, const uint8_t * buf, size_t len,
i2p::garlic::ECIESX25519AEADRatchetSession * from);
void HandleDatagram3 (uint16_t fromPort, uint16_t toPort, const uint8_t * buf, size_t len,
i2p::garlic::ECIESX25519AEADRatchetSession * from);