From e700d2bb1f4d0922f2c9d782ba93757a51d5e305 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Tue, 18 Oct 2011 00:47:14 +0900
Subject: [PATCH] Made LpdMessage struct

---
 src/LpdMessage.cc               |  2 +-
 src/LpdMessage.h                | 20 +++-----------------
 src/LpdReceiveMessageCommand.cc |  9 ++++-----
 test/LpdMessageReceiverTest.cc  | 12 ++++++------
 4 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/src/LpdMessage.cc b/src/LpdMessage.cc
index 87596ec8..adc14cc0 100644
--- a/src/LpdMessage.cc
+++ b/src/LpdMessage.cc
@@ -39,7 +39,7 @@ LpdMessage::LpdMessage() {}
 
 LpdMessage::LpdMessage
 (const SharedHandle<Peer>& peer, const std::string& infoHash)
-  : peer_(peer), infoHash_(infoHash)
+  : peer(peer), infoHash(infoHash)
 {}
 
 LpdMessage::~LpdMessage() {}
diff --git a/src/LpdMessage.h b/src/LpdMessage.h
index 928f926f..42d55678 100644
--- a/src/LpdMessage.h
+++ b/src/LpdMessage.h
@@ -43,26 +43,12 @@ namespace aria2 {
 
 class Peer;
 
-class LpdMessage {
-private:
-  SharedHandle<Peer> peer_;
-  std::string infoHash_;
-public:
+struct LpdMessage {
+  SharedHandle<Peer> peer;
+  std::string infoHash;
   LpdMessage();
-
   LpdMessage(const SharedHandle<Peer>& peer, const std::string& infoHash);
-
   ~LpdMessage();
-
-  const SharedHandle<Peer>& getPeer() const
-  {
-    return peer_;
-  }
-
-  const std::string& getInfoHash() const
-  {
-    return infoHash_;
-  }
 };
 
 } // namespace aria2
diff --git a/src/LpdReceiveMessageCommand.cc b/src/LpdReceiveMessageCommand.cc
index 166abd89..55ba0a7f 100644
--- a/src/LpdReceiveMessageCommand.cc
+++ b/src/LpdReceiveMessageCommand.cc
@@ -77,16 +77,15 @@ bool LpdReceiveMessageCommand::execute()
     if(!m) {
       break;
     }
-    if(!m->getPeer()) {
+    if(!m->peer) {
       // bad message
       continue;
     }
     SharedHandle<BtRegistry> reg = e_->getBtRegistry();
-    SharedHandle<DownloadContext> dctx =
-      reg->getDownloadContext(m->getInfoHash());
+    SharedHandle<DownloadContext> dctx = reg->getDownloadContext(m->infoHash);
     if(!dctx) {
       A2_LOG_DEBUG(fmt("Download Context is null for infohash=%s.",
-                       util::toHex(m->getInfoHash()).c_str()));
+                       util::toHex(m->infoHash).c_str()));
       continue;
     }
     if(bittorrent::getTorrentAttrs(dctx)->privateTorrent) {
@@ -99,7 +98,7 @@ bool LpdReceiveMessageCommand::execute()
     assert(!btobj.isNull());
     SharedHandle<PeerStorage> peerStorage = btobj.peerStorage_;
     assert(peerStorage);
-    SharedHandle<Peer> peer = m->getPeer();
+    SharedHandle<Peer> peer = m->peer;
     if(peerStorage->addPeer(peer)) {
       A2_LOG_DEBUG(fmt("LPD peer %s:%u local=%d added.",
                        peer->getIPAddress().c_str(), peer->getPort(),
diff --git a/test/LpdMessageReceiverTest.cc b/test/LpdMessageReceiverTest.cc
index 98673970..3d2aa0a0 100644
--- a/test/LpdMessageReceiverTest.cc
+++ b/test/LpdMessageReceiverTest.cc
@@ -52,8 +52,8 @@ void LpdMessageReceiverTest::testReceiveMessage()
   SharedHandle<LpdMessage> msg = rcv.receiveMessage();
   CPPUNIT_ASSERT(msg);
   CPPUNIT_ASSERT_EQUAL(std::string("cd41c7fdddfd034a15a04d7ff881216e01c4ceaf"),
-                       util::toHex(msg->getInfoHash()));
-  CPPUNIT_ASSERT_EQUAL((uint16_t)6000, msg->getPeer()->getPort());
+                       util::toHex(msg->infoHash));
+  CPPUNIT_ASSERT_EQUAL((uint16_t)6000, msg->peer->getPort());
 
   // Bad infohash
   std::string badInfoHashString = "cd41c7fdddfd034a15a04d7ff881216e01c4ce";
@@ -67,8 +67,8 @@ void LpdMessageReceiverTest::testReceiveMessage()
   rcv.getSocket()->isReadable(5);
   msg = rcv.receiveMessage();
   CPPUNIT_ASSERT(msg);
-  CPPUNIT_ASSERT(!msg->getPeer());
-  CPPUNIT_ASSERT(msg->getInfoHash().empty());
+  CPPUNIT_ASSERT(!msg->peer);
+  CPPUNIT_ASSERT(msg->infoHash.empty());
 
   // Bad port
   request =
@@ -81,8 +81,8 @@ void LpdMessageReceiverTest::testReceiveMessage()
   rcv.getSocket()->isReadable(5);
   msg = rcv.receiveMessage();
   CPPUNIT_ASSERT(msg);
-  CPPUNIT_ASSERT(!msg->getPeer());
-  CPPUNIT_ASSERT(msg->getInfoHash().empty());
+  CPPUNIT_ASSERT(!msg->peer);
+  CPPUNIT_ASSERT(msg->infoHash.empty());
 
   // No data available
   msg = rcv.receiveMessage();