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

18 files changed, 71 insertions, 46 deletions

diff --git a/src/ActivePeerConnectionCommand.cc b/src/ActivePeerConnectionCommand.cc
index effdab88..7d17b447 100644
--- a/src/ActivePeerConnectionCommand.cc
+++ b/src/ActivePeerConnectionCommand.cc
@@ -147,7 +147,8 @@ void ActivePeerConnectionCommand::connectToPeer(const SharedHandle<Peer>& peer)
   _e->addCommand(command);
   if(getLogger()->info()) {
     getLogger()->info(MSG_CONNECTING_TO_PEER,
-                      util::itos(getCuid()).c_str(), peer->ipaddr.c_str());
+                      util::itos(getCuid()).c_str(),
+                      peer->getIPAddress().c_str());
   }
 }
 
diff --git a/src/BtLeecherStateChoke.cc b/src/BtLeecherStateChoke.cc
index 266e5723..f211eeba 100644
--- a/src/BtLeecherStateChoke.cc
+++ b/src/BtLeecherStateChoke.cc
@@ -132,7 +132,8 @@ void BtLeecherStateChoke::plannedOptimisticUnchoke
     std::random_shuffle(peerEntries.begin(), i,
                         *(SimpleRandomizer::getInstance().get()));
     (*peerEntries.begin()).enableOptUnchoking();
-    _logger->info("POU: %s", (*peerEntries.begin()).getPeer()->ipaddr.c_str());
+    _logger->info
+      ("POU: %s", (*peerEntries.begin()).getPeer()->getIPAddress().c_str());
   }
 }
 
@@ -152,7 +153,7 @@ void BtLeecherStateChoke::regularUnchoke(std::vector<PeerEntry>& peerEntries)
   for(;peerIter != rest && count; ++peerIter, --count) {
     (*peerIter).disableChokingRequired();
     _logger->info("RU: %s, dlspd=%u",
-                  (*peerIter).getPeer()->ipaddr.c_str(),
+                  (*peerIter).getPeer()->getIPAddress().c_str(),
                   (*peerIter).getDownloadSpeed());
     if((*peerIter).getPeer()->optUnchoking()) {
       fastOptUnchoker = true;
@@ -166,11 +167,11 @@ void BtLeecherStateChoke::regularUnchoke(std::vector<PeerEntry>& peerEntries)
           eoi = peerEntries.end(); i != eoi; ++i) {
       if((*i).getPeer()->peerInterested()) {
         (*i).enableOptUnchoking();
-        _logger->info("OU: %s", (*i).getPeer()->ipaddr.c_str());
+        _logger->info("OU: %s", (*i).getPeer()->getIPAddress().c_str());
         break;
       } else {
         (*i).disableChokingRequired();
-        _logger->info("OU: %s", (*i).getPeer()->ipaddr.c_str());
+        _logger->info("OU: %s", (*i).getPeer()->getIPAddress().c_str());
       }
     }
   }
diff --git a/src/BtPieceMessage.cc b/src/BtPieceMessage.cc
index 8317aca2..f14ef6d3 100644
--- a/src/BtPieceMessage.cc
+++ b/src/BtPieceMessage.cc
@@ -172,7 +172,8 @@ void BtPieceMessage::send()
     if(getLogger()->info()) {
       getLogger()->info(MSG_SEND_PEER_MESSAGE,
                         util::itos(getCuid()).c_str(),
-                        getPeer()->ipaddr.c_str(), getPeer()->port,
+                        getPeer()->getIPAddress().c_str(),
+                        getPeer()->getPort(),
                         toString().c_str());
     }
     unsigned char* msgHdr = createMessageHeader();
diff --git a/src/BtPortMessage.cc b/src/BtPortMessage.cc
index 7a278cc5..fffd16b9 100644
--- a/src/BtPortMessage.cc
+++ b/src/BtPortMessage.cc
@@ -76,7 +76,7 @@ void BtPortMessage::doReceivedAction()
     // node id is random at this point. When ping reply received, new DHTNode
     // instance created with proper node ID and is added to a routing table.
     SharedHandle<DHTNode> node(new DHTNode());
-    node->setIPAddress(getPeer()->ipaddr);
+    node->setIPAddress(getPeer()->getIPAddress());
     node->setPort(_port);
     {
       SharedHandle<DHTTask> task = _taskFactory->createPingTask(node);
diff --git a/src/BtSeederStateChoke.cc b/src/BtSeederStateChoke.cc
index 48f28dfc..3d31b5e7 100644
--- a/src/BtSeederStateChoke.cc
+++ b/src/BtSeederStateChoke.cc
@@ -94,7 +94,7 @@ void BtSeederStateChoke::unchoke
   for(std::vector<PeerEntry>::iterator eoi = peers.end();
       r != eoi && count; ++r, --count) {
     (*r).getPeer()->chokingRequired(false);
-    _logger->info("RU: %s, ulspd=%u", (*r).getPeer()->ipaddr.c_str(),
+    _logger->info("RU: %s, ulspd=%u", (*r).getPeer()->getIPAddress().c_str(),
                   (*r).getUploadSpeed());
   }
 
@@ -105,7 +105,7 @@ void BtSeederStateChoke::unchoke
       std::random_shuffle(r, peers.end(),
                           *(SimpleRandomizer::getInstance().get()));
       (*r).getPeer()->optUnchoking(true);
-      _logger->info("POU: %s", (*r).getPeer()->ipaddr.c_str());
+      _logger->info("POU: %s", (*r).getPeer()->getIPAddress().c_str());
     }
   }
 }
