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

fixed memory leak

Browse Source
This commit is contained in:
orignal 2014-07-06 17:48:16 -04:00
parent 73ef5e29c2
commit 226ef77927
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
I2NPProtocol.cpp
View File

@ -1,4 +1,5 @@
#include <string.h> #include <string.h>
#include <atomic>
#include "I2PEndian.h" #include "I2PEndian.h"
#include <cryptopp/sha.h> #include <cryptopp/sha.h>
#include <cryptopp/gzip.h> #include <cryptopp/gzip.h>
@ -29,7 +30,7 @@ namespace i2p
delete msg; delete msg;
} }
static uint32_t I2NPmsgID = 0; // TODO: create class static std::atomic<uint32_t> I2NPmsgID(0); // TODO: create class
void FillI2NPMessageHeader (I2NPMessage * msg, I2NPMessageType msgType, uint32_t replyMsgID) void FillI2NPMessageHeader (I2NPMessage * msg, I2NPMessageType msgType, uint32_t replyMsgID)
{ {
I2NPHeader * header = msg->GetHeader (); I2NPHeader * header = msg->GetHeader ();

2
SSU.cpp
View File

@ -626,7 +626,7 @@ namespace ssu
if (!m_DelayedMessages.empty ()) if (!m_DelayedMessages.empty ())
{ {
for (auto it :m_DelayedMessages) for (auto it :m_DelayedMessages)
delete it; DeleteI2NPMessage (it);
m_DelayedMessages.clear (); m_DelayedMessages.clear ();
} }
} }

12
SSUData.cpp
View File

@ -98,7 +98,7 @@ namespace ssu
} }
else if (fragmentNum < it->second->nextFragmentNum) else if (fragmentNum < it->second->nextFragmentNum)
// duplicate fragment // duplicate fragment
LogPrint ("Duplicate fragment ", fragmentNum, " of message ", msgID, ". Ignored"); LogPrint ("Duplicate fragment ", (int)fragmentNum, " of message ", msgID, ". Ignored");
else else
{ {
// missing fragment // missing fragment
@ -108,7 +108,7 @@ namespace ssu
if (isLast) if (isLast)
{ {
if (!msg) if (!msg)
DeleteI2NPMessage (it->second->msg); DeleteI2NPMessage (it->second->msg);
delete it->second; delete it->second;
m_IncomleteMessages.erase (it); m_IncomleteMessages.erase (it);
@ -116,7 +116,7 @@ namespace ssu
} }
else else
// TODO: // TODO:
LogPrint ("Unexpected follow-on fragment ", fragmentNum, " of message ", msgID); LogPrint ("Unexpected follow-on fragment ", (int)fragmentNum, " of message ", msgID);
} }
else // first fragment else // first fragment
{ {
@ -156,6 +156,12 @@ namespace ssu
void SSUData::Send (i2p::I2NPMessage * msg) void SSUData::Send (i2p::I2NPMessage * msg)
{ {
uint32_t msgID = msg->ToSSU (); uint32_t msgID = msg->ToSSU ();
if (m_SentMessages.count (msgID) > 0)
{
LogPrint ("SSU message ", msgID, " already sent");
DeleteI2NPMessage (msg);
return;
}
auto fragments = m_SentMessages[msgID]; auto fragments = m_SentMessages[msgID];
msgID = htobe32 (msgID); msgID = htobe32 (msgID);
size_t payloadSize = SSU_MTU - sizeof (SSUHeader) - 9; // 9 = flag + #frg(1) + messageID(4) + frag info (3) size_t payloadSize = SSU_MTU - sizeof (SSUHeader) - 9; // 9 = flag + #frg(1) + messageID(4) + frag info (3)