From 55258bc0192c814654af0288425b7efb009cf6cc Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sun, 13 Jun 2010 01:53:49 +0000 Subject: [PATCH] 2010-06-13 Tatsuhiro Tsujikawa 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 --- ChangeLog | 34 +++++++++++++++++++++++++++ src/ActivePeerConnectionCommand.cc | 3 ++- src/BtLeecherStateChoke.cc | 9 +++---- src/BtPieceMessage.cc | 3 ++- src/BtPortMessage.cc | 2 +- src/BtSeederStateChoke.cc | 4 ++-- src/DHTGetPeersReplyMessage.cc | 3 ++- src/DefaultBtInteractive.cc | 10 ++++---- src/DefaultPeerStorage.cc | 12 ++++++---- src/HandshakeExtensionMessage.cc | 2 +- src/LpdReceiveMessageCommand.cc | 4 ++-- src/Peer.cc | 8 +++---- src/Peer.h | 29 +++++++++++++++++------ src/PeerAbstractCommand.cc | 5 ++-- src/PeerInitiateConnectionCommand.cc | 8 ++++--- src/PeerListenCommand.cc | 4 ++-- src/SimpleBtMessage.cc | 4 ++-- src/UTPexExtensionMessage.cc | 3 ++- src/XmlRpcMethodImpl.cc | 4 ++-- test/DHTAnnouncePeerMessageTest.cc | 4 ++-- test/DHTGetPeersMessageTest.cc | 8 +++---- test/DHTGetPeersReplyMessageTest.cc | 2 +- test/DHTMessageFactoryImplTest.cc | 2 +- test/DHTPeerAnnounceEntryTest.cc | 8 +++---- test/DHTPeerAnnounceStorageTest.cc | 4 ++-- test/DefaultPeerStorageTest.cc | 11 +++++---- test/HandshakeExtensionMessageTest.cc | 2 +- test/LpdMessageReceiverTest.cc | 2 +- test/PeerListProcessorTest.cc | 12 +++++----- test/PeerTest.cc | 2 +- test/UTPexExtensionMessageTest.cc | 32 ++++++++++++------------- 31 files changed, 150 insertions(+), 90 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb1d4dea9..98b49bcae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,37 @@ +2010-06-13 Tatsuhiro Tsujikawa + + 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 + 2010-06-13 Tatsuhiro Tsujikawa Made DHTNode::getIPAddress() return const reference. diff --git a/src/ActivePeerConnectionCommand.cc b/src/ActivePeerConnectionCommand.cc index effdab880..7d17b447b 100644 --- a/src/ActivePeerConnectionCommand.cc +++ b/src/ActivePeerConnectionCommand.cc @@ -147,7 +147,8 @@ void ActivePeerConnectionCommand::connectToPeer(const SharedHandle& 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 266e57234..f211eeba0 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& 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& 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 8317aca2a..f14ef6d38 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 7a278cc51..fffd16b95 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 node(new DHTNode()); - node->setIPAddress(getPeer()->ipaddr); + node->setIPAddress(getPeer()->getIPAddress()); node->setPort(_port); { SharedHandle task = _taskFactory->createPingTask(node); diff --git a/src/BtSeederStateChoke.cc b/src/BtSeederStateChoke.cc index 48f28dfca..3d31b5e70 100644 --- a/src/BtSeederStateChoke.cc +++ b/src/BtSeederStateChoke.cc @@ -94,7 +94,7 @@ void BtSeederStateChoke::unchoke for(std::vector::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 98ddf30af..1aebbcb38 100644 --- a/src/DHTGetPeersReplyMessage.cc +++ b/src/DHTGetPeersReplyMessage.cc @@ -119,7 +119,8 @@ BDE DHTGetPeersReplyMessage::getResponse() ++i) { const SharedHandle& 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 67c3b2daf..6d0425737 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 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 >::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 669abe564..6dc597702 100644 --- a/src/DefaultPeerStorage.cc +++ b/src/DefaultPeerStorage.cc @@ -73,7 +73,8 @@ public: bool operator()(const SharedHandle& 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) { 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 >& peers) const SharedHandle& 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) 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) 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 e89483c93..00763c65a 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::const_iterator itr = _extensions.begin(), diff --git a/src/LpdReceiveMessageCommand.cc b/src/LpdReceiveMessageCommand.cc index 7bc14be52..7f1068034 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 9a06a9af2..ae3851233 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 c32227a5e..61baccf27 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 ee9763d4a..3fb27c665 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 0ef931511..4eacf021c 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 c68b985fe..99cd38219 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 8466d9ece..e542b37ed 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 77baf8fa3..f3d0fdb90 100644 --- a/src/UTPexExtensionMessage.cc +++ b/src/UTPexExtensionMessage.cc @@ -80,7 +80,8 @@ UTPexExtensionMessage::createCompactPeerListAndFlag for(std::vector >::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 fa306a8b4..cb9f3040f 100644 --- a/src/XmlRpcMethodImpl.cc +++ b/src/XmlRpcMethodImpl.cc @@ -626,11 +626,11 @@ static void gatherPeer(BDE& peers, const SharedHandle& 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()); diff --git a/test/DHTAnnouncePeerMessageTest.cc b/test/DHTAnnouncePeerMessageTest.cc index 5e9d3730e..55272d848 100644 --- a/test/DHTAnnouncePeerMessageTest.cc +++ b/test/DHTAnnouncePeerMessageTest.cc @@ -117,8 +117,8 @@ void DHTAnnouncePeerMessageTest::testDoReceivedAction() CPPUNIT_ASSERT_EQUAL((size_t)1, peers.size()); { SharedHandle peer = peers[0]; - CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.1"), peer->ipaddr); - CPPUNIT_ASSERT_EQUAL((uint16_t)6882, peer->port); + CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.1"), peer->getIPAddress()); + CPPUNIT_ASSERT_EQUAL((uint16_t)6882, peer->getPort()); } } diff --git a/test/DHTGetPeersMessageTest.cc b/test/DHTGetPeersMessageTest.cc index b0f2f3eaa..69e8033be 100644 --- a/test/DHTGetPeersMessageTest.cc +++ b/test/DHTGetPeersMessageTest.cc @@ -144,13 +144,13 @@ void DHTGetPeersMessageTest::testDoReceivedAction() CPPUNIT_ASSERT_EQUAL((size_t)2, m->_peers.size()); { SharedHandle peer = m->_peers[0]; - CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.100"), peer->ipaddr); - CPPUNIT_ASSERT_EQUAL((uint16_t)6888, peer->port); + CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.100"), peer->getIPAddress()); + CPPUNIT_ASSERT_EQUAL((uint16_t)6888, peer->getPort()); } { SharedHandle peer = m->_peers[1]; - CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.101"), peer->ipaddr); - CPPUNIT_ASSERT_EQUAL((uint16_t)6889, peer->port); + CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.101"), peer->getIPAddress()); + CPPUNIT_ASSERT_EQUAL((uint16_t)6889, peer->getPort()); } } dispatcher._messageQueue.clear(); diff --git a/test/DHTGetPeersReplyMessageTest.cc b/test/DHTGetPeersReplyMessageTest.cc index 57f8d2021..c7ecef808 100644 --- a/test/DHTGetPeersReplyMessageTest.cc +++ b/test/DHTGetPeersReplyMessageTest.cc @@ -82,7 +82,7 @@ void DHTGetPeersReplyMessageTest::testGetBencodedMessage() SharedHandle peer(new Peer("192.168.0."+util::uitos(i+1), 6881+i)); unsigned char buffer[6]; CPPUNIT_ASSERT(bittorrent::createcompact - (buffer, peer->ipaddr, peer->port)); + (buffer, peer->getIPAddress(), peer->getPort())); valuesList << BDE(buffer, sizeof(buffer)); peers.push_back(peer); } diff --git a/test/DHTMessageFactoryImplTest.cc b/test/DHTMessageFactoryImplTest.cc index 407e940a7..081707a41 100644 --- a/test/DHTMessageFactoryImplTest.cc +++ b/test/DHTMessageFactoryImplTest.cc @@ -292,7 +292,7 @@ void DHTMessageFactoryImplTest::testCreateGetPeersReplyMessage_values() SharedHandle peer(new Peer("192.168.0."+util::uitos(i+1), 6881+i)); unsigned char buffer[6]; CPPUNIT_ASSERT(bittorrent::createcompact - (buffer, peer->ipaddr, peer->port)); + (buffer, peer->getIPAddress(), peer->getPort())); valuesList << BDE(buffer, sizeof(buffer)); peers.push_back(peer); } diff --git a/test/DHTPeerAnnounceEntryTest.cc b/test/DHTPeerAnnounceEntryTest.cc index 299af7df7..bb1edda7e 100644 --- a/test/DHTPeerAnnounceEntryTest.cc +++ b/test/DHTPeerAnnounceEntryTest.cc @@ -102,10 +102,10 @@ void DHTPeerAnnounceEntryTest::testGetPeers() std::vector > peers; entry.getPeers(peers); CPPUNIT_ASSERT_EQUAL((size_t)2, peers.size()); - CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.1"), peers[0]->ipaddr); - CPPUNIT_ASSERT_EQUAL((uint16_t)6881, peers[0]->port); - CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.2"), peers[1]->ipaddr); - CPPUNIT_ASSERT_EQUAL((uint16_t)6882, peers[1]->port); + CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.1"), peers[0]->getIPAddress()); + CPPUNIT_ASSERT_EQUAL((uint16_t)6881, peers[0]->getPort()); + CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.2"), peers[1]->getIPAddress()); + CPPUNIT_ASSERT_EQUAL((uint16_t)6882, peers[1]->getPort()); } } diff --git a/test/DHTPeerAnnounceStorageTest.cc b/test/DHTPeerAnnounceStorageTest.cc index a6c4c1b30..300f79550 100644 --- a/test/DHTPeerAnnounceStorageTest.cc +++ b/test/DHTPeerAnnounceStorageTest.cc @@ -43,8 +43,8 @@ void DHTPeerAnnounceStorageTest::testAddAnnounce() storage.getPeers(peers, infohash2); CPPUNIT_ASSERT_EQUAL((size_t)2, peers.size()); - CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.3"), peers[0]->ipaddr); - CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.4"), peers[1]->ipaddr); + CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.3"), peers[0]->getIPAddress()); + CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.4"), peers[1]->getIPAddress()); } } // namespace aria2 diff --git a/test/DefaultPeerStorageTest.cc b/test/DefaultPeerStorageTest.cc index 65278b018..f9467d75d 100644 --- a/test/DefaultPeerStorageTest.cc +++ b/test/DefaultPeerStorageTest.cc @@ -78,7 +78,7 @@ void DefaultPeerStorageTest::testDeleteUnusedPeer() { CPPUNIT_ASSERT_EQUAL((size_t)1, ps.countPeer()); CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.3"), - ps.getPeer("192.168.0.3", 6889)->ipaddr); + ps.getPeer("192.168.0.3", 6889)->getIPAddress()); ps.addPeer(peer1); ps.addPeer(peer2); @@ -90,7 +90,7 @@ void DefaultPeerStorageTest::testDeleteUnusedPeer() { // peer2 has been in use, so it did't deleted. CPPUNIT_ASSERT_EQUAL((size_t)1, ps.countPeer()); CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.2"), - ps.getPeer("192.168.0.2", 6889)->ipaddr); + ps.getPeer("192.168.0.2", 6889)->getIPAddress()); } @@ -125,9 +125,10 @@ void DefaultPeerStorageTest::testAddPeer() { SharedHandle peer5(new Peer("192.168.0.4", 0)); - peer5->port = 6889; + peer5->setPort(6889); - // this returns false because the peer which has same ip and port has already added + // this returns false because the peer which has same ip and port + // has already added CPPUNIT_ASSERT_EQUAL(false, ps.addPeer(peer5)); } @@ -140,7 +141,7 @@ void DefaultPeerStorageTest::testGetUnusedPeer() { ps.addPeer(peer1); CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.1"), - ps.getUnusedPeer()->ipaddr); + ps.getUnusedPeer()->getIPAddress()); peer1->usedBy(1); diff --git a/test/HandshakeExtensionMessageTest.cc b/test/HandshakeExtensionMessageTest.cc index 586143899..26fb616ee 100644 --- a/test/HandshakeExtensionMessageTest.cc +++ b/test/HandshakeExtensionMessageTest.cc @@ -114,7 +114,7 @@ void HandshakeExtensionMessageTest::testDoReceivedAction() msg.doReceivedAction(); - CPPUNIT_ASSERT_EQUAL((uint16_t)6889, peer->port); + CPPUNIT_ASSERT_EQUAL((uint16_t)6889, peer->getPort()); CPPUNIT_ASSERT_EQUAL((uint8_t)1, peer->getExtensionMessageID("ut_pex")); CPPUNIT_ASSERT_EQUAL((uint8_t)2, peer->getExtensionMessageID("a2_dht")); CPPUNIT_ASSERT_EQUAL((int64_t)1024, attrs[bittorrent::METADATA_SIZE].i()); diff --git a/test/LpdMessageReceiverTest.cc b/test/LpdMessageReceiverTest.cc index 3b536de0d..24dfb93bf 100644 --- a/test/LpdMessageReceiverTest.cc +++ b/test/LpdMessageReceiverTest.cc @@ -52,7 +52,7 @@ void LpdMessageReceiverTest::testReceiveMessage() CPPUNIT_ASSERT(!msg.isNull()); CPPUNIT_ASSERT_EQUAL(std::string("cd41c7fdddfd034a15a04d7ff881216e01c4ceaf"), util::toHex(msg->getInfoHash())); - CPPUNIT_ASSERT_EQUAL((uint16_t)6000, msg->getPeer()->port); + CPPUNIT_ASSERT_EQUAL((uint16_t)6000, msg->getPeer()->getPort()); // Bad infohash std::string badInfoHashString = "cd41c7fdddfd034a15a04d7ff881216e01c4ce"; diff --git a/test/PeerListProcessorTest.cc b/test/PeerListProcessorTest.cc index 59ceb594f..060c5ed13 100644 --- a/test/PeerListProcessorTest.cc +++ b/test/PeerListProcessorTest.cc @@ -42,8 +42,8 @@ void PeerListProcessorTest::testExtractPeerFromList() { proc.extractPeerFromList(dict["peers"], std::back_inserter(peers)); CPPUNIT_ASSERT_EQUAL((size_t)1, peers.size()); SharedHandle peer = *peers.begin(); - CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.1"), peer->ipaddr); - CPPUNIT_ASSERT_EQUAL((uint16_t)2006, peer->port); + CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.1"), peer->getIPAddress()); + CPPUNIT_ASSERT_EQUAL((uint16_t)2006, peer->getPort()); } void PeerListProcessorTest::testExtract2PeersFromList() { @@ -59,12 +59,12 @@ void PeerListProcessorTest::testExtract2PeersFromList() { proc.extractPeerFromList(dict["peers"], std::back_inserter(peers)); CPPUNIT_ASSERT_EQUAL((size_t)2, peers.size()); SharedHandle peer = *peers.begin(); - CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.1"), peer->ipaddr); - CPPUNIT_ASSERT_EQUAL((uint16_t)65535, peer->port); + CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.1"), peer->getIPAddress()); + CPPUNIT_ASSERT_EQUAL((uint16_t)65535, peer->getPort()); peer = *(peers.begin()+1); - CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.2"), peer->ipaddr); - CPPUNIT_ASSERT_EQUAL((uint16_t)2007, peer->port); + CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.2"), peer->getIPAddress()); + CPPUNIT_ASSERT_EQUAL((uint16_t)2007, peer->getPort()); } } // namespace aria2 diff --git a/test/PeerTest.cc b/test/PeerTest.cc index 2819142d7..d984b4067 100644 --- a/test/PeerTest.cc +++ b/test/PeerTest.cc @@ -53,7 +53,7 @@ void PeerTest::testOperatorEqual() { Peer p1("localhost", 6881); Peer p2("localhsot", 0); - p2.port = 6881; + p2.setPort(6881); CPPUNIT_ASSERT(p1 != p2); } } diff --git a/test/UTPexExtensionMessageTest.cc b/test/UTPexExtensionMessageTest.cc index f4d1f0560..ec032e8e2 100644 --- a/test/UTPexExtensionMessageTest.cc +++ b/test/UTPexExtensionMessageTest.cc @@ -85,10 +85,10 @@ void UTPexExtensionMessageTest::testGetBencodedData() unsigned char c2[6]; unsigned char c3[6]; unsigned char c4[6]; - bittorrent::createcompact(c1, p1->ipaddr, p1->port); - bittorrent::createcompact(c2, p2->ipaddr, p2->port); - bittorrent::createcompact(c3, p3->ipaddr, p3->port); - bittorrent::createcompact(c4, p4->ipaddr, p4->port); + bittorrent::createcompact(c1, p1->getIPAddress(), p1->getPort()); + bittorrent::createcompact(c2, p2->getIPAddress(), p2->getPort()); + bittorrent::createcompact(c3, p3->getIPAddress(), p3->getPort()); + bittorrent::createcompact(c4, p4->getIPAddress(), p4->getPort()); std::string expected = "d5:added12:"+ std::string(&c1[0], &c1[6])+std::string(&c2[0], &c2[6])+ @@ -140,13 +140,13 @@ void UTPexExtensionMessageTest::testDoReceivedAction() CPPUNIT_ASSERT_EQUAL((size_t)2, _peerStorage->getPeers().size()); { SharedHandle p = _peerStorage->getPeers()[0]; - CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.1"), p->ipaddr); - CPPUNIT_ASSERT_EQUAL((uint16_t)6881, p->port); + CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.1"), p->getIPAddress()); + CPPUNIT_ASSERT_EQUAL((uint16_t)6881, p->getPort()); } { SharedHandle p = _peerStorage->getPeers()[1]; - CPPUNIT_ASSERT_EQUAL(std::string("10.1.1.2"), p->ipaddr); - CPPUNIT_ASSERT_EQUAL((uint16_t)9999, p->port); + CPPUNIT_ASSERT_EQUAL(std::string("10.1.1.2"), p->getIPAddress()); + CPPUNIT_ASSERT_EQUAL((uint16_t)9999, p->getPort()); } } @@ -176,19 +176,19 @@ void UTPexExtensionMessageTest::testCreate() CPPUNIT_ASSERT_EQUAL((uint8_t)1, msg->getExtensionMessageID()); CPPUNIT_ASSERT_EQUAL((size_t)2, msg->getFreshPeers().size()); CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.1"), - msg->getFreshPeers()[0]->ipaddr); - CPPUNIT_ASSERT_EQUAL((uint16_t)6881, msg->getFreshPeers()[0]->port); + msg->getFreshPeers()[0]->getIPAddress()); + CPPUNIT_ASSERT_EQUAL((uint16_t)6881, msg->getFreshPeers()[0]->getPort()); CPPUNIT_ASSERT_EQUAL(std::string("10.1.1.2"), - msg->getFreshPeers()[1]->ipaddr); - CPPUNIT_ASSERT_EQUAL((uint16_t)9999, msg->getFreshPeers()[1]->port); + msg->getFreshPeers()[1]->getIPAddress()); + CPPUNIT_ASSERT_EQUAL((uint16_t)9999, msg->getFreshPeers()[1]->getPort()); CPPUNIT_ASSERT_EQUAL((size_t)2, msg->getDroppedPeers().size()); CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.2"), - msg->getDroppedPeers()[0]->ipaddr); - CPPUNIT_ASSERT_EQUAL((uint16_t)6882, msg->getDroppedPeers()[0]->port); + msg->getDroppedPeers()[0]->getIPAddress()); + CPPUNIT_ASSERT_EQUAL((uint16_t)6882, msg->getDroppedPeers()[0]->getPort()); CPPUNIT_ASSERT_EQUAL(std::string("10.1.1.3"), - msg->getDroppedPeers()[1]->ipaddr); + msg->getDroppedPeers()[1]->getIPAddress()); CPPUNIT_ASSERT_EQUAL((uint16_t)10000, - msg->getDroppedPeers()[1]->port); + msg->getDroppedPeers()[1]->getPort()); try { // 0 length data std::string in = "";