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

hanlde Ack block

Browse Source
This commit is contained in:
orignal 2022-03-30 15:03:45 -04:00
parent dd774b8dfd
commit f9925c7374
2 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libi2pd/SSU2.cpp
View File

@ -582,9 +582,11 @@ namespace transport
} }
m_LastActivityTimestamp = i2p::util::GetSecondsSinceEpoch (); m_LastActivityTimestamp = i2p::util::GetSecondsSinceEpoch ();
m_NumReceivedBytes += len; m_NumReceivedBytes += len;
UpdateReceivePacketNum (packetNum); if (UpdateReceivePacketNum (packetNum))
if (HandlePayload (payload, payloadSize)) {
SendQuickAck (); // TODO: don't send too requently if (HandlePayload (payload, payloadSize))
SendQuickAck (); // TODO: don't send too requently
}
} }
bool SSU2Session::HandlePayload (const uint8_t * buf, size_t len) bool SSU2Session::HandlePayload (const uint8_t * buf, size_t len)
@ -652,6 +654,8 @@ namespace transport
case eSSU2BlkNextNonce: case eSSU2BlkNextNonce:
break; break;
case eSSU2BlkAck: case eSSU2BlkAck:
LogPrint (eLogDebug, "SSU2: Ack");
HandleAck (buf + offset, size);
break; break;
case eSSU2BlkAddress: case eSSU2BlkAddress:
{ {
@ -692,6 +696,26 @@ namespace transport
return isData; return isData;
} }
void SSU2Session::HandleAck (const uint8_t * buf, size_t len)
{
if (m_SentPackets.empty ()) return;
uint32_t ackThrough = bufbe32toh (buf);
auto it = m_SentPackets.rbegin ();
while (it != m_SentPackets.rend () && it->first > ackThrough) ++it; // find first less pack <= ackThrough
if (it == m_SentPackets.rend ()) return;
int32_t firstPacketNum = ackThrough - buf[4]; // acnt
if (firstPacketNum < 0) firstPacketNum = 0;
auto it1 = it;
while (it1 != m_SentPackets.rend () && it1->first >= (uint32_t)firstPacketNum) it1++;
if (it1 == m_SentPackets.rend ())
{
m_SentPackets.erase (m_SentPackets.begin (), it.base ());
return;
}
m_SentPackets.erase (it1.base (), it.base ());
// TODO: handle ranges
}
bool SSU2Session::ExtractEndpoint (const uint8_t * buf, size_t size, boost::asio::ip::udp::endpoint& ep) bool SSU2Session::ExtractEndpoint (const uint8_t * buf, size_t size, boost::asio::ip::udp::endpoint& ep)
{ {
if (size < 2) return false; if (size < 2) return false;
@ -800,9 +824,9 @@ namespace transport
htole64buf (nonce + 4, seqn); htole64buf (nonce + 4, seqn);
} }
void SSU2Session::UpdateReceivePacketNum (uint32_t packetNum) bool SSU2Session::UpdateReceivePacketNum (uint32_t packetNum)
{ {
if (packetNum <= m_ReceivePacketNum) return; // duplicate if (packetNum <= m_ReceivePacketNum) return false; // duplicate
if (packetNum == m_ReceivePacketNum + 1) if (packetNum == m_ReceivePacketNum + 1)
{ {
for (auto it = m_OutOfSequencePackets.begin (); it != m_OutOfSequencePackets.end ();) for (auto it = m_OutOfSequencePackets.begin (); it != m_OutOfSequencePackets.end ();)
@ -819,6 +843,7 @@ namespace transport
} }
else else
m_OutOfSequencePackets.insert (packetNum); m_OutOfSequencePackets.insert (packetNum);
return true;
} }
void SSU2Session::SendQuickAck () void SSU2Session::SendQuickAck ()

15
libi2pd/SSU2.h
View File

@ -94,7 +94,16 @@ namespace transport
uint8_t flags[3]; uint8_t flags[3];
} h; } h;
}; };
struct SentPacket
{
Header h;
uint8_t payload[SSU2_MTU];
size_t payloadLen;
uint32_t nextResendTime; // in seconds
int numResends;
};
public: public:
SSU2Session (SSU2Server& server, std::shared_ptr<const i2p::data::RouterInfo> in_RemoteRouter = nullptr, SSU2Session (SSU2Server& server, std::shared_ptr<const i2p::data::RouterInfo> in_RemoteRouter = nullptr,
@ -136,10 +145,11 @@ namespace transport
void SendTermination (); void SendTermination ();
bool HandlePayload (const uint8_t * buf, size_t len); // returns true is contains data bool HandlePayload (const uint8_t * buf, size_t len); // returns true is contains data
void HandleAck (const uint8_t * buf, size_t len);
bool ExtractEndpoint (const uint8_t * buf, size_t size, boost::asio::ip::udp::endpoint& ep); bool ExtractEndpoint (const uint8_t * buf, size_t size, boost::asio::ip::udp::endpoint& ep);
std::shared_ptr<const i2p::data::RouterInfo> ExtractRouterInfo (const uint8_t * buf, size_t size); std::shared_ptr<const i2p::data::RouterInfo> ExtractRouterInfo (const uint8_t * buf, size_t size);
void CreateNonce (uint64_t seqn, uint8_t * nonce); void CreateNonce (uint64_t seqn, uint8_t * nonce);
void UpdateReceivePacketNum (uint32_t packetNum); // for Ack bool UpdateReceivePacketNum (uint32_t packetNum); // for Ack, returns false if duplicate
size_t CreateAddressBlock (const boost::asio::ip::udp::endpoint& ep, uint8_t * buf, size_t len); size_t CreateAddressBlock (const boost::asio::ip::udp::endpoint& ep, uint8_t * buf, size_t len);
size_t CreateAckBlock (uint8_t * buf, size_t len); size_t CreateAckBlock (uint8_t * buf, size_t len);
@ -157,6 +167,7 @@ namespace transport
uint8_t m_KeyDataSend[64], m_KeyDataReceive[64]; uint8_t m_KeyDataSend[64], m_KeyDataReceive[64];
uint32_t m_SendPacketNum, m_ReceivePacketNum; uint32_t m_SendPacketNum, m_ReceivePacketNum;
std::set<uint32_t> m_OutOfSequencePackets; // packet nums > receive packet num std::set<uint32_t> m_OutOfSequencePackets; // packet nums > receive packet num
std::map<uint32_t, std::shared_ptr<SentPacket> > m_SentPackets; // packetNum -> packet
i2p::I2NPMessagesHandler m_Handler; i2p::I2NPMessagesHandler m_Handler;
}; };