From a05a20440eb95f077ca1eff3dde89299df712f6e Mon Sep 17 00:00:00 2001 From: orignal Date: Wed, 24 Jun 2015 10:25:05 -0400 Subject: [PATCH] deleted deprecated SendMessage --- I2NPProtocol.cpp | 16 ++++++++-------- NetDb.cpp | 6 +++--- Transports.cpp | 13 ------------- Transports.h | 2 -- 4 files changed, 11 insertions(+), 26 deletions(-) diff --git a/I2NPProtocol.cpp b/I2NPProtocol.cpp index c0806d53..57646b17 100644 --- a/I2NPProtocol.cpp +++ b/I2NPProtocol.cpp @@ -358,14 +358,14 @@ namespace i2p { // so we send it to reply tunnel transports.SendMessage (clearText + BUILD_REQUEST_RECORD_NEXT_IDENT_OFFSET, - CreateTunnelGatewayMsg (bufbe32toh (clearText + BUILD_REQUEST_RECORD_NEXT_TUNNEL_OFFSET), + ToSharedI2NPMessage (CreateTunnelGatewayMsg (bufbe32toh (clearText + BUILD_REQUEST_RECORD_NEXT_TUNNEL_OFFSET), eI2NPVariableTunnelBuildReply, buf, len, - bufbe32toh (clearText + BUILD_REQUEST_RECORD_SEND_MSG_ID_OFFSET))); + bufbe32toh (clearText + BUILD_REQUEST_RECORD_SEND_MSG_ID_OFFSET)))); } else transports.SendMessage (clearText + BUILD_REQUEST_RECORD_NEXT_IDENT_OFFSET, - CreateI2NPMessage (eI2NPVariableTunnelBuild, buf, len, - bufbe32toh (clearText + BUILD_REQUEST_RECORD_SEND_MSG_ID_OFFSET))); + ToSharedI2NPMessage (CreateI2NPMessage (eI2NPVariableTunnelBuild, buf, len, + bufbe32toh (clearText + BUILD_REQUEST_RECORD_SEND_MSG_ID_OFFSET)))); } } } @@ -379,14 +379,14 @@ namespace i2p { // so we send it to reply tunnel transports.SendMessage (clearText + BUILD_REQUEST_RECORD_NEXT_IDENT_OFFSET, - CreateTunnelGatewayMsg (bufbe32toh (clearText + BUILD_REQUEST_RECORD_NEXT_TUNNEL_OFFSET), + ToSharedI2NPMessage (CreateTunnelGatewayMsg (bufbe32toh (clearText + BUILD_REQUEST_RECORD_NEXT_TUNNEL_OFFSET), eI2NPTunnelBuildReply, buf, len, - bufbe32toh (clearText + BUILD_REQUEST_RECORD_SEND_MSG_ID_OFFSET))); + bufbe32toh (clearText + BUILD_REQUEST_RECORD_SEND_MSG_ID_OFFSET)))); } else transports.SendMessage (clearText + BUILD_REQUEST_RECORD_NEXT_IDENT_OFFSET, - CreateI2NPMessage (eI2NPTunnelBuild, buf, len, - bufbe32toh (clearText + BUILD_REQUEST_RECORD_SEND_MSG_ID_OFFSET))); + ToSharedI2NPMessage (CreateI2NPMessage (eI2NPTunnelBuild, buf, len, + bufbe32toh (clearText + BUILD_REQUEST_RECORD_SEND_MSG_ID_OFFSET)))); } } diff --git a/NetDb.cpp b/NetDb.cpp index 8abb317e..36e637f1 100644 --- a/NetDb.cpp +++ b/NetDb.cpp @@ -471,7 +471,7 @@ namespace data uint32_t tunnelID = bufbe32toh (buf + offset); offset += 4; if (!tunnelID) // send response directly - transports.SendMessage (buf + offset, deliveryStatus); + transports.SendMessage (buf + offset, ToSharedI2NPMessage (deliveryStatus)); else { auto pool = i2p::tunnel::tunnels.GetExploratoryPool (); @@ -503,7 +503,7 @@ namespace data memcpy (payload + DATABASE_STORE_HEADER_SIZE, buf + offset, len - offset); floodMsg->len += DATABASE_STORE_HEADER_SIZE + len -offset; FillI2NPMessageHeader (floodMsg, eI2NPDatabaseStore); - transports.SendMessage (floodfill->GetIdentHash (), floodMsg); + transports.SendMessage (floodfill->GetIdentHash (), ToSharedI2NPMessage (floodMsg)); } } } @@ -817,7 +817,7 @@ namespace data { uint32_t replyToken = i2p::context.GetRandomNumberGenerator ().GenerateWord32 (); LogPrint ("Publishing our RouterInfo to ", floodfill->GetIdentHashAbbreviation (), ". reply token=", replyToken); - transports.SendMessage (floodfill->GetIdentHash (), CreateDatabaseStoreMsg (i2p::context.GetSharedRouterInfo (), replyToken)); + transports.SendMessage (floodfill->GetIdentHash (), ToSharedI2NPMessage (CreateDatabaseStoreMsg (i2p::context.GetSharedRouterInfo (), replyToken))); excluded.insert (floodfill->GetIdentHash ()); } } diff --git a/Transports.cpp b/Transports.cpp index 381d31e8..738db896 100644 --- a/Transports.cpp +++ b/Transports.cpp @@ -213,19 +213,6 @@ namespace transport return std::max (m_InBandwidth, m_OutBandwidth) > LOW_BANDWIDTH_LIMIT; } - void Transports::SendMessage (const i2p::data::IdentHash& ident, i2p::I2NPMessage * msg) - { - SendMessage (ident, ToSharedI2NPMessage (msg)); - } - - void Transports::SendMessages (const i2p::data::IdentHash& ident, const std::vector& msgs) - { - std::vector > msgs1; - for (auto it: msgs) - msgs1.push_back (ToSharedI2NPMessage (it)); - SendMessages (ident, msgs1); - } - void Transports::SendMessage (const i2p::data::IdentHash& ident, std::shared_ptr msg) { m_Service.post (std::bind (&Transports::PostMessages, this, ident, std::vector > {msg })); diff --git a/Transports.h b/Transports.h index b29d7f1a..15ad980e 100644 --- a/Transports.h +++ b/Transports.h @@ -87,8 +87,6 @@ namespace transport i2p::transport::DHKeysPair * GetNextDHKeysPair (); void ReuseDHKeysPair (DHKeysPair * pair); - void SendMessage (const i2p::data::IdentHash& ident, i2p::I2NPMessage * msg); // deprecated - void SendMessages (const i2p::data::IdentHash& ident, const std::vector& msgs); // deprecated void SendMessage (const i2p::data::IdentHash& ident, std::shared_ptr msg); void SendMessages (const i2p::data::IdentHash& ident, const std::vector >& msgs); void CloseSession (std::shared_ptr router);