From 2ae68923cc36ce08fee41b824003bf7a63cf2753 Mon Sep 17 00:00:00 2001 From: Nik Bougalis Date: Sun, 1 May 2016 17:07:01 -0700 Subject: [PATCH] Remove unused legacy endpoint reporting --- src/ripple/overlay/impl/PeerImp.cpp | 20 ++----------------- src/ripple/peerfinder/PeerfinderManager.h | 3 --- src/ripple/peerfinder/impl/Logic.h | 9 --------- .../peerfinder/impl/PeerfinderManager.cpp | 6 ------ 4 files changed, 2 insertions(+), 36 deletions(-) diff --git a/src/ripple/overlay/impl/PeerImp.cpp b/src/ripple/overlay/impl/PeerImp.cpp index b7be5c0f78..98cc79e78d 100644 --- a/src/ripple/overlay/impl/PeerImp.cpp +++ b/src/ripple/overlay/impl/PeerImp.cpp @@ -985,24 +985,8 @@ PeerImp::onMessage (std::shared_ptr const& m) void PeerImp::onMessage (std::shared_ptr const& m) { - // VFALCO TODO This message is now obsolete due to PeerFinder - std::vector list; - list.reserve (m->nodes().size()); - for (int i = 0; i < m->nodes ().size (); ++i) - { - in_addr addr; - - addr.s_addr = m->nodes (i).ipv4 (); - - { - beast::IP::AddressV4 v4 (ntohl (addr.s_addr)); - beast::IP::Endpoint address (v4, m->nodes (i).ipv4port ()); - list.push_back (address); - } - } - - if (! list.empty()) - overlay_.peerFinder().on_legacy_endpoints (list); + // This message is obsolete due to PeerFinder and + // we no longer process it. } void diff --git a/src/ripple/peerfinder/PeerfinderManager.h b/src/ripple/peerfinder/PeerfinderManager.h index 5dc3758f20..30a56b1525 100644 --- a/src/ripple/peerfinder/PeerfinderManager.h +++ b/src/ripple/peerfinder/PeerfinderManager.h @@ -189,9 +189,6 @@ public: virtual void on_endpoints (Slot::ptr const& slot, Endpoints const& endpoints) = 0; - /** Called when legacy IP/port addresses are received. */ - virtual void on_legacy_endpoints (IPAddresses const& addresses) = 0; - /** Called when the slot is closed. This always happens when the socket is closed, unless the socket was canceled. diff --git a/src/ripple/peerfinder/impl/Logic.h b/src/ripple/peerfinder/impl/Logic.h index 6e4319801d..dc5354b152 100644 --- a/src/ripple/peerfinder/impl/Logic.h +++ b/src/ripple/peerfinder/impl/Logic.h @@ -816,15 +816,6 @@ public: //-------------------------------------------------------------------------- - void on_legacy_endpoints (IPAddresses const& list) - { - // Ignoring them also seems a valid choice. - std::lock_guard _(lock_); - for (IPAddresses::const_iterator iter (list.begin()); - iter != list.end(); ++iter) - bootcache_.insert (*iter); - } - void remove (SlotImp::ptr const& slot) { auto const iter = slots_.find ( diff --git a/src/ripple/peerfinder/impl/PeerfinderManager.cpp b/src/ripple/peerfinder/impl/PeerfinderManager.cpp index edcad9fdd8..e7e5f1dcfc 100644 --- a/src/ripple/peerfinder/impl/PeerfinderManager.cpp +++ b/src/ripple/peerfinder/impl/PeerfinderManager.cpp @@ -142,12 +142,6 @@ public: m_logic.on_endpoints (impl, endpoints); } - void - on_legacy_endpoints (IPAddresses const& addresses) override - { - m_logic.on_legacy_endpoints (addresses); - } - void on_closed (Slot::ptr const& slot) override {