Skip to content

Commit

Permalink
clean up remote destinations without outgoing and unconfirmed tags
Browse files Browse the repository at this point in the history
  • Loading branch information
orignal committed Jan 26, 2016
1 parent 8061d30 commit 5215bdc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Destination.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace client
const int PUBLISH_CONFIRMATION_TIMEOUT = 5; // in seconds
const int LEASESET_REQUEST_TIMEOUT = 5; // in seconds
const int MAX_LEASESET_REQUEST_TIMEOUT = 40; // in seconds
const int DESTINATION_CLEANUP_TIMEOUT = 20; // in minutes
const int DESTINATION_CLEANUP_TIMEOUT = 3; // in minutes
const unsigned int MAX_NUM_FLOODFILLS_PER_REQUEST = 7;

// I2CP
Expand Down
4 changes: 2 additions & 2 deletions Garlic.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ namespace garlic
// delete expired unconfirmed tags
for (auto it = m_UnconfirmedTagsMsgs.begin (); it != m_UnconfirmedTagsMsgs.end ();)
{
if (ts >= it->second->tagsCreationTime + OUTGOING_TAGS_EXPIRATION_TIMEOUT)
if (ts >= it->second->tagsCreationTime + OUTGOING_TAGS_CONFIRMATION_TIMEOUT)
{
if (m_Owner)
m_Owner->RemoveDeliveryStatusSession (it->first);
Expand All @@ -107,7 +107,7 @@ namespace garlic
else
it++;
}
return !m_SessionTags.empty () || m_UnconfirmedTagsMsgs.empty ();
return !m_SessionTags.empty () || !m_UnconfirmedTagsMsgs.empty ();
}

std::shared_ptr<I2NPMessage> GarlicRoutingSession::WrapSingleMessage (std::shared_ptr<const I2NPMessage> msg)
Expand Down
1 change: 1 addition & 0 deletions Garlic.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ namespace garlic

const int INCOMING_TAGS_EXPIRATION_TIMEOUT = 960; // 16 minutes
const int OUTGOING_TAGS_EXPIRATION_TIMEOUT = 720; // 12 minutes
const int OUTGOING_TAGS_CONFIRMATION_TIMEOUT = 10; // 10 seconds
const int LEASET_CONFIRMATION_TIMEOUT = 4000; // in milliseconds

struct SessionTag: public i2p::data::Tag<32>
Expand Down

0 comments on commit 5215bdc

Please sign in to comment.