PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-02-02 02:44:15 +00:00
Code Issues Releases Activity

enable sending I2NP messages

Browse Source
This commit is contained in:
orignal 2018-12-03 18:47:20 -05:00
parent 10251a6447
commit 12ac7d6a00
2 changed files with 4 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libi2pd/NTCP2.cpp
View File

@ -943,7 +943,7 @@ namespace transport
m_LastActivityTimestamp = i2p::util::GetSecondsSinceEpoch (); m_LastActivityTimestamp = i2p::util::GetSecondsSinceEpoch ();
m_NumSentBytes += bytes_transferred; m_NumSentBytes += bytes_transferred;
i2p::transport::transports.UpdateSentBytes (bytes_transferred); i2p::transport::transports.UpdateSentBytes (bytes_transferred);
LogPrint (eLogDebug, "NTCP2: Next frame sent"); LogPrint (eLogDebug, "NTCP2: Next frame sent ", bytes_transferred);
SendQueue (); SendQueue ();
} }
} }
@ -969,13 +969,13 @@ namespace transport
len += 3; len += 3;
totalLen += len; totalLen += len;
encryptBufs.push_back (std::make_pair (buf, len)); encryptBufs.push_back (std::make_pair (buf, len));
if (it == *msgs.begin ()) // first message if (&it == &msgs.front ()) // first message
{ {
// allocate two bytes for length // allocate two bytes for length
buf -= 2; len += 2; buf -= 2; len += 2;
first = it; first = it;
} }
if (it == *msgs.rbegin () && it->len + 16 < it->maxLen) // last message if (&it == &msgs.back () && it->len + 16 < it->maxLen) // last message
{ {
// if it's long enough we add padding and MAC to it // if it's long enough we add padding and MAC to it
// create padding block // create padding block
@ -1023,41 +1023,6 @@ namespace transport
void NTCP2Session::SendQueue () void NTCP2Session::SendQueue ()
{ {
if (!m_SendQueue.empty ()) if (!m_SendQueue.empty ())
{
auto buf = m_Server.NewNTCP2FrameBuffer ();
uint8_t * payload = buf->data ();
size_t s = 0;
// add I2NP blocks
while (!m_SendQueue.empty ())
{
auto msg = m_SendQueue.front ();
size_t len = msg->GetNTCP2Length ();
if (s + len + 3 <= NTCP2_UNENCRYPTED_FRAME_MAX_SIZE) // 3 bytes block header
{
payload[s] = eNTCP2BlkI2NPMessage; // blk
htobe16buf (payload + s + 1, len); // size
s += 3;
msg->ToNTCP2 ();
memcpy (payload + s, msg->GetNTCP2Header (), len);
s += len;
m_SendQueue.pop_front ();
}
else if (len + 3 > NTCP2_UNENCRYPTED_FRAME_MAX_SIZE)
{
LogPrint (eLogError, "NTCP2: I2NP message of size ", len, " can't be sent. Dropped");
m_SendQueue.pop_front ();
}
else
break;
}
// add padding block
s += CreatePaddingBlock (s, payload + s, NTCP2_UNENCRYPTED_FRAME_MAX_SIZE - s);
// send
SendNextFrame (payload, s);
m_Server.DeleteNTCP2FrameBuffer (buf);
}
/* if (!m_SendQueue.empty ())
{ {
std::vector<std::shared_ptr<I2NPMessage> > msgs; std::vector<std::shared_ptr<I2NPMessage> > msgs;
size_t s = 0; size_t s = 0;
@ -1080,7 +1045,7 @@ namespace transport
break; break;
} }
SendI2NPMsgs (msgs); SendI2NPMsgs (msgs);
} */ }
} }
size_t NTCP2Session::CreatePaddingBlock (size_t msgLen, uint8_t * buf, size_t len) size_t NTCP2Session::CreatePaddingBlock (size_t msgLen, uint8_t * buf, size_t len)

6
libi2pd/NTCP2.h
View File

@ -217,7 +217,6 @@ namespace transport
std::list<std::shared_ptr<I2NPMessage> > m_SendQueue; std::list<std::shared_ptr<I2NPMessage> > m_SendQueue;
}; };
typedef std::array<uint8_t, NTCP2_UNENCRYPTED_FRAME_MAX_SIZE> NTCP2FrameBuffer; // TODO: remove
class NTCP2Server class NTCP2Server
{ {
public: public:
@ -236,9 +235,6 @@ namespace transport
void Connect(const boost::asio::ip::address & address, uint16_t port, std::shared_ptr<NTCP2Session> conn); void Connect(const boost::asio::ip::address & address, uint16_t port, std::shared_ptr<NTCP2Session> conn);
NTCP2FrameBuffer * NewNTCP2FrameBuffer () { return m_NTCP2FrameBuffersPool.Acquire(); }
void DeleteNTCP2FrameBuffer (NTCP2FrameBuffer * buf) { return m_NTCP2FrameBuffersPool.Release(buf); }
private: private:
void Run (); void Run ();
@ -262,8 +258,6 @@ namespace transport
std::map<i2p::data::IdentHash, std::shared_ptr<NTCP2Session> > m_NTCP2Sessions; std::map<i2p::data::IdentHash, std::shared_ptr<NTCP2Session> > m_NTCP2Sessions;
std::list<std::shared_ptr<NTCP2Session> > m_PendingIncomingSessions; std::list<std::shared_ptr<NTCP2Session> > m_PendingIncomingSessions;
i2p::util::MemoryPool<NTCP2FrameBuffer> m_NTCP2FrameBuffersPool; // TODO: remove
public: public:
// for HTTP/I2PControl // for HTTP/I2PControl