Browse Source

more debug messages at destinations stop

Signed-off-by: r4sas <r4sas@i2pmail.org>
pull/1928/merge
R4SAS 2 years ago
parent
commit
fdf38f45d9
Signed by: r4sas
GPG Key ID: 66F6C87B98EBCFE2
  1. 11
      libi2pd/Destination.cpp
  2. 14
      libi2pd_client/ClientContext.cpp

11
libi2pd/Destination.cpp

@ -1036,11 +1036,15 @@ namespace client @@ -1036,11 +1036,15 @@ namespace client
void ClientDestination::Stop ()
{
LogPrint(eLogDebug, "Destination: Stopping destination ", GetIdentHash().ToBase32(), ".b32.i2p");
LeaseSetDestination::Stop ();
m_ReadyChecker.cancel();
LogPrint(eLogDebug, "Destination: -> Stopping Streaming Destination");
m_StreamingDestination->Stop ();
//m_StreamingDestination->SetOwner (nullptr);
m_StreamingDestination = nullptr;
LogPrint(eLogDebug, "Destination: -> Stopping Streaming Destination by ports");
for (auto& it: m_StreamingDestinationsByPorts)
{
it.second->Stop ();
@ -1048,11 +1052,14 @@ namespace client @@ -1048,11 +1052,14 @@ namespace client
}
m_StreamingDestinationsByPorts.clear ();
m_LastStreamingDestination = nullptr;
if (m_DatagramDestination)
{
LogPrint(eLogDebug, "Destination: -> Stopping Datagram Destination");
delete m_DatagramDestination;
m_DatagramDestination = nullptr;
}
LogPrint(eLogDebug, "Destination: -> Stopping done");
}
void ClientDestination::HandleDataMessage (const uint8_t * buf, size_t len)
@ -1075,10 +1082,10 @@ namespace client @@ -1075,10 +1082,10 @@ namespace client
if (toPort != m_LastPort || !m_LastStreamingDestination)
{
m_LastStreamingDestination = GetStreamingDestination (toPort);
if (!m_LastStreamingDestination)
if (!m_LastStreamingDestination)
m_LastStreamingDestination = m_StreamingDestination; // if no destination on port use default
m_LastPort = toPort;
}
}
if (m_LastStreamingDestination)
m_LastStreamingDestination->HandleDataMessagePayload (buf, length);
else

14
libi2pd_client/ClientContext.cpp

@ -186,22 +186,30 @@ namespace client @@ -186,22 +186,30 @@ namespace client
LogPrint(eLogInfo, "Clients: Stopping AddressBook");
m_AddressBook.Stop ();
LogPrint(eLogInfo, "Clients: Stopping UDP Tunnels");
{
std::lock_guard<std::mutex> lock(m_ForwardsMutex);
m_ServerForwards.clear();
m_ClientForwards.clear();
}
LogPrint(eLogInfo, "Clients: Stopping UDP Tunnels timers");
if (m_CleanupUDPTimer)
{
m_CleanupUDPTimer->cancel ();
m_CleanupUDPTimer = nullptr;
}
for (auto& it: m_Destinations)
it.second->Stop ();
m_Destinations.clear ();
{
LogPrint(eLogInfo, "Clients: Stopping Destinations");
std::lock_guard<std::mutex> lock(m_DestinationsMutex);
for (auto& it: m_Destinations)
it.second->Stop ();
LogPrint(eLogInfo, "Clients: Stopping Destinations - Clear");
m_Destinations.clear ();
}
LogPrint(eLogInfo, "Clients: Stopping SharedLocalDestination");
m_SharedLocalDestination->Release ();
m_SharedLocalDestination = nullptr;
}

Loading…
Cancel
Save