Merge branch 'master' into random-webseeding

1 files changed, 23 insertions, 22 deletions

diff --git a/src/DHTMessageTrackerEntry.cc b/src/DHTMessageTrackerEntry.cc
index 042725f8..9a4f4ad8 100644
--- a/src/DHTMessageTrackerEntry.cc
+++ b/src/DHTMessageTrackerEntry.cc
@@ -42,40 +42,41 @@
 
 namespace aria2 {
 
-DHTMessageTrackerEntry::DHTMessageTrackerEntry
-(std::shared_ptr<DHTNode> targetNode,
- std::string transactionID,
- std::string messageType,
- std::chrono::seconds timeout,
- std::unique_ptr<DHTMessageCallback> callback)
-  : targetNode_{std::move(targetNode)},
-    transactionID_{std::move(transactionID)},
-    messageType_{std::move(messageType)},
-    callback_{std::move(callback)},
-    dispatchedTime_{global::wallclock()},
-    timeout_{std::move(timeout)}
-{}
+DHTMessageTrackerEntry::DHTMessageTrackerEntry(
+    std::shared_ptr<DHTNode> targetNode, std::string transactionID,
+    std::string messageType, std::chrono::seconds timeout,
+    std::unique_ptr<DHTMessageCallback> callback)
+    : targetNode_{std::move(targetNode)},
+      transactionID_{std::move(transactionID)},
+      messageType_{std::move(messageType)},
+      callback_{std::move(callback)},
+      dispatchedTime_{global::wallclock()},
+      timeout_{std::move(timeout)}
+{
+}
 
 bool DHTMessageTrackerEntry::isTimeout() const
 {
   return dispatchedTime_.difference(global::wallclock()) >= timeout_;
 }
 
-void DHTMessageTrackerEntry::extendTimeout()
-{}
+void DHTMessageTrackerEntry::extendTimeout() {}
 
-bool DHTMessageTrackerEntry::match(const std::string& transactionID, const std::string& ipaddr, uint16_t port) const
+bool DHTMessageTrackerEntry::match(const std::string& transactionID,
+                                   const std::string& ipaddr,
+                                   uint16_t port) const
 {
-  if(transactionID_ != transactionID || targetNode_->getPort() != port) {
+  if (transactionID_ != transactionID || targetNode_->getPort() != port) {
     return false;
   }
-  if(targetNode_->getIPAddress() == ipaddr) {
+  if (targetNode_->getIPAddress() == ipaddr) {
     return true;
   }
-  if(util::endsWith(targetNode_->getIPAddress(), ipaddr)) {
-    return targetNode_->getIPAddress() == "::ffff:"+ipaddr;
-  } else if(util::endsWith(ipaddr, targetNode_->getIPAddress())) {
-    return ipaddr == "::ffff:"+targetNode_->getIPAddress();
+  if (util::endsWith(targetNode_->getIPAddress(), ipaddr)) {
+    return targetNode_->getIPAddress() == "::ffff:" + ipaddr;
+  }
+  else if (util::endsWith(ipaddr, targetNode_->getIPAddress())) {
+    return ipaddr == "::ffff:" + targetNode_->getIPAddress();
   }
   return false;
 }