PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-09-01 11:21:47 +00:00
Code Issues Releases Activity

use weak_ptr for transport session

Browse Source
This commit is contained in:
orignal 2024-11-29 21:29:03 -05:00
parent fcc70025fd
commit 31ff0ff1cb
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libi2pd/TunnelGateway.cpp
View File

@ -237,9 +237,8 @@ namespace tunnel
m_Buffer.ClearTunnelDataMsgs (); m_Buffer.ClearTunnelDataMsgs ();
// send // send
if (m_CurrentTransport && !m_CurrentTransport->IsEstablished ()) // check if session became invalid since last call auto currentTransport = m_CurrentTransport.lock ();
m_CurrentTransport = nullptr; if (!currentTransport)
if (!m_CurrentTransport)
{ {
// try to obtain transport from peding reequest or send thought transport is not complete // try to obtain transport from peding reequest or send thought transport is not complete
if (m_PendingTransport.valid ()) // pending request? if (m_PendingTransport.valid ()) // pending request?
@ -247,9 +246,14 @@ namespace tunnel
if (m_PendingTransport.wait_for(std::chrono::seconds(0)) == std::future_status::ready) if (m_PendingTransport.wait_for(std::chrono::seconds(0)) == std::future_status::ready)
{ {
// pending request complete // pending request complete
m_CurrentTransport = m_PendingTransport.get (); // take tarnsports used in pending request currentTransport = m_PendingTransport.get (); // take tarnsports used in pending request
if (m_CurrentTransport && !m_CurrentTransport->IsEstablished ()) if (currentTransport)
m_CurrentTransport = nullptr; {
if (currentTransport->IsEstablished ())
m_CurrentTransport = currentTransport;
else
currentTransport = nullptr;
}
} }
else // still pending else // still pending
{ {
@ -259,9 +263,9 @@ namespace tunnel
} }
} }
} }
if (m_CurrentTransport) // session is good if (currentTransport) // session is good
// send to session directly // send to session directly
m_CurrentTransport->SendI2NPMessages (newTunnelMsgs); currentTransport->SendI2NPMessages (newTunnelMsgs);
else // no session yet else // no session yet
// send through transports // send through transports
m_PendingTransport = i2p::transport::transports.SendMessages (m_Tunnel.GetNextIdentHash (), std::move (newTunnelMsgs)); m_PendingTransport = i2p::transport::transports.SendMessages (m_Tunnel.GetNextIdentHash (), std::move (newTunnelMsgs));

2
libi2pd/TunnelGateway.h
View File

@ -59,7 +59,7 @@ namespace tunnel
TunnelBase& m_Tunnel; TunnelBase& m_Tunnel;
TunnelGatewayBuffer m_Buffer; TunnelGatewayBuffer m_Buffer;
size_t m_NumSentBytes; size_t m_NumSentBytes;
std::shared_ptr<i2p::transport::TransportSession> m_CurrentTransport; std::weak_ptr<i2p::transport::TransportSession> m_CurrentTransport;
std::future<std::shared_ptr<i2p::transport::TransportSession> > m_PendingTransport; std::future<std::shared_ptr<i2p::transport::TransportSession> > m_PendingTransport;
}; };
} }