From c56ddce2f6ff482c3f95adfb7dc96f1f9d6ce8b4 Mon Sep 17 00:00:00 2001 From: orignal Date: Tue, 14 Apr 2015 10:46:44 -0400 Subject: [PATCH] some cleanup --- Transports.cpp | 38 +------------------------------------- Transports.h | 1 - 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/Transports.cpp b/Transports.cpp index 3270c174..860d5611 100644 --- a/Transports.cpp +++ b/Transports.cpp @@ -207,49 +207,13 @@ namespace transport void Transports::SendMessage (const i2p::data::IdentHash& ident, i2p::I2NPMessage * msg) { - m_Service.post (std::bind (&Transports::PostMessage, this, ident, msg)); + m_Service.post (std::bind (&Transports::PostMessages, this, ident, std::vector {msg})); } void Transports::SendMessages (const i2p::data::IdentHash& ident, const std::vector& msgs) { m_Service.post (std::bind (&Transports::PostMessages, this, ident, msgs)); } - - void Transports::PostMessage (i2p::data::IdentHash ident, i2p::I2NPMessage * msg) - { - if (ident == i2p::context.GetRouterInfo ().GetIdentHash ()) - { - // we send it to ourself - i2p::HandleI2NPMessage (msg); - return; - } - - auto it = m_Peers.find (ident); - if (it == m_Peers.end ()) - { - bool connected = false; - try - { - auto r = netdb.FindRouter (ident); - it = m_Peers.insert (std::pair(ident, { 0, r, nullptr, - i2p::util::GetSecondsSinceEpoch () })).first; - connected= ConnectToPeer (ident, it->second); - } - catch (std::exception& ex) - { - LogPrint (eLogError, "Transports::PostMessage ", ex.what ()); - } - if (!connected) - { - DeleteI2NPMessage (msg); - return; - } - } - if (it->second.session) - it->second.session->SendI2NPMessage (msg); - else - it->second.delayedMessages.push_back (msg); - } void Transports::PostMessages (i2p::data::IdentHash ident, std::vector msgs) { diff --git a/Transports.h b/Transports.h index 64760dde..b5ee61fc 100644 --- a/Transports.h +++ b/Transports.h @@ -104,7 +104,6 @@ namespace transport void Run (); void RequestComplete (std::shared_ptr r, const i2p::data::IdentHash& ident); void HandleRequestComplete (std::shared_ptr r, const i2p::data::IdentHash& ident); - void PostMessage (i2p::data::IdentHash ident, i2p::I2NPMessage * msg); void PostMessages (i2p::data::IdentHash ident, std::vector msgs); void PostCloseSession (std::shared_ptr router); bool ConnectToPeer (const i2p::data::IdentHash& ident, Peer& peer);