From 805990618e2994af483aed629bc3de56dc5ec5e1 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Thu, 19 Jan 2012 10:02:34 -0800 Subject: [PATCH] Remove some functionality that belongs in ConnectionPool --- PeerDoor.cpp | 34 ---------------------------------- PeerDoor.h | 12 ------------ 2 files changed, 46 deletions(-) diff --git a/PeerDoor.cpp b/PeerDoor.cpp index 61de1e832..0e95356e1 100644 --- a/PeerDoor.cpp +++ b/PeerDoor.cpp @@ -34,37 +34,3 @@ void PeerDoor::handleConnect(Peer::pointer new_connection, startListening(); } -bool PeerDoor::addToMap(const uint160& hanko, Peer::pointer peer) -{ - boost::mutex::scoped_lock sl(peerLock); - return peerMap.insert(std::make_pair(hanko, peer)).second; -} - -bool PeerDoor::delFromMap(const uint160& hanko, Peer::pointer peer) -{ - boost::mutex::scoped_lock sl(peerLock); - std::map::iterator it=peerMap.find(hanko); - if((it==peerMap.end()) || (it->first!=hanko)) return false; - peerMap.erase(it); - return true; -} - -Peer::pointer PeerDoor::findInMap(const uint160& hanko) -{ - boost::mutex::scoped_lock sl(peerLock); - std::map::iterator it=peerMap.find(hanko); - if(it==peerMap.end()) return Peer::pointer(); - return it->second; -} - -bool PeerDoor::inMap(const uint160& hanko) -{ - boost::mutex::scoped_lock sl(peerLock); - return peerMap.find(hanko) != peerMap.end(); -} - -std::map PeerDoor::getAllConnected() -{ - boost::mutex::scoped_lock sl(peerLock); - return peerMap; -} diff --git a/PeerDoor.h b/PeerDoor.h index 2b000fffe..a54cf27b8 100644 --- a/PeerDoor.h +++ b/PeerDoor.h @@ -2,7 +2,6 @@ #include #include -#include #include "Peer.h" @@ -17,17 +16,6 @@ class PeerDoor void handleConnect(Peer::pointer new_connection, const boost::system::error_code& error); - boost::mutex peerLock; - std::map peerMap; - public: PeerDoor(boost::asio::io_service& io_service); - - - // hanko->peer mapping functions - bool inMap(const uint160& hanko); - bool addToMap(const uint160& hanko, Peer::pointer peer); - bool delFromMap(const uint160& hanko, Peer::pointer peer); - Peer::pointer findInMap(const uint160& hanko); - std::map getAllConnected(); };