mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd synced 2024-11-10 08:00:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

rollback

Browse Source
This commit is contained in:
orignal 2017-01-05 17:37:39 -05:00
parent 5ad25376bb
commit 0b28812f7e
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
NTCPSession.cpp
View File

@ -635,7 +635,14 @@ namespace transport
return true;
}
size_t NTCPSession::CreateMsgBuffer (std::shared_ptr<I2NPMessage> msg, uint8_t * buf)
void NTCPSession::Send (std::shared_ptr<i2p::I2NPMessage> msg)
{
m_IsSending = true;
boost::asio::async_write (m_Socket, CreateMsgBuffer (msg), boost::asio::transfer_all (),
std::bind(&NTCPSession::HandleSent, shared_from_this (), std::placeholders::_1, std::placeholders::_2, std::vector<std::shared_ptr<I2NPMessage> >{ msg }));
}
boost::asio::const_buffers_1 NTCPSession::CreateMsgBuffer (std::shared_ptr<I2NPMessage> msg)
{
uint8_t * sendBuffer;
int len;
@ -667,29 +674,24 @@ namespace transport
htobe32buf (sendBuffer + len + 2 + padding, adler32 (adler32 (0, Z_NULL, 0), sendBuffer, len + 2+ padding));
int l = len + padding + 6;
m_Encryption.Encrypt(sendBuffer, l, buf);
return l;
m_Encryption.Encrypt(sendBuffer, l, sendBuffer);
return boost::asio::buffer ((const uint8_t *)sendBuffer, l);
}
void NTCPSession::Send (const std::vector<std::shared_ptr<I2NPMessage> >& msgs)
{
if (!msgs.size ()) return;
m_IsSending = true;
size_t len = 0;
std::vector<boost::asio::const_buffer> bufs;
for (const auto& it: msgs)
len += it->GetLength () + 22; // 6 + 16
uint8_t * buf = new uint8_t[len];
len = 0;
for (const auto& it: msgs)
len += CreateMsgBuffer (it, buf + len);
boost::asio::async_write (m_Socket, boost::asio::buffer (buf, len), boost::asio::transfer_all (),
std::bind(&NTCPSession::HandleSent, shared_from_this (), std::placeholders::_1, std::placeholders::_2, buf));
bufs.push_back (CreateMsgBuffer (it));
boost::asio::async_write (m_Socket, bufs, boost::asio::transfer_all (),
std::bind(&NTCPSession::HandleSent, shared_from_this (), std::placeholders::_1, std::placeholders::_2, msgs));
}
void NTCPSession::HandleSent (const boost::system::error_code& ecode, std::size_t bytes_transferred, uint8_t * buf)
void NTCPSession::HandleSent (const boost::system::error_code& ecode, std::size_t bytes_transferred, std::vector<std::shared_ptr<I2NPMessage> > msgs)
{
delete[] buf;
(void) msgs;
m_IsSending = false;
if (ecode)
{
@ -714,11 +716,7 @@ namespace transport
void NTCPSession::SendTimeSyncMessage ()
{
uint8_t * buf = new uint8_t[16];
m_IsSending = true;
auto len = CreateMsgBuffer (nullptr, buf); // nullptr means timestamp
boost::asio::async_write (m_Socket, boost::asio::buffer (buf, len), boost::asio::transfer_all (),
std::bind(&NTCPSession::HandleSent, shared_from_this (), std::placeholders::_1, std::placeholders::_2, buf));
Send (nullptr);
}

5
NTCPSession.h
View File

@ -91,9 +91,10 @@ namespace transport
void HandleReceived (const boost::system::error_code& ecode, std::size_t bytes_transferred);
bool DecryptNextBlock (const uint8_t * encrypted);
size_t CreateMsgBuffer (std::shared_ptr<I2NPMessage> msg, uint8_t * buf);
void Send (std::shared_ptr<i2p::I2NPMessage> msg);
boost::asio::const_buffers_1 CreateMsgBuffer (std::shared_ptr<I2NPMessage> msg);
void Send (const std::vector<std::shared_ptr<I2NPMessage> >& msgs);
void HandleSent (const boost::system::error_code& ecode, std::size_t bytes_transferred, uint8_t * buf);
void HandleSent (const boost::system::error_code& ecode, std::size_t bytes_transferred, std::vector<std::shared_ptr<I2NPMessage> > msgs);
private: