1 files changed, 51 insertions, 64 deletions

diff --git a/src/HttpInitiateConnectionCommand.cc b/src/HttpInitiateConnectionCommand.cc
index 30720223..a54148f3 100644
--- a/src/HttpInitiateConnectionCommand.cc
+++ b/src/HttpInitiateConnectionCommand.cc
@@ -58,104 +58,91 @@
 
 namespace aria2 {
 
-HttpInitiateConnectionCommand::HttpInitiateConnectionCommand
-(cuid_t cuid,
- const std::shared_ptr<Request>& req,
- const std::shared_ptr<FileEntry>& fileEntry,
- RequestGroup* requestGroup,
- DownloadEngine* e)
-  : InitiateConnectionCommand(cuid, req, fileEntry, requestGroup, e)
-{}
+HttpInitiateConnectionCommand::HttpInitiateConnectionCommand(
+    cuid_t cuid, const std::shared_ptr<Request>& req,
+    const std::shared_ptr<FileEntry>& fileEntry, RequestGroup* requestGroup,
+    DownloadEngine* e)
+    : InitiateConnectionCommand(cuid, req, fileEntry, requestGroup, e)
+{
+}
 
 HttpInitiateConnectionCommand::~HttpInitiateConnectionCommand() {}
 
-std::unique_ptr<Command> HttpInitiateConnectionCommand::createNextCommand
-(const std::string& hostname, const std::string& addr, uint16_t port,
- const std::vector<std::string>& resolvedAddresses,
- const std::shared_ptr<Request>& proxyRequest)
+std::unique_ptr<Command> HttpInitiateConnectionCommand::createNextCommand(
+    const std::string& hostname, const std::string& addr, uint16_t port,
+    const std::vector<std::string>& resolvedAddresses,
+    const std::shared_ptr<Request>& proxyRequest)
 {
-  if(proxyRequest) {
+  if (proxyRequest) {
     std::shared_ptr<SocketCore> pooledSocket =
-      getDownloadEngine()->popPooledSocket
-      (getRequest()->getHost(), getRequest()->getPort(),
-       proxyRequest->getHost(), proxyRequest->getPort());
+        getDownloadEngine()->popPooledSocket(
+            getRequest()->getHost(), getRequest()->getPort(),
+            proxyRequest->getHost(), proxyRequest->getPort());
     std::string proxyMethod = resolveProxyMethod(getRequest()->getProtocol());
-    if(!pooledSocket) {
-      A2_LOG_INFO(fmt(MSG_CONNECTING_TO_SERVER,
-                      getCuid(), addr.c_str(), port));
+    if (!pooledSocket) {
+      A2_LOG_INFO(fmt(MSG_CONNECTING_TO_SERVER, getCuid(), addr.c_str(), port));
       createSocket();
       getSocket()->establishConnection(addr, port);
 
       getRequest()->setConnectedAddrInfo(hostname, addr, port);
-      auto c = make_unique<ConnectCommand>(getCuid(),
-                                           getRequest(),
-                                           proxyRequest,
-                                           getFileEntry(),
-                                           getRequestGroup(),
-                                           getDownloadEngine(),
-                                           getSocket());
-      if(proxyMethod == V_TUNNEL) {
+      auto c = make_unique<ConnectCommand>(
+          getCuid(), getRequest(), proxyRequest, getFileEntry(),
+          getRequestGroup(), getDownloadEngine(), getSocket());
+      if (proxyMethod == V_TUNNEL) {
         c->setControlChain(std::make_shared<HttpProxyRequestConnectChain>());
-      } else if(proxyMethod == V_GET) {
+      }
+      else if (proxyMethod == V_GET) {
         c->setControlChain(std::make_shared<HttpRequestConnectChain>());
-      } else {
+      }
+      else {
         // Unreachable
         assert(0);
       }
       setupBackupConnection(hostname, addr, port, c.get());
       return std::move(c);
-    } else {
+    }
+    else {
       setConnectedAddrInfo(getRequest(), hostname, pooledSocket);
-      auto c = make_unique<HttpRequestCommand>
-        (getCuid(),
-         getRequest(),
-         getFileEntry(),
-         getRequestGroup(),
-         std::make_shared<HttpConnection>
-         (getCuid(), pooledSocket,
-          std::make_shared<SocketRecvBuffer>(pooledSocket)),
-         getDownloadEngine(),
-         pooledSocket);
-      if(proxyMethod == V_GET) {
+      auto c = make_unique<HttpRequestCommand>(
+          getCuid(), getRequest(), getFileEntry(), getRequestGroup(),
+          std::make_shared<HttpConnection>(
+              getCuid(), pooledSocket,
+              std::make_shared<SocketRecvBuffer>(pooledSocket)),
+          getDownloadEngine(), pooledSocket);
+      if (proxyMethod == V_GET) {
         c->setProxyRequest(proxyRequest);
       }
       return std::move(c);
     }
-  } else {
+  }
+  else {
     std::shared_ptr<SocketCore> pooledSocket =
-      getDownloadEngine()->popPooledSocket
-      (resolvedAddresses, getRequest()->getPort());
-    if(!pooledSocket) {
-      A2_LOG_INFO(fmt(MSG_CONNECTING_TO_SERVER,
-                      getCuid(), addr.c_str(), port));
+        getDownloadEngine()->popPooledSocket(resolvedAddresses,
+                                             getRequest()->getPort());
+    if (!pooledSocket) {
+      A2_LOG_INFO(fmt(MSG_CONNECTING_TO_SERVER, getCuid(), addr.c_str(), port));
       createSocket();
       getSocket()->establishConnection(addr, port);
 
       getRequest()->setConnectedAddrInfo(hostname, addr, port);
-      auto c = make_unique<ConnectCommand>(getCuid(),
-                                           getRequest(),
+      auto c = make_unique<ConnectCommand>(getCuid(), getRequest(),
                                            proxyRequest, // must be null
-                                           getFileEntry(),
-                                           getRequestGroup(),
-                                           getDownloadEngine(),
-                                           getSocket());
+                                           getFileEntry(), getRequestGroup(),
+                                           getDownloadEngine(), getSocket());
       c->setControlChain(std::make_shared<HttpRequestConnectChain>());
       setupBackupConnection(hostname, addr, port, c.get());
       return std::move(c);
-    } else {
+    }
+    else {
       setSocket(pooledSocket);
       setConnectedAddrInfo(getRequest(), hostname, pooledSocket);
 
-      return make_unique<HttpRequestCommand>
-        (getCuid(),
-         getRequest(),
-         getFileEntry(),
-         getRequestGroup(),
-         std::make_shared<HttpConnection>
-         (getCuid(), getSocket(),
-          std::make_shared<SocketRecvBuffer>(getSocket())),
-         getDownloadEngine(),
-         getSocket());
+      return make_unique<HttpRequestCommand>(
+          getCuid(), getRequest(), getFileEntry(), getRequestGroup(),
+          std::make_shared<HttpConnection>(
+              getCuid(), getSocket(),
+              std::make_shared<SocketRecvBuffer>(getSocket())),
+          getDownloadEngine(), getSocket());
     }
   }
 }