From b1132d6b10cd3791b9529d7031d723fd0e2d8215 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sun, 27 Dec 2015 18:39:47 +0900 Subject: make clang-format using clang-format-3.6 --- src/DHTMessageFactoryImpl.h | 100 +++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 57 deletions(-) (limited to 'src/DHTMessageFactoryImpl.h') 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 getRemoteNode - (const unsigned char* id, const std::string& ipaddr, uint16_t port) const; + std::shared_ptr 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 >& nodes, - const unsigned char* src, size_t length); + void extractNodes(std::vector>& nodes, + const unsigned char* src, size_t length); void setCommonProperty(DHTAbstractMessage* m); @@ -82,80 +82,66 @@ public: DHTMessageFactoryImpl(int family); virtual std::unique_ptr - 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 - 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 - createPingMessage(const std::shared_ptr& remoteNode, - const std::string& transactionID = A2STR::NIL) - CXX11_OVERRIDE; + virtual std::unique_ptr createPingMessage( + const std::shared_ptr& remoteNode, + const std::string& transactionID = A2STR::NIL) CXX11_OVERRIDE; virtual std::unique_ptr createPingReplyMessage(const std::shared_ptr& remoteNode, const unsigned char* id, - const std::string& transactionID) - CXX11_OVERRIDE; + const std::string& transactionID) CXX11_OVERRIDE; - virtual std::unique_ptr - createFindNodeMessage(const std::shared_ptr& remoteNode, - const unsigned char* targetNodeID, - const std::string& transactionID = A2STR::NIL) - CXX11_OVERRIDE; + virtual std::unique_ptr createFindNodeMessage( + const std::shared_ptr& remoteNode, + const unsigned char* targetNodeID, + const std::string& transactionID = A2STR::NIL) CXX11_OVERRIDE; std::unique_ptr createFindNodeReplyMessage(const std::shared_ptr& remoteNode, const Dict* dict, const std::string& transactionID); - virtual std::unique_ptr - createFindNodeReplyMessage - (const std::shared_ptr& remoteNode, - std::vector> closestKNodes, - const std::string& transactionID) CXX11_OVERRIDE; - - virtual std::unique_ptr - createGetPeersMessage(const std::shared_ptr& remoteNode, - const unsigned char* infoHash, - const std::string& transactionID = A2STR::NIL) - CXX11_OVERRIDE; - - virtual std::unique_ptr - createGetPeersReplyMessage - (const std::shared_ptr& remoteNode, - std::vector> closestKNodes, - std::vector> peers, - const std::string& token, - const std::string& transactionID) CXX11_OVERRIDE; + virtual std::unique_ptr createFindNodeReplyMessage( + const std::shared_ptr& remoteNode, + std::vector> closestKNodes, + const std::string& transactionID) CXX11_OVERRIDE; + + virtual std::unique_ptr createGetPeersMessage( + const std::shared_ptr& remoteNode, const unsigned char* infoHash, + const std::string& transactionID = A2STR::NIL) CXX11_OVERRIDE; + + virtual std::unique_ptr createGetPeersReplyMessage( + const std::shared_ptr& remoteNode, + std::vector> closestKNodes, + std::vector> peers, const std::string& token, + const std::string& transactionID) CXX11_OVERRIDE; std::unique_ptr - createGetPeersReplyMessage - (const std::shared_ptr& remoteNode, - const Dict* dict, - const std::string& transactionID); - - virtual std::unique_ptr - createAnnouncePeerMessage(const std::shared_ptr& 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& remoteNode, + const Dict* dict, + const std::string& transactionID); + + virtual std::unique_ptr createAnnouncePeerMessage( + const std::shared_ptr& remoteNode, const unsigned char* infoHash, + uint16_t tcpPort, const std::string& token, + const std::string& transactionID = A2STR::NIL) CXX11_OVERRIDE; virtual std::unique_ptr createAnnouncePeerReplyMessage(const std::shared_ptr& remoteNode, const std::string& transactionID) - CXX11_OVERRIDE; + CXX11_OVERRIDE; virtual std::unique_ptr 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); -- cgit