From 6e32c389b1ec24ce450c7f841067b4fd39389860 Mon Sep 17 00:00:00 2001 From: orignal Date: Mon, 15 Dec 2014 19:08:46 -0500 Subject: [PATCH] some cleanup --- HTTPServer.cpp | 4 ---- TunnelPool.h | 10 +++------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/HTTPServer.cpp b/HTTPServer.cpp index 7fb92115..4744a17e 100644 --- a/HTTPServer.cpp +++ b/HTTPServer.cpp @@ -749,8 +749,6 @@ namespace util for (auto it: i2p::tunnel::tunnels.GetOutboundTunnels ()) { it->GetTunnelConfig ()->Print (s); - if (it->GetTunnelPool () && !it->GetTunnelPool ()->IsExploratory ()) - s << " " << "Pool"; auto state = it->GetState (); if (state == i2p::tunnel::eTunnelStateFailed) s << " " << "Failed"; @@ -763,8 +761,6 @@ namespace util for (auto it: i2p::tunnel::tunnels.GetInboundTunnels ()) { it.second->GetTunnelConfig ()->Print (s); - if (it.second->GetTunnelPool () && !it.second->GetTunnelPool ()->IsExploratory ()) - s << " " << "Pool"; auto state = it.second->GetState (); if (state == i2p::tunnel::eTunnelStateFailed) s << " " << "Failed"; diff --git a/TunnelPool.h b/TunnelPool.h index a697e9f7..9415386f 100644 --- a/TunnelPool.h +++ b/TunnelPool.h @@ -28,11 +28,8 @@ namespace tunnel TunnelPool (i2p::garlic::GarlicDestination& localDestination, int numInboundHops, int numOutboundHops, int numTunnels = 5); ~TunnelPool (); - - const uint8_t * GetEncryptionPrivateKey () const { return m_LocalDestination.GetEncryptionPrivateKey (); }; - const uint8_t * GetEncryptionPublicKey () const { return m_LocalDestination.GetEncryptionPublicKey (); }; - i2p::garlic::GarlicDestination& GetLocalDestination () const { return m_LocalDestination; }; - bool IsExploratory () const { return GetIdentHash () == i2p::context.GetIdentHash (); }; + + i2p::garlic::GarlicDestination& GetLocalDestination () const { return m_LocalDestination; }; void CreateTunnels (); void TunnelCreated (InboundTunnel * createdTunnel); @@ -41,8 +38,7 @@ namespace tunnel void TunnelExpired (OutboundTunnel * expiredTunnel); std::vector GetInboundTunnels (int num) const; OutboundTunnel * GetNextOutboundTunnel (OutboundTunnel * suggested = nullptr) const; - InboundTunnel * GetNextInboundTunnel (InboundTunnel * suggested = nullptr) const; - const i2p::data::IdentHash& GetIdentHash () const { return m_LocalDestination.GetIdentHash (); }; + InboundTunnel * GetNextInboundTunnel (InboundTunnel * suggested = nullptr) const; void TestTunnels (); void ProcessDeliveryStatus (I2NPMessage * msg);