summaryrefslogtreecommitdiff
path: root/src/ConnectCommand.cc
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2015-12-27 18:39:47 +0900
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2015-12-27 18:40:08 +0900
commitb1132d6b10cd3791b9529d7031d723fd0e2d8215 (patch)
tree9ce465b42bf09372118335c7c619bb2b41869eaf /src/ConnectCommand.cc
parent4abad2f64c9ff80144a61c5a9c2bea144852b883 (diff)
make clang-format using clang-format-3.6
Diffstat (limited to 'src/ConnectCommand.cc')
-rw-r--r--src/ConnectCommand.cc37
1 files changed, 17 insertions, 20 deletions
diff --git a/src/ConnectCommand.cc b/src/ConnectCommand.cc
index f4fd534b..5d1566be 100644
--- a/src/ConnectCommand.cc
+++ b/src/ConnectCommand.cc
@@ -47,15 +47,13 @@
namespace aria2 {
-ConnectCommand::ConnectCommand(cuid_t cuid,
- const std::shared_ptr<Request>& req,
+ConnectCommand::ConnectCommand(cuid_t cuid, const std::shared_ptr<Request>& req,
const std::shared_ptr<Request>& proxyRequest,
const std::shared_ptr<FileEntry>& fileEntry,
- RequestGroup* requestGroup,
- DownloadEngine* e,
+ RequestGroup* requestGroup, DownloadEngine* e,
const std::shared_ptr<SocketCore>& s)
- : AbstractCommand(cuid, req, fileEntry, requestGroup, e, s),
- proxyRequest_(proxyRequest)
+ : AbstractCommand(cuid, req, fileEntry, requestGroup, e, s),
+ proxyRequest_(proxyRequest)
{
setTimeout(std::chrono::seconds(getOption()->getAsInt(PREF_CONNECT_TIMEOUT)));
disableReadCheckSocket();
@@ -64,19 +62,19 @@ ConnectCommand::ConnectCommand(cuid_t cuid,
ConnectCommand::~ConnectCommand()
{
- if(backupConnectionInfo_) {
+ if (backupConnectionInfo_) {
backupConnectionInfo_->cancel = true;
}
}
-void ConnectCommand::setControlChain
-(const std::shared_ptr<ControlChain<ConnectCommand*> >& chain)
+void ConnectCommand::setControlChain(
+ const std::shared_ptr<ControlChain<ConnectCommand*>>& chain)
{
chain_ = chain;
}
-void ConnectCommand::setBackupConnectInfo
-(const std::shared_ptr<BackupConnectInfo>& info)
+void ConnectCommand::setBackupConnectInfo(
+ const std::shared_ptr<BackupConnectInfo>& info)
{
backupConnectionInfo_ = info;
}
@@ -88,13 +86,12 @@ const std::shared_ptr<Request>& ConnectCommand::getProxyRequest() const
bool ConnectCommand::executeInternal()
{
- if(backupConnectionInfo_ && !backupConnectionInfo_->ipaddr.empty()) {
+ if (backupConnectionInfo_ && !backupConnectionInfo_->ipaddr.empty()) {
A2_LOG_INFO(fmt("CUID#%" PRId64 " - Use backup connection address %s",
getCuid(), backupConnectionInfo_->ipaddr.c_str()));
- getDownloadEngine()->markBadIPAddress
- (getRequest()->getConnectedHostname(),
- getRequest()->getConnectedAddr(),
- getRequest()->getConnectedPort());
+ getDownloadEngine()->markBadIPAddress(getRequest()->getConnectedHostname(),
+ getRequest()->getConnectedAddr(),
+ getRequest()->getConnectedPort());
getRequest()->setConnectedAddrInfo(getRequest()->getConnectedHostname(),
backupConnectionInfo_->ipaddr,
@@ -102,12 +99,12 @@ bool ConnectCommand::executeInternal()
swapSocket(backupConnectionInfo_->socket);
backupConnectionInfo_.reset();
}
- if(!checkIfConnectionEstablished
- (getSocket(), getRequest()->getConnectedHostname(),
- getRequest()->getConnectedAddr(), getRequest()->getConnectedPort())) {
+ if (!checkIfConnectionEstablished(
+ getSocket(), getRequest()->getConnectedHostname(),
+ getRequest()->getConnectedAddr(), getRequest()->getConnectedPort())) {
return true;
}
- if(backupConnectionInfo_) {
+ if (backupConnectionInfo_) {
backupConnectionInfo_->cancel = true;
backupConnectionInfo_.reset();
}