mirror of
https://github.com/PurpleI2P/i2pd.git
synced 2025-04-28 11:47:48 +02:00
pass I2NP message to transport session as shared_ptr
This commit is contained in:
parent
d65257c7b0
commit
3a63f6775a
9 changed files with 47 additions and 75 deletions
|
@ -262,7 +262,7 @@ namespace transport
|
|||
if (paddingSize > 0) paddingSize = 16 - paddingSize;
|
||||
payload += paddingSize;
|
||||
// TODO: verify signature (need data from session request), payload points to signature
|
||||
m_Data.Send (CreateDeliveryStatusMsg (0));
|
||||
m_Data.Send (ToSharedI2NPMessage(CreateDeliveryStatusMsg (0)));
|
||||
Established ();
|
||||
}
|
||||
|
||||
|
@ -783,7 +783,7 @@ namespace transport
|
|||
m_DHKeysPair = nullptr;
|
||||
}
|
||||
m_Data.Start ();
|
||||
m_Data.Send (CreateDatabaseStoreMsg ());
|
||||
m_Data.Send (ToSharedI2NPMessage(CreateDatabaseStoreMsg ()));
|
||||
transports.PeerConnected (shared_from_this ());
|
||||
if (m_PeerTest && (m_RemoteRouter && m_RemoteRouter->IsPeerTesting ()))
|
||||
SendPeerTest ();
|
||||
|
@ -832,39 +832,29 @@ namespace transport
|
|||
}
|
||||
}
|
||||
|
||||
void SSUSession::SendI2NPMessage (I2NPMessage * msg)
|
||||
void SSUSession::SendI2NPMessage (std::shared_ptr<I2NPMessage> msg)
|
||||
{
|
||||
GetService ().post (std::bind (&SSUSession::PostI2NPMessage, shared_from_this (), msg));
|
||||
}
|
||||
|
||||
void SSUSession::PostI2NPMessage (I2NPMessage * msg)
|
||||
void SSUSession::PostI2NPMessage (std::shared_ptr<I2NPMessage> msg)
|
||||
{
|
||||
if (msg)
|
||||
{
|
||||
if (m_State == eSessionStateEstablished)
|
||||
m_Data.Send (msg);
|
||||
else
|
||||
DeleteI2NPMessage (msg);
|
||||
}
|
||||
if (msg &&m_State == eSessionStateEstablished)
|
||||
m_Data.Send (msg);
|
||||
}
|
||||
|
||||
void SSUSession::SendI2NPMessages (const std::vector<I2NPMessage *>& msgs)
|
||||
void SSUSession::SendI2NPMessages (const std::vector<std::shared_ptr<I2NPMessage> >& msgs)
|
||||
{
|
||||
GetService ().post (std::bind (&SSUSession::PostI2NPMessages, shared_from_this (), msgs));
|
||||
}
|
||||
|
||||
void SSUSession::PostI2NPMessages (std::vector<I2NPMessage *> msgs)
|
||||
void SSUSession::PostI2NPMessages (std::vector<std::shared_ptr<I2NPMessage> > msgs)
|
||||
{
|
||||
if (m_State == eSessionStateEstablished)
|
||||
{
|
||||
for (auto it: msgs)
|
||||
if (it) m_Data.Send (it);
|
||||
}
|
||||
else
|
||||
{
|
||||
for (auto it: msgs)
|
||||
DeleteI2NPMessage (it);
|
||||
}
|
||||
}
|
||||
|
||||
void SSUSession::ProcessData (uint8_t * buf, size_t len)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue