Use std::unique_ptr for ExtensionMessage

1 files changed, 11 insertions, 8 deletions

diff --git a/src/BtExtendedMessage.cc b/src/BtExtendedMessage.cc
index 901d72f3..6ecf4790 100644
--- a/src/BtExtendedMessage.cc
+++ b/src/BtExtendedMessage.cc
@@ -51,14 +51,12 @@ namespace aria2 {
 const char BtExtendedMessage::NAME[] = "extended";
 
 BtExtendedMessage::BtExtendedMessage
-(const std::shared_ptr<ExtensionMessage>& extensionMessage):
+(std::unique_ptr<ExtensionMessage> extensionMessage):
   SimpleBtMessage(ID, NAME),
-  extensionMessage_(extensionMessage),
+  extensionMessage_(std::move(extensionMessage)),
   msgLength_(0)
 {}
 
-BtExtendedMessage::~BtExtendedMessage() {}
-
 unsigned char* BtExtendedMessage::createMessage()
 {
   /**
@@ -97,16 +95,15 @@ std::string BtExtendedMessage::toString() const {
 }
 
 std::unique_ptr<BtExtendedMessage>
-BtExtendedMessage::create(const std::shared_ptr<ExtensionMessageFactory>& factory,
+BtExtendedMessage::create(ExtensionMessageFactory* factory,
                           const std::shared_ptr<Peer>& peer,
                           const unsigned char* data, size_t dataLength)
 {
   bittorrent::assertPayloadLengthGreater(1, dataLength, NAME);
   bittorrent::assertID(ID, data, NAME);
   assert(factory);
-  std::shared_ptr<ExtensionMessage> extmsg = factory->createMessage(data+1,
-                                                                 dataLength-1);
-  return make_unique<BtExtendedMessage>(extmsg);
+  return make_unique<BtExtendedMessage>
+    (factory->createMessage(data+1, dataLength-1));
 }
 
 void BtExtendedMessage::doReceivedAction()
@@ -116,4 +113,10 @@ void BtExtendedMessage::doReceivedAction()
   }
 }
 
+const std::unique_ptr<ExtensionMessage>&
+BtExtendedMessage::getExtensionMessage() const
+{
+  return extensionMessage_;
+}
+
 } // namespace aria2