From 55258bc0192c814654af0288425b7efb009cf6cc Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sun, 13 Jun 2010 01:53:49 +0000
Subject: 2010-06-13  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>

	Renamed member variables
	* src/ActivePeerConnectionCommand.cc
	* src/BtLeecherStateChoke.cc
	* src/BtPieceMessage.cc
	* src/BtPortMessage.cc
	* src/BtSeederStateChoke.cc
	* src/DHTGetPeersReplyMessage.cc
	* src/DefaultBtInteractive.cc
	* src/DefaultPeerStorage.cc
	* src/HandshakeExtensionMessage.cc
	* src/LpdReceiveMessageCommand.cc
	* src/Peer.cc
	* src/Peer.h
	* src/PeerAbstractCommand.cc
	* src/PeerInitiateConnectionCommand.cc
	* src/PeerListenCommand.cc
	* src/SimpleBtMessage.cc
	* src/UTPexExtensionMessage.cc
	* src/XmlRpcMethodImpl.cc
	* test/DHTAnnouncePeerMessageTest.cc
	* test/DHTGetPeersMessageTest.cc
	* test/DHTGetPeersReplyMessageTest.cc
	* test/DHTMessageFactoryImplTest.cc
	* test/DHTPeerAnnounceEntryTest.cc
	* test/DHTPeerAnnounceStorageTest.cc
	* test/DefaultPeerStorageTest.cc
	* test/HandshakeExtensionMessageTest.cc
	* test/LpdMessageReceiverTest.cc
	* test/PeerListProcessorTest.cc
	* test/PeerTest.cc
	* test/UTPexExtensionMessageTest.cc
---
 src/DefaultPeerStorage.cc | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/DefaultPeerStorage.cc')

diff --git a/src/DefaultPeerStorage.cc b/src/DefaultPeerStorage.cc
index 669abe56..6dc59770 100644
--- a/src/DefaultPeerStorage.cc
+++ b/src/DefaultPeerStorage.cc
@@ -73,7 +73,8 @@ public:
 
   bool operator()(const SharedHandle<Peer>& peer) const {
     return (_peer == peer) ||
-      ((_peer->ipaddr == peer->ipaddr) && (_peer->port == peer->port));
+      ((_peer->getIPAddress() == peer->getIPAddress()) &&
+       (_peer->getPort() == peer->getPort()));
   }
 };
 
@@ -97,7 +98,7 @@ bool DefaultPeerStorage::addPeer(const SharedHandle<Peer>& peer) {
   if(isPeerAlreadyAdded(peer)) {
     if(_logger->debug()) {
       _logger->debug("Adding %s:%u is rejected because it has been already"
-                    " added.", peer->ipaddr.c_str(), peer->port);
+                    " added.", peer->getIPAddress().c_str(), peer->getPort());
     }
     return false;
   }
@@ -116,7 +117,8 @@ void DefaultPeerStorage::addPeer(const std::vector<SharedHandle<Peer> >& peers)
     const SharedHandle<Peer>& peer = *itr;
     if(addPeer(peer)) {
       if(_logger->debug()) {
-        _logger->debug(MSG_ADDING_PEER, peer->ipaddr.c_str(), peer->port);
+        _logger->debug(MSG_ADDING_PEER,
+                       peer->getIPAddress().c_str(), peer->getPort());
       }
     }
   }  
@@ -153,7 +155,7 @@ public:
     ipaddr(ipaddr), port(port) {}
 
   bool operator()(const SharedHandle<Peer>& peer) const {
-    return ipaddr == peer->ipaddr && port == peer->port;
+    return ipaddr == peer->getIPAddress() && port == peer->getPort();
   }
 };
 
@@ -300,7 +302,7 @@ void DefaultPeerStorage::returnPeer(const SharedHandle<Peer>& peer)
   if(itr == _peers.end()) {
     if(_logger->debug()) {
       _logger->debug("Cannot find peer %s:%u in PeerStorage.",
-                    peer->ipaddr.c_str(), peer->port);
+                    peer->getIPAddress().c_str(), peer->getPort());
     }
   } else {
     _peers.erase(itr);
-- 
cgit