From 3480824290ccf1b1e9c50c3fbbbd02d73b9e8083 Mon Sep 17 00:00:00 2001 From: orignal Date: Mon, 28 Nov 2016 14:37:17 -0500 Subject: [PATCH] correct leaseset requests cleanup --- Destination.cpp | 9 +++++++-- Garlic.cpp | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Destination.cpp b/Destination.cpp index d4982ed6..91f2a2bb 100644 --- a/Destination.cpp +++ b/Destination.cpp @@ -87,8 +87,6 @@ namespace client Stop (); if (m_Pool) i2p::tunnel::tunnels.DeleteTunnelPool (m_Pool); - for (auto& it: m_LeaseSetRequests) - it.second->Complete (nullptr); } void LeaseSetDestination::Run () @@ -132,6 +130,13 @@ namespace client m_PublishConfirmationTimer.cancel (); m_PublishVerificationTimer.cancel (); + for (auto& it: m_LeaseSetRequests) + { + it.second->Complete (nullptr); + it.second->requestTimeoutTimer.cancel (); + } + m_LeaseSetRequests.clear (); + m_IsRunning = false; if (m_Pool) { diff --git a/Garlic.cpp b/Garlic.cpp index 8f1d59b6..306ac816 100644 --- a/Garlic.cpp +++ b/Garlic.cpp @@ -392,7 +392,6 @@ namespace garlic GarlicDestination::~GarlicDestination () { - LogPrint (eLogInfo, "Garlic: destination destroyed"); } void GarlicDestination::AddSessionKey (const uint8_t * key, const uint8_t * tag)