diff --git a/src/DHTGetPeersReplyMessage.cc b/src/DHTGetPeersReplyMessage.cc
index 98ddf30a..1aebbcb3 100644
--- a/src/DHTGetPeersReplyMessage.cc
+++ b/src/DHTGetPeersReplyMessage.cc
@@ -119,7 +119,8 @@ BDE DHTGetPeersReplyMessage::getResponse()
         ++i) {
       const SharedHandle<Peer>& peer = *i;
       unsigned char buffer[6];
-      if(bittorrent::createcompact(buffer, peer->ipaddr, peer->port)) {
+      if(bittorrent::createcompact
+         (buffer, peer->getIPAddress(), peer->getPort())) {
         valuesList << BDE(buffer, sizeof(buffer));
       }
     }
diff --git a/src/DefaultBtInteractive.cc b/src/DefaultBtInteractive.cc
index 67c3b2da..6d042573 100644
--- a/src/DefaultBtInteractive.cc
+++ b/src/DefaultBtInteractive.cc
@@ -157,7 +157,7 @@ BtMessageHandle DefaultBtInteractive::receiveHandshake(bool quickReply) {
   }
   if(_logger->info()) {
     _logger->info(MSG_RECEIVE_PEER_MESSAGE, util::itos(_cuid).c_str(),
-                 _peer->ipaddr.c_str(), _peer->port,
+                 _peer->getIPAddress().c_str(), _peer->getPort(),
                  message->toString().c_str());
   }
   return message;
@@ -228,7 +228,7 @@ void DefaultBtInteractive::addBitfieldMessageToQueue() {
 void DefaultBtInteractive::addAllowedFastMessageToQueue() {
   if(_peer->isFastExtensionEnabled()) {
     std::vector<size_t> fastSet;
-    bittorrent::computeFastSet(fastSet, _peer->ipaddr,
+    bittorrent::computeFastSet(fastSet, _peer->getIPAddress(),
                                _downloadContext->getNumPieces(),
                                bittorrent::getInfoHash(_downloadContext),
                                _allowedFastSetSize);
@@ -294,7 +294,7 @@ size_t DefaultBtInteractive::receiveMessages() {
     ++msgcount;
     if(_logger->info()) {
       _logger->info(MSG_RECEIVE_PEER_MESSAGE, util::itos(_cuid).c_str(),
-                   _peer->ipaddr.c_str(), _peer->port,
+                   _peer->getIPAddress().c_str(), _peer->getPort(),
                    message->toString().c_str());
     }
     message->doReceivedAction();
@@ -478,7 +478,7 @@ void DefaultBtInteractive::addPeerExchangeMessage()
       for(std::deque<SharedHandle<Peer> >::const_iterator i =
             peers.begin(), eoi = peers.end();
           i != eoi && !m->freshPeersAreFull(); ++i) {
-        if(_peer->ipaddr != (*i)->ipaddr) {
+        if(_peer->getIPAddress() != (*i)->getIPAddress()) {
           m->addFreshPeer(*i);
         }
       }
@@ -488,7 +488,7 @@ void DefaultBtInteractive::addPeerExchangeMessage()
             peers.rbegin(), eoi = peers.rend();
           i != eoi && !m->droppedPeersAreFull();
           ++i) {
-        if(_peer->ipaddr != (*i)->ipaddr) {
+        if(_peer->getIPAddress() != (*i)->getIPAddress()) {
           m->addDroppedPeer(*i);
         }
       }
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);
diff --git a/src/HandshakeExtensionMessage.cc b/src/HandshakeExtensionMessage.cc
index e89483c9..00763c65 100644
--- a/src/HandshakeExtensionMessage.cc
+++ b/src/HandshakeExtensionMessage.cc
@@ -102,7 +102,7 @@ std::string HandshakeExtensionMessage::toString() const
 void HandshakeExtensionMessage::doReceivedAction()
 {
   if(_tcpPort > 0) {
-    _peer->port = _tcpPort;
+    _peer->setPort(_tcpPort);
     _peer->setIncomingPeer(false);
   }
   for(std::map<std::string, uint8_t>::const_iterator itr = _extensions.begin(),
diff --git a/src/LpdReceiveMessageCommand.cc b/src/LpdReceiveMessageCommand.cc
index 7bc14be5..7f106803 100644
--- a/src/LpdReceiveMessageCommand.cc
+++ b/src/LpdReceiveMessageCommand.cc
@@ -120,13 +120,13 @@ bool LpdReceiveMessageCommand::execute()
     if(peerStorage->addPeer(peer)) {
       if(getLogger()->debug()) {
         getLogger()->debug("LPD peer %s:%u local=%d added.",
-                           peer->ipaddr.c_str(), peer->port,
+                           peer->getIPAddress().c_str(), peer->getPort(),
                            peer->isLocalPeer()?1:0);
       }
     } else {
       if(getLogger()->debug()) {
         getLogger()->debug("LPD peer %s:%u local=%d not added.",
-                           peer->ipaddr.c_str(), peer->port,
+                           peer->getIPAddress().c_str(), peer->getPort(),
                            peer->isLocalPeer()?1:0);
       }
     }
diff --git a/src/Peer.cc b/src/Peer.cc
index 9a06a9af..ae385123 100644
--- a/src/Peer.cc
+++ b/src/Peer.cc
@@ -48,8 +48,8 @@ namespace aria2 {
 #define BAD_CONDITION_INTERVAL 10
 
 Peer::Peer(std::string ipaddr, uint16_t port, bool incoming):
-  ipaddr(ipaddr),
-  port(port),
+  _ipaddr(ipaddr),
+  _port(port),
   _firstContactTime(global::wallclock),
   _badConditionStartTime(0),
   _seeder(false),
@@ -59,8 +59,8 @@ Peer::Peer(std::string ipaddr, uint16_t port, bool incoming):
 {
   memset(_peerId, 0, PEER_ID_LENGTH);
   resetStatus();
-  id = ipaddr;
-  strappend(id, A2STR::COLON_C, util::uitos(port));
+  _id = _ipaddr;
+  strappend(_id, A2STR::COLON_C, util::uitos(_port));
 }
 
 Peer::~Peer()
diff --git a/src/Peer.h b/src/Peer.h
index c32227a5..61baccf2 100644
--- a/src/Peer.h
+++ b/src/Peer.h
@@ -55,14 +55,14 @@ class PeerSessionResource;
 class BtMessageDispatcher;
 
 class Peer {
-public:
-  std::string ipaddr;
+private:
+  std::string _ipaddr;
   // TCP port of the other end of communication.  If _incoming is
   // true, then this port is not a port the peer is listening to and
   // we cannot connect to it.
-  uint16_t port;
-private:
-  std::string id;
+  uint16_t _port;
+
+  std::string _id;
 
   cuid_t _cuid;
 
@@ -93,7 +93,7 @@ public:
 
   bool operator==(const Peer& p)
   {
-    return id == p.id;
+    return _id == p._id;
   }
   
   bool operator!=(const Peer& p)
@@ -103,6 +103,21 @@ public:
 
   void resetStatus();
 
+  const std::string& getIPAddress() const
+  {
+    return _ipaddr;
+  }
+
+  uint16_t getPort() const
+  {
+    return _port;
+  }
+
+  void setPort(uint16_t port)
+  {
+    _port = port;
+  }
+
   void usedBy(cuid_t cuid);
 
   cuid_t usedBy() const
@@ -135,7 +150,7 @@ public:
 
   const std::string& getID() const
   {
-    return id;
+    return _id;
   }
 
   void startBadCondition();
diff --git a/src/PeerAbstractCommand.cc b/src/PeerAbstractCommand.cc
index ee9763d4..3fb27c66 100644
--- a/src/PeerAbstractCommand.cc
+++ b/src/PeerAbstractCommand.cc
@@ -118,8 +118,9 @@ bool PeerAbstractCommand::execute()
       getLogger()->debug(MSG_TORRENT_DOWNLOAD_ABORTED, err,
                          util::itos(getCuid()).c_str());
       getLogger()->debug(MSG_PEER_BANNED,
-                         util::itos(getCuid()).c_str(), _peer->ipaddr.c_str(),
-                         _peer->port);
+                         util::itos(getCuid()).c_str(),
+                         _peer->getIPAddress().c_str(),
+                         _peer->getPort());
     }
     onAbort();
     return prepareForNextPeer(0);
diff --git a/src/PeerInitiateConnectionCommand.cc b/src/PeerInitiateConnectionCommand.cc
index 0ef93151..4eacf021 100644
--- a/src/PeerInitiateConnectionCommand.cc
+++ b/src/PeerInitiateConnectionCommand.cc
@@ -82,11 +82,13 @@ PeerInitiateConnectionCommand::~PeerInitiateConnectionCommand()
 bool PeerInitiateConnectionCommand::executeInternal() {
   if(getLogger()->info()) {
     getLogger()->info(MSG_CONNECTING_TO_SERVER,
-                      util::itos(getCuid()).c_str(), getPeer()->ipaddr.c_str(),
-                      getPeer()->port);
+                      util::itos(getCuid()).c_str(),
+                      getPeer()->getIPAddress().c_str(),
+                      getPeer()->getPort());
   }
   createSocket();
-  getSocket()->establishConnection(getPeer()->ipaddr, getPeer()->port);
+  getSocket()->establishConnection(getPeer()->getIPAddress(),
+                                   getPeer()->getPort());
   if(_mseHandshakeEnabled) {
     InitiatorMSEHandshakeCommand* c =
       new InitiatorMSEHandshakeCommand(getCuid(), _requestGroup, getPeer(),
diff --git a/src/PeerListenCommand.cc b/src/PeerListenCommand.cc
index c68b985f..99cd3821 100644
--- a/src/PeerListenCommand.cc
+++ b/src/PeerListenCommand.cc
@@ -131,8 +131,8 @@ bool PeerListenCommand::execute() {
       _e->addCommand(command);
       if(getLogger()->debug()) {
         getLogger()->debug("Accepted the connection from %s:%u.",
-                           peer->ipaddr.c_str(),
-                           peer->port);
+                           peer->getIPAddress().c_str(),
+                           peer->getPort());
         getLogger()->debug("Added CUID#%s to receive BitTorrent/MSE handshake.",
                            util::itos(cuid).c_str());
       }
diff --git a/src/SimpleBtMessage.cc b/src/SimpleBtMessage.cc
index 8466d9ec..e542b37e 100644
--- a/src/SimpleBtMessage.cc
+++ b/src/SimpleBtMessage.cc
@@ -55,8 +55,8 @@ void SimpleBtMessage::send() {
     if(getLogger()->info()) {
       getLogger()->info(MSG_SEND_PEER_MESSAGE,
                         util::itos(getCuid()).c_str(),
-                        getPeer()->ipaddr.c_str(),
-                        getPeer()->port,
+                        getPeer()->getIPAddress().c_str(),
+                        getPeer()->getPort(),
                         toString().c_str());
     }
     unsigned char* msg = createMessage();
diff --git a/src/UTPexExtensionMessage.cc b/src/UTPexExtensionMessage.cc
index 77baf8fa..f3d0fdb9 100644
--- a/src/UTPexExtensionMessage.cc
+++ b/src/UTPexExtensionMessage.cc
@@ -80,7 +80,8 @@ UTPexExtensionMessage::createCompactPeerListAndFlag
   for(std::vector<SharedHandle<Peer> >::const_iterator itr = peers.begin(),
         eoi = peers.end(); itr != eoi; ++itr) {
     unsigned char compact[6];
-    if(bittorrent::createcompact(compact, (*itr)->ipaddr, (*itr)->port)) {
+    if(bittorrent::createcompact
+       (compact, (*itr)->getIPAddress(), (*itr)->getPort())) {
       addrstring.append(&compact[0], &compact[6]);
       flagstring += (*itr)->isSeeder() ? "2" : "0";
     }
diff --git a/src/XmlRpcMethodImpl.cc b/src/XmlRpcMethodImpl.cc
index fa306a8b..cb9f3040 100644
--- a/src/XmlRpcMethodImpl.cc
+++ b/src/XmlRpcMethodImpl.cc
@@ -626,11 +626,11 @@ static void gatherPeer(BDE& peers, const SharedHandle<PeerStorage>& ps)
     BDE peerEntry = BDE::dict();
     peerEntry[KEY_PEER_ID] = util::torrentPercentEncode((*i)->getPeerId(),
                                                         PEER_ID_LENGTH);
-    peerEntry[KEY_IP] = (*i)->ipaddr;
+    peerEntry[KEY_IP] = (*i)->getIPAddress();
     if((*i)->isIncomingPeer()) {
       peerEntry[KEY_PORT] = std::string("0");
     } else {
-      peerEntry[KEY_PORT] = util::uitos((*i)->port);
+      peerEntry[KEY_PORT] = util::uitos((*i)->getPort());
     }
     peerEntry[KEY_BITFIELD] = util::toHex((*i)->getBitfield(),
                                           (*i)->getBitfieldLength());