Browse Source

delete expired unconfirmed tags

pull/102/head
orignal 10 years ago
parent
commit
2cd8d0c0b7
  1. 23
      Garlic.cpp
  2. 5
      Garlic.h

23
Garlic.cpp

@ -51,16 +51,31 @@ namespace garlic @@ -51,16 +51,31 @@ namespace garlic
void GarlicRoutingSession::TagsConfirmed (uint32_t msgID)
{
uint32_t ts = i2p::util::GetSecondsSinceEpoch ();
auto it = m_UnconfirmedTagsMsgs.find (msgID);
if (it != m_UnconfirmedTagsMsgs.end ())
{
UnconfirmedTags * tags = it->second;
for (int i = 0; i < tags->numTags; i++)
m_SessionTags.push_back (tags->sessionTags[i]);
m_TagsCreationTime = i2p::util::GetSecondsSinceEpoch ();
if (ts < tags->tagsCreationTime + OUTGOING_TAGS_EXPIRATION_TIMEOUT)
{
for (int i = 0; i < tags->numTags; i++)
m_SessionTags.push_back (tags->sessionTags[i]);
m_TagsCreationTime = ts;
}
m_UnconfirmedTagsMsgs.erase (it);
delete tags;
}
// delete expired unconfirmed tags
for (auto it = m_UnconfirmedTagsMsgs.begin (); it != m_UnconfirmedTagsMsgs.end ();)
{
if (ts >= it->second->tagsCreationTime + OUTGOING_TAGS_EXPIRATION_TIMEOUT)
{
delete it->second;
it = m_UnconfirmedTagsMsgs.erase (it);
}
else
it++;
}
}
I2NPMessage * GarlicRoutingSession::WrapSingleMessage (I2NPMessage * msg)
@ -72,7 +87,7 @@ namespace garlic @@ -72,7 +87,7 @@ namespace garlic
// take care about tags
if (m_NumTags > 0)
{
if (m_TagsCreationTime && i2p::util::GetSecondsSinceEpoch () >= m_TagsCreationTime + TAGS_EXPIRATION_TIMEOUT)
if (m_TagsCreationTime && i2p::util::GetSecondsSinceEpoch () >= m_TagsCreationTime + OUTGOING_TAGS_EXPIRATION_TIMEOUT)
{
// old tags expired create new set
LogPrint ("Garlic tags expired");

5
Garlic.h

@ -37,8 +37,9 @@ namespace garlic @@ -37,8 +37,9 @@ namespace garlic
};
#pragma pack()
const int TAGS_EXPIRATION_TIMEOUT = 900; // 15 minutes
const int INCOMING_TAGS_EXPIRATION_TIMEOUT = 900; // 15 minutes
const int OUTGOING_TAGS_EXPIRATION_TIMEOUT = 720; // 12 minutes
typedef i2p::data::Tag<32> SessionTag;
class GarlicDestination;
class GarlicRoutingSession

Loading…
Cancel
Save