2008-01-10 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Fixed the bug that DefaultPeerStorage::returnPeer() may delete wrong
	peer if there are peers that have same ipaddr and port.
	I've experiened segmentation fault and "pure virtual function was
	called" error.
	* src/Peer.h
	* test/PeerTest.cc
	* src/DefaultPeerStorage.cc
	* test/DefaultPeerStorageTest.cc

1 files changed, 13 insertions, 1 deletions

diff --git a/src/DefaultPeerStorage.cc b/src/DefaultPeerStorage.cc
index 059cf0b6..65dbf7b5 100644
--- a/src/DefaultPeerStorage.cc
+++ b/src/DefaultPeerStorage.cc
@@ -52,9 +52,21 @@ DefaultPeerStorage::DefaultPeerStorage(BtContextHandle btContext,
 
 DefaultPeerStorage::~DefaultPeerStorage() {}
 
+class FindIdenticalPeer {
+private:
+  PeerHandle _peer;
+public:
+  FindIdenticalPeer(const PeerHandle& peer):_peer(peer) {}
+
+  bool operator()(const PeerHandle& peer) const {
+    return _peer == peer ||
+      _peer->ipaddr == peer->ipaddr && _peer->port == peer->port;
+  }
+};
+
 bool DefaultPeerStorage::isPeerAlreadyAdded(const PeerHandle& peer)
 {
-  return find(peers.begin(), peers.end(), peer) != peers.end();
+  return find_if(peers.begin(), peers.end(), FindIdenticalPeer(peer)) != peers.end();
 }
 
 bool DefaultPeerStorage::addPeer(const PeerHandle& peer) {