PurpleI2P
/
i2pd
mirror of https://github.com/PurpleI2P/i2pd.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

resend packet with new packet number

pull/1752/head
orignal 3 years ago
parent
8c3e716c3f
commit
43f74d4d5a
2 changed files with 72 additions and 61 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 114
      libi2pd/SSU2.cpp
  2. 19
      libi2pd/SSU2.h

114
libi2pd/SSU2.cpp
Unescape View File

@ -112,17 +112,17 @@ namespace transport
{ {
if (!m_SendQueue.empty ()) if (!m_SendQueue.empty ())
{ {
uint8_t payload[SSU2_MAX_PAYLOAD_SIZE]; auto nextResend = i2p::util::GetSecondsSinceEpoch () + SSU2_RESEND_INTERVAL;
size_t payloadSize = 0; auto packet = std::make_shared<SentPacket>();
payloadSize += CreateAckBlock (payload + payloadSize, SSU2_MAX_PAYLOAD_SIZE - payloadSize); packet->payloadSize += CreateAckBlock (packet->payload + packet->payloadSize, SSU2_MAX_PAYLOAD_SIZE - packet->payloadSize);
while (!m_SendQueue.empty ()) while (!m_SendQueue.empty ())
{ {
auto msg = m_SendQueue.front (); auto msg = m_SendQueue.front ();
size_t len = msg->GetNTCP2Length (); size_t len = msg->GetNTCP2Length ();
if (len + 3 < SSU2_MAX_PAYLOAD_SIZE - payloadSize) if (len + 3 < SSU2_MAX_PAYLOAD_SIZE - packet->payloadSize)
{ {
m_SendQueue.pop_front (); m_SendQueue.pop_front ();
payloadSize += CreateI2NPBlock (payload + payloadSize, SSU2_MAX_PAYLOAD_SIZE - payloadSize, std::move (msg)); packet->payloadSize += CreateI2NPBlock (packet->payload + packet->payloadSize, SSU2_MAX_PAYLOAD_SIZE - packet->payloadSize, std::move (msg));
} }
else if (len > SSU2_MAX_PAYLOAD_SIZE - 32) // message too long else if (len > SSU2_MAX_PAYLOAD_SIZE - 32) // message too long
{ {
@ -132,22 +132,22 @@ namespace transport
else else
{ {
// send right a way // send right a way
if (payloadSize + 16 < SSU2_MAX_PAYLOAD_SIZE) if (packet->payloadSize + 16 < SSU2_MAX_PAYLOAD_SIZE)
payloadSize += CreatePaddingBlock (payload + payloadSize, SSU2_MAX_PAYLOAD_SIZE - payloadSize); packet->payloadSize += CreatePaddingBlock (packet->payload + packet->payloadSize, SSU2_MAX_PAYLOAD_SIZE - packet->payloadSize);
auto packet = SendData (payload, payloadSize); uint32_t packetNum = SendData (packet->payload, packet->payloadSize);
if (packet) packet->nextResendTime = nextResend;
m_SentPackets.emplace (packet->packetNum, packet); m_SentPackets.emplace (packetNum, packet);
payloadSize = 0; packet = std::make_shared<SentPacket>();
payloadSize += CreateAckBlock (payload + payloadSize, SSU2_MAX_PAYLOAD_SIZE - payloadSize); packet->payloadSize += CreateAckBlock (packet->payload + packet->payloadSize, SSU2_MAX_PAYLOAD_SIZE - packet->payloadSize);
} }
}; };
if (payloadSize) if (packet->payloadSize)
{ {
if (payloadSize + 16 < SSU2_MAX_PAYLOAD_SIZE) if (packet->payloadSize + 16 < SSU2_MAX_PAYLOAD_SIZE)
payloadSize += CreatePaddingBlock (payload + payloadSize, SSU2_MAX_PAYLOAD_SIZE - payloadSize); packet->payloadSize += CreatePaddingBlock (packet->payload + packet->payloadSize, SSU2_MAX_PAYLOAD_SIZE - packet->payloadSize);
auto packet = SendData (payload, payloadSize); uint32_t packetNum = SendData (packet->payload, packet->payloadSize);
if (packet) packet->nextResendTime = nextResend;
m_SentPackets.emplace (packet->packetNum, packet); m_SentPackets.emplace (packetNum, packet);
} }
} }
} }
@ -156,30 +156,32 @@ namespace transport
{ {
uint32_t msgID; uint32_t msgID;
memcpy (&msgID, msg->GetHeader () + I2NP_HEADER_MSGID_OFFSET, 4); memcpy (&msgID, msg->GetHeader () + I2NP_HEADER_MSGID_OFFSET, 4);
uint8_t payload[SSU2_MAX_PAYLOAD_SIZE]; auto nextResend = i2p::util::GetSecondsSinceEpoch () + SSU2_RESEND_INTERVAL;
size_t payloadSize = 0; auto packet = std::make_shared<SentPacket>();
payloadSize += CreateAckBlock (payload + payloadSize, SSU2_MAX_PAYLOAD_SIZE - payloadSize); packet->payloadSize += CreateAckBlock (packet->payload + packet->payloadSize, SSU2_MAX_PAYLOAD_SIZE - packet->payloadSize);
auto size = CreateFirstFragmentBlock (payload + payloadSize, SSU2_MAX_PAYLOAD_SIZE - 32 - payloadSize, msg); auto size = CreateFirstFragmentBlock (packet->payload + packet->payloadSize, SSU2_MAX_PAYLOAD_SIZE - 32 - packet->payloadSize, msg);
if (!size) return; if (!size) return;
payloadSize += size; packet->payloadSize += size;
payloadSize += CreatePaddingBlock (payload + payloadSize, SSU2_MAX_PAYLOAD_SIZE - payloadSize); packet->payloadSize += CreatePaddingBlock (packet->payload + packet->payloadSize, SSU2_MAX_PAYLOAD_SIZE - packet->payloadSize);
auto firstPacket = SendData (payload, payloadSize); uint32_t firstPacketNum = SendData (packet->payload, packet->payloadSize);
if (firstPacket) packet->nextResendTime = nextResend;
m_SentPackets.emplace (firstPacket->packetNum, firstPacket); m_SentPackets.emplace (firstPacketNum, packet);
uint8_t fragmentNum = 0; uint8_t fragmentNum = 0;
while (msg->offset < msg->len) while (msg->offset < msg->len)
{ {
payloadSize += CreateFollowOnFragmentBlock (payload + payloadSize, SSU2_MAX_PAYLOAD_SIZE - payloadSize - 16, msg, fragmentNum, msgID); packet = std::make_shared<SentPacket>();
payloadSize += CreatePaddingBlock (payload + payloadSize, SSU2_MAX_PAYLOAD_SIZE - payloadSize); packet->payloadSize += CreateFollowOnFragmentBlock (packet->payload + packet->payloadSize, SSU2_MAX_PAYLOAD_SIZE - packet->payloadSize - 16, msg, fragmentNum, msgID);
auto followonPacket = SendData (payload, payloadSize); packet->payloadSize += CreatePaddingBlock (packet->payload + packet->payloadSize, SSU2_MAX_PAYLOAD_SIZE - packet->payloadSize);
if (followonPacket) uint32_t followonPacketNum = SendData (packet->payload, packet->payloadSize);
m_SentPackets.emplace (followonPacket->packetNum, followonPacket); packet->nextResendTime = nextResend;
m_SentPackets.emplace (followonPacketNum, packet);
} }
} }
void SSU2Session::Resend (uint64_t ts) void SSU2Session::Resend (uint64_t ts)
{ {
if (m_SendQueue.empty ()) return; if (m_SendQueue.empty ()) return;
std::map<uint32_t, std::shared_ptr<SentPacket> > resentPackets;
for (auto it = m_SentPackets.begin (); it != m_SentPackets.end (); ) for (auto it = m_SentPackets.begin (); it != m_SentPackets.end (); )
if (ts > it->second->nextResendTime) if (ts > it->second->nextResendTime)
{ {
@ -187,16 +189,24 @@ namespace transport
it = m_SentPackets.erase (it); it = m_SentPackets.erase (it);
else else
{ {
m_Server.Send (it->second->header.buf, 16, it->second->payload, it->second->payloadLen, m_RemoteEndpoint); uint32_t packetNum = SendData (it->second->payload, it->second->payloadSize);
it->second->numResends++; it->second->numResends++;
it->second->nextResendTime = ts + it->second->numResends*SSU2_RESEND_INTERVAL; it->second->nextResendTime = ts + it->second->numResends*SSU2_RESEND_INTERVAL;
m_LastActivityTimestamp = ts; m_LastActivityTimestamp = ts;
m_NumSentBytes += it->second->payloadLen + 16; resentPackets.emplace (packetNum, it->second);
it++; it = m_SentPackets.erase (it);
} }
} }
else else
it++; it++;
if (!resentPackets.empty ())
{
#if (__cplusplus >= 201703L) // C++ 17 or higher
m_SentPackets.merge (resentPackets);
#else
m_SentPackets.insert (resentPackets.begin (), resentPackets.end ());
#endif
}
} }
void SSU2Session::ProcessFirstIncomingMessage (uint64_t connID, uint8_t * buf, size_t len) void SSU2Session::ProcessFirstIncomingMessage (uint64_t connID, uint8_t * buf, size_t len)
@ -464,10 +474,10 @@ namespace transport
if (!(header.h.flags[0] & 0xF0)) if (!(header.h.flags[0] & 0xF0))
{ {
// first fragment // first fragment
m_SessionConfirmedFragment1.reset (new SentPacket); m_SessionConfirmedFragment1.reset (new SessionConfirmedFragment);
m_SessionConfirmedFragment1->header = header; m_SessionConfirmedFragment1->header = header;
memcpy (m_SessionConfirmedFragment1->payload, buf + 16, len - 16); memcpy (m_SessionConfirmedFragment1->payload, buf + 16, len - 16);
m_SessionConfirmedFragment1->payloadLen = len - 16; m_SessionConfirmedFragment1->payloadSize = len - 16;
return true; // wait for second fragment return true; // wait for second fragment
} }
else else
@ -476,10 +486,10 @@ namespace transport
if (!m_SessionConfirmedFragment1) return false; // out of sequence if (!m_SessionConfirmedFragment1) return false; // out of sequence
uint8_t fullMsg[2*SSU2_MTU]; uint8_t fullMsg[2*SSU2_MTU];
header = m_SessionConfirmedFragment1->header; header = m_SessionConfirmedFragment1->header;
memcpy (fullMsg + 16, m_SessionConfirmedFragment1->payload, m_SessionConfirmedFragment1->payloadLen); memcpy (fullMsg + 16, m_SessionConfirmedFragment1->payload, m_SessionConfirmedFragment1->payloadSize);
memcpy (fullMsg + 16 + m_SessionConfirmedFragment1->payloadLen, buf + 16, len - 16); memcpy (fullMsg + 16 + m_SessionConfirmedFragment1->payloadSize, buf + 16, len - 16);
buf = fullMsg; buf = fullMsg;
len += m_SessionConfirmedFragment1->payloadLen; len += m_SessionConfirmedFragment1->payloadSize;
} }
} }
// KDF for Session Confirmed part 1 // KDF for Session Confirmed part 1
@ -686,33 +696,29 @@ namespace transport
return true; return true;
} }
std::shared_ptr<SSU2Session::SentPacket> SSU2Session::SendData (const uint8_t * buf, size_t len) uint32_t SSU2Session::SendData (const uint8_t * buf, size_t len)
{ {
if (len < 8) if (len < 8)
{ {
LogPrint (eLogWarning, "SSU2: Data message payload is too short ", (int)len); LogPrint (eLogWarning, "SSU2: Data message payload is too short ", (int)len);
return nullptr; return 0;
} }
auto packet = std::make_shared<SentPacket>(); Header header;
packet->packetNum = m_SendPacketNum;
packet->numResends = 0;
Header& header = packet->header;
header.h.connID = m_DestConnID; header.h.connID = m_DestConnID;
header.h.packetNum = htobe32 (m_SendPacketNum); header.h.packetNum = htobe32 (m_SendPacketNum);
header.h.type = eSSU2Data; header.h.type = eSSU2Data;
memset (header.h.flags, 0, 3); memset (header.h.flags, 0, 3);
uint8_t nonce[12]; uint8_t nonce[12];
CreateNonce (m_SendPacketNum, nonce); CreateNonce (m_SendPacketNum, nonce);
i2p::crypto::AEADChaCha20Poly1305 (buf, len, header.buf, 16, m_KeyDataSend, nonce, packet->payload, SSU2_MTU, true); uint8_t payload[SSU2_MTU];
header.ll[0] ^= CreateHeaderMask (m_Address->i, packet->payload + (len - 8)); i2p::crypto::AEADChaCha20Poly1305 (buf, len, header.buf, 16, m_KeyDataSend, nonce, payload, SSU2_MTU, true);
header.ll[1] ^= CreateHeaderMask (m_KeyDataSend + 32, packet->payload + (len + 4)); header.ll[0] ^= CreateHeaderMask (m_Address->i, payload + (len - 8));
packet->payloadLen = len + 16; header.ll[1] ^= CreateHeaderMask (m_KeyDataSend + 32, payload + (len + 4));
m_Server.Send (header.buf, 16, packet->payload, packet->payloadLen, m_RemoteEndpoint); m_Server.Send (header.buf, 16, payload, len + 16, m_RemoteEndpoint);
m_SendPacketNum++; m_SendPacketNum++;
m_LastActivityTimestamp = i2p::util::GetSecondsSinceEpoch (); m_LastActivityTimestamp = i2p::util::GetSecondsSinceEpoch ();
packet->nextResendTime = m_LastActivityTimestamp + SSU2_RESEND_INTERVAL; m_NumSentBytes += len + 32;
m_NumSentBytes += packet->payloadLen + 16; return m_SendPacketNum - 1;
return packet;
} }
void SSU2Session::ProcessData (uint8_t * buf, size_t len) void SSU2Session::ProcessData (uint8_t * buf, size_t len)

