Merge branch 'master' into random-webseeding

1 files changed, 43 insertions, 57 deletions

diff --git a/src/DHTMessageFactoryImpl.h b/src/DHTMessageFactoryImpl.h
index a49e4bc3..0035d7cc 100644
--- a/src/DHTMessageFactoryImpl.h
+++ b/src/DHTMessageFactoryImpl.h
@@ -48,7 +48,7 @@ class DHTTokenTracker;
 class DHTMessage;
 class DHTAbstractMessage;
 
-class DHTMessageFactoryImpl:public DHTMessageFactory {
+class DHTMessageFactoryImpl : public DHTMessageFactory {
 private:
   int family_;
 
@@ -65,16 +65,16 @@ private:
   DHTTokenTracker* tokenTracker_;
 
   // search node in routingTable. If it is not found, create new one.
-  std::shared_ptr<DHTNode> getRemoteNode
-  (const unsigned char* id, const std::string& ipaddr, uint16_t port) const;
+  std::shared_ptr<DHTNode> getRemoteNode(const unsigned char* id,
+                                         const std::string& ipaddr,
+                                         uint16_t port) const;
 
   void validateID(const String* id) const;
 
   void validatePort(const Integer* i) const;
 
-  void extractNodes
-  (std::vector<std::shared_ptr<DHTNode> >& nodes,
-   const unsigned char* src, size_t length);
+  void extractNodes(std::vector<std::shared_ptr<DHTNode>>& nodes,
+                    const unsigned char* src, size_t length);
 
   void setCommonProperty(DHTAbstractMessage* m);
 
@@ -82,80 +82,66 @@ public:
   DHTMessageFactoryImpl(int family);
 
   virtual std::unique_ptr<DHTQueryMessage>
-  createQueryMessage(const Dict* dict,
-                     const std::string& ipaddr, uint16_t port) CXX11_OVERRIDE;
+  createQueryMessage(const Dict* dict, const std::string& ipaddr,
+                     uint16_t port) CXX11_OVERRIDE;
 
   virtual std::unique_ptr<DHTResponseMessage>
-  createResponseMessage(const std::string& messageType,
-                        const Dict* dict,
-                        const std::string& ipaddr, uint16_t port)
-    CXX11_OVERRIDE;
+  createResponseMessage(const std::string& messageType, const Dict* dict,
+                        const std::string& ipaddr,
+                        uint16_t port) CXX11_OVERRIDE;
 
-  virtual std::unique_ptr<DHTPingMessage>
-  createPingMessage(const std::shared_ptr<DHTNode>& remoteNode,
-                    const std::string& transactionID = A2STR::NIL)
-    CXX11_OVERRIDE;
+  virtual std::unique_ptr<DHTPingMessage> createPingMessage(
+      const std::shared_ptr<DHTNode>& remoteNode,
+      const std::string& transactionID = A2STR::NIL) CXX11_OVERRIDE;
 
   virtual std::unique_ptr<DHTPingReplyMessage>
   createPingReplyMessage(const std::shared_ptr<DHTNode>& remoteNode,
                          const unsigned char* id,
-                         const std::string& transactionID)
-    CXX11_OVERRIDE;
+                         const std::string& transactionID) CXX11_OVERRIDE;
 
-  virtual std::unique_ptr<DHTFindNodeMessage>
-  createFindNodeMessage(const std::shared_ptr<DHTNode>& remoteNode,
-                        const unsigned char* targetNodeID,
-                        const std::string& transactionID = A2STR::NIL)
-    CXX11_OVERRIDE;
+  virtual std::unique_ptr<DHTFindNodeMessage> createFindNodeMessage(
+      const std::shared_ptr<DHTNode>& remoteNode,
+      const unsigned char* targetNodeID,
+      const std::string& transactionID = A2STR::NIL) CXX11_OVERRIDE;
 
   std::unique_ptr<DHTFindNodeReplyMessage>
   createFindNodeReplyMessage(const std::shared_ptr<DHTNode>& remoteNode,
                              const Dict* dict,
                              const std::string& transactionID);
 
-  virtual std::unique_ptr<DHTFindNodeReplyMessage>
-  createFindNodeReplyMessage
-  (const std::shared_ptr<DHTNode>& remoteNode,
-   std::vector<std::shared_ptr<DHTNode>> closestKNodes,
-   const std::string& transactionID) CXX11_OVERRIDE;
-
-  virtual std::unique_ptr<DHTGetPeersMessage>
-  createGetPeersMessage(const std::shared_ptr<DHTNode>& remoteNode,
-                        const unsigned char* infoHash,
-                        const std::string& transactionID = A2STR::NIL)
-    CXX11_OVERRIDE;
-
-  virtual std::unique_ptr<DHTGetPeersReplyMessage>
-  createGetPeersReplyMessage
-  (const std::shared_ptr<DHTNode>& remoteNode,
-   std::vector<std::shared_ptr<DHTNode>> closestKNodes,
-   std::vector<std::shared_ptr<Peer>> peers,
-   const std::string& token,
-   const std::string& transactionID) CXX11_OVERRIDE;
+  virtual std::unique_ptr<DHTFindNodeReplyMessage> createFindNodeReplyMessage(
+      const std::shared_ptr<DHTNode>& remoteNode,
+      std::vector<std::shared_ptr<DHTNode>> closestKNodes,
+      const std::string& transactionID) CXX11_OVERRIDE;
+
+  virtual std::unique_ptr<DHTGetPeersMessage> createGetPeersMessage(
+      const std::shared_ptr<DHTNode>& remoteNode, const unsigned char* infoHash,
+      const std::string& transactionID = A2STR::NIL) CXX11_OVERRIDE;
+
+  virtual std::unique_ptr<DHTGetPeersReplyMessage> createGetPeersReplyMessage(
+      const std::shared_ptr<DHTNode>& remoteNode,
+      std::vector<std::shared_ptr<DHTNode>> closestKNodes,
+      std::vector<std::shared_ptr<Peer>> peers, const std::string& token,
+      const std::string& transactionID) CXX11_OVERRIDE;
 
   std::unique_ptr<DHTGetPeersReplyMessage>
-  createGetPeersReplyMessage
-  (const std::shared_ptr<DHTNode>& remoteNode,
-   const Dict* dict,
-   const std::string& transactionID);
-
-  virtual std::unique_ptr<DHTAnnouncePeerMessage>
-  createAnnouncePeerMessage(const std::shared_ptr<DHTNode>& remoteNode,
-                            const unsigned char* infoHash,
-                            uint16_t tcpPort,
-                            const std::string& token,
-                            const std::string& transactionID = A2STR::NIL)
-    CXX11_OVERRIDE;
+  createGetPeersReplyMessage(const std::shared_ptr<DHTNode>& remoteNode,
+                             const Dict* dict,
+                             const std::string& transactionID);
+
+  virtual std::unique_ptr<DHTAnnouncePeerMessage> createAnnouncePeerMessage(
+      const std::shared_ptr<DHTNode>& remoteNode, const unsigned char* infoHash,
+      uint16_t tcpPort, const std::string& token,
+      const std::string& transactionID = A2STR::NIL) CXX11_OVERRIDE;
 
   virtual std::unique_ptr<DHTAnnouncePeerReplyMessage>
   createAnnouncePeerReplyMessage(const std::shared_ptr<DHTNode>& remoteNode,
                                  const std::string& transactionID)
-    CXX11_OVERRIDE;
+      CXX11_OVERRIDE;
 
   virtual std::unique_ptr<DHTUnknownMessage>
   createUnknownMessage(const unsigned char* data, size_t length,
-                       const std::string& ipaddr, uint16_t port)
-    CXX11_OVERRIDE;
+                       const std::string& ipaddr, uint16_t port) CXX11_OVERRIDE;
 
   void setRoutingTable(DHTRoutingTable* routingTable);