Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-10-17 17:20:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

pass options from Datagram2 and Datagram3 to handlers
Some checks failed
Build Debian packages / bookworm (push) Has been cancelled
Details
Build Debian packages / bullseye (push) Has been cancelled
Details
Build Debian packages / trixie (push) Has been cancelled
Details
Build on FreeBSD / with UPnP (push) Has been cancelled
Details
Build on OSX / With USE_UPNP=no (push) Has been cancelled
Details
Build on OSX / With USE_UPNP=yes (push) Has been cancelled
Details
Build on Windows / clang-x86_64 (push) Has been cancelled
Details
Build on Windows / i686 (push) Has been cancelled
Details
Build on Windows / ucrt-x86_64 (push) Has been cancelled
Details
Build on Windows / x86_64 (push) Has been cancelled
Details
Build on Windows / CMake clang-x86_64 (push) Has been cancelled
Details
Build on Windows / CMake i686 (push) Has been cancelled
Details
Build on Windows / CMake ucrt-x86_64 (push) Has been cancelled
Details
Build on Windows / CMake x86_64 (push) Has been cancelled
Details
Build on Windows / XP (push) Has been cancelled
Details
Build on Ubuntu / Make with USE_UPNP=no (push) Has been cancelled
Details
Build on Ubuntu / Make with USE_UPNP=yes (push) Has been cancelled
Details
Build on Ubuntu / CMake with -DWITH_UPNP=OFF (push) Has been cancelled
Details
Build on Ubuntu / CMake with -DWITH_UPNP=ON (push) Has been cancelled
Details
Build containers / Building container for linux/amd64 (push) Has been cancelled
Details
Build containers / Building container for linux/arm64 (push) Has been cancelled
Details
Build containers / Building container for linux/arm/v7 (push) Has been cancelled
Details
Build containers / Building container for linux/386 (push) Has been cancelled
Details
Build containers / Pushing merged manifest (push) Has been cancelled
Details

Browse source
This commit is contained in:
orignal 2025-09-25 20:47:08 -04:00
parent acb09c3119
commit dc9cdf941d
8 changed files with 53 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

34
libi2pd/Datagram.cpp
View file

@ -165,7 +165,7 @@ namespace datagram
session->Ack();
auto r = FindReceiver(toPort);
if(r)
r(identity, fromPort, toPort, buf + headerLen, len -headerLen);
r(identity, fromPort, toPort, buf + headerLen, len - headerLen, nullptr);
else
LogPrint (eLogWarning, "DatagramDestination: no receiver for port ", toPort);
}
@ -218,8 +218,20 @@ namespace datagram
}
uint16_t flags = bufbe16toh (buf + identityLen);
size_t offset = identityLen + 2;
bool isOptions = false;
if (flags & DATAGRAM2_FLAG_OPTIONS)
offset += bufbe16toh (buf + offset) + 2;
{
isOptions = true;
m_Options.CleanUp ();
auto optionsLen = m_Options.FromBuffer (buf + offset, len - offset);
if (optionsLen)
offset += optionsLen;
else
{
LogPrint (eLogWarning, "Datagram: datagram2 can't read options");
return;
}
}
if (offset > len)
{
LogPrint (eLogWarning, "Datagram: datagram2 is too short ", len, " expected ", offset);
@ -256,7 +268,7 @@ namespace datagram
session->Ack();
auto r = FindReceiver(toPort);
if(r)
r(identity, fromPort, toPort, buf + offset, len - offset - signatureLen);
r(identity, fromPort, toPort, buf + offset, len - offset - signatureLen, isOptions ? &m_Options : nullptr);
else
LogPrint (eLogWarning, "DatagramDestination: no receiver for port ", toPort);
}
@ -288,14 +300,26 @@ namespace datagram
{
uint16_t flags = bufbe16toh (buf + 32);
size_t offset = 34;
bool isOptions = false;
if (flags & DATAGRAM3_FLAG_OPTIONS)
offset += bufbe16toh (buf + offset) + 2;
{
isOptions = true;
m_Options.CleanUp ();
auto optionsLen = m_Options.FromBuffer (buf + offset, len - offset);
if (optionsLen)
offset += optionsLen;
else
{
LogPrint (eLogWarning, "Datagram: datagram3 can't read options");
return;
}
}
if (offset > len)
{
LogPrint (eLogWarning, "Datagram: datagram3 is too short ", len, " expected ", offset);
return;
}
r(*ls->GetIdentity (), fromPort, toPort, buf + offset, len - offset);
r(*ls->GetIdentity (), fromPort, toPort, buf + offset, len - offset, isOptions ? &m_Options : nullptr);
}
else
LogPrint (eLogWarning, "Datagram: no receiver for port ", toPort);