19
libi2pd/SSU2.h
Unescape View File

@ -115,12 +115,17 @@ namespace transport
struct SentPacket struct SentPacket
{ {
Header header; uint8_t payload[SSU2_MAX_PAYLOAD_SIZE];
uint8_t payload[SSU2_MTU]; size_t payloadSize = 0;
size_t payloadLen;
uint32_t packetNum;
uint32_t nextResendTime; // in seconds uint32_t nextResendTime; // in seconds
int numResends; int numResends = 0;
};
struct SessionConfirmedFragment
{
Header header;
uint8_t payload[SSU2_MAX_PAYLOAD_SIZE];
size_t payloadSize;
}; };
public: public:
@ -165,7 +170,7 @@ namespace transport
void KDFDataPhase (uint8_t * keydata_ab, uint8_t * keydata_ba); void KDFDataPhase (uint8_t * keydata_ab, uint8_t * keydata_ba);
void SendTokenRequest (); void SendTokenRequest ();
void SendRetry (); void SendRetry ();
std::shared_ptr<SentPacket> SendData (const uint8_t * buf, size_t len); uint32_t SendData (const uint8_t * buf, size_t len); // returns packet num
void SendQuickAck (); void SendQuickAck ();
void SendTermination (); void SendTermination ();
@ -192,7 +197,7 @@ namespace transport
SSU2Server& m_Server; SSU2Server& m_Server;
std::shared_ptr<i2p::crypto::X25519Keys> m_EphemeralKeys; std::shared_ptr<i2p::crypto::X25519Keys> m_EphemeralKeys;
std::unique_ptr<i2p::crypto::NoiseSymmetricState> m_NoiseState; std::unique_ptr<i2p::crypto::NoiseSymmetricState> m_NoiseState;
std::unique_ptr<SentPacket> m_SessionConfirmedFragment1; // for Bob if applicable std::unique_ptr<SessionConfirmedFragment> m_SessionConfirmedFragment1; // for Bob if applicable
std::shared_ptr<const i2p::data::RouterInfo::Address> m_Address; std::shared_ptr<const i2p::data::RouterInfo::Address> m_Address;
boost::asio::ip::udp::endpoint m_RemoteEndpoint; boost::asio::ip::udp::endpoint m_RemoteEndpoint;
uint64_t m_DestConnID, m_SourceConnID; uint64_t m_DestConnID, m_SourceConnID;

Write Preview
Loading…
Cancel
Save