github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed SocketBuffer::pushStrSwap.

pull/2/head
Tatsuhiro Tsujikawa 2011-11-12 01:19:01 +09:00
parent f0f1cfab5c
commit f1f1b991f1
5 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/FtpConnection.cc
View File

@ -85,7 +85,7 @@ bool FtpConnection::sendUser()
request += "\r\n"; request += "\r\n";
A2_LOG_INFO(fmt(MSG_SENDING_REQUEST, A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
cuid_, "USER ********")); cuid_, "USER ********"));
socketBuffer_.pushStrSwap(request); socketBuffer_.pushStr(request);
} }
socketBuffer_.send(); socketBuffer_.send();
return socketBuffer_.sendBufferIsEmpty(); return socketBuffer_.sendBufferIsEmpty();
@ -99,7 +99,7 @@ bool FtpConnection::sendPass()
request += "\r\n"; request += "\r\n";
A2_LOG_INFO(fmt(MSG_SENDING_REQUEST, A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
cuid_, "PASS ********")); cuid_, "PASS ********"));
socketBuffer_.pushStrSwap(request); socketBuffer_.pushStr(request);
} }
socketBuffer_.send(); socketBuffer_.send();
return socketBuffer_.sendBufferIsEmpty(); return socketBuffer_.sendBufferIsEmpty();
@ -113,7 +113,7 @@ bool FtpConnection::sendType()
request += "\r\n"; request += "\r\n";
A2_LOG_INFO(fmt(MSG_SENDING_REQUEST, A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
cuid_,request.c_str())); cuid_,request.c_str()));
socketBuffer_.pushStrSwap(request); socketBuffer_.pushStr(request);
} }
socketBuffer_.send(); socketBuffer_.send();
return socketBuffer_.sendBufferIsEmpty(); return socketBuffer_.sendBufferIsEmpty();
@ -125,7 +125,7 @@ bool FtpConnection::sendPwd()
std::string request = "PWD\r\n"; std::string request = "PWD\r\n";
A2_LOG_INFO(fmt(MSG_SENDING_REQUEST, A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
cuid_,request.c_str())); cuid_,request.c_str()));
socketBuffer_.pushStrSwap(request); socketBuffer_.pushStr(request);
} }
socketBuffer_.send(); socketBuffer_.send();
return socketBuffer_.sendBufferIsEmpty(); return socketBuffer_.sendBufferIsEmpty();
@ -139,7 +139,7 @@ bool FtpConnection::sendCwd(const std::string& dir)
request += "\r\n"; request += "\r\n";
A2_LOG_INFO(fmt(MSG_SENDING_REQUEST, A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
cuid_,request.c_str())); cuid_,request.c_str()));
socketBuffer_.pushStrSwap(request); socketBuffer_.pushStr(request);
} }
socketBuffer_.send(); socketBuffer_.send();
return socketBuffer_.sendBufferIsEmpty(); return socketBuffer_.sendBufferIsEmpty();
@ -154,7 +154,7 @@ bool FtpConnection::sendMdtm()
request += "\r\n"; request += "\r\n";
A2_LOG_INFO(fmt(MSG_SENDING_REQUEST, A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
cuid_, request.c_str())); cuid_, request.c_str()));
socketBuffer_.pushStrSwap(request); socketBuffer_.pushStr(request);
} }
socketBuffer_.send(); socketBuffer_.send();
return socketBuffer_.sendBufferIsEmpty(); return socketBuffer_.sendBufferIsEmpty();
@ -169,7 +169,7 @@ bool FtpConnection::sendSize()
request += "\r\n"; request += "\r\n";
A2_LOG_INFO(fmt(MSG_SENDING_REQUEST, A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
cuid_, request.c_str())); cuid_, request.c_str()));
socketBuffer_.pushStrSwap(request); socketBuffer_.pushStr(request);
} }
socketBuffer_.send(); socketBuffer_.send();
return socketBuffer_.sendBufferIsEmpty(); return socketBuffer_.sendBufferIsEmpty();
@ -181,7 +181,7 @@ bool FtpConnection::sendEpsv()
std::string request("EPSV\r\n"); std::string request("EPSV\r\n");
A2_LOG_INFO(fmt(MSG_SENDING_REQUEST, A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
cuid_, request.c_str())); cuid_, request.c_str()));
socketBuffer_.pushStrSwap(request); socketBuffer_.pushStr(request);
} }
socketBuffer_.send(); socketBuffer_.send();
return socketBuffer_.sendBufferIsEmpty(); return socketBuffer_.sendBufferIsEmpty();
@ -193,7 +193,7 @@ bool FtpConnection::sendPasv()
std::string request("PASV\r\n"); std::string request("PASV\r\n");
A2_LOG_INFO(fmt(MSG_SENDING_REQUEST, A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
cuid_, request.c_str())); cuid_, request.c_str()));
socketBuffer_.pushStrSwap(request); socketBuffer_.pushStr(request);
} }
socketBuffer_.send(); socketBuffer_.send();
return socketBuffer_.sendBufferIsEmpty(); return socketBuffer_.sendBufferIsEmpty();
@ -227,7 +227,7 @@ bool FtpConnection::sendEprt(const SharedHandle<SocketCore>& serverSocket)
request += util::uitos(addrinfo.second); request += util::uitos(addrinfo.second);
request += "|\r\n"; request += "|\r\n";
A2_LOG_INFO(fmt(MSG_SENDING_REQUEST, cuid_, request.c_str())); A2_LOG_INFO(fmt(MSG_SENDING_REQUEST, cuid_, request.c_str()));
socketBuffer_.pushStrSwap(request); socketBuffer_.pushStr(request);
} }
socketBuffer_.send(); socketBuffer_.send();
return socketBuffer_.sendBufferIsEmpty(); return socketBuffer_.sendBufferIsEmpty();
@ -257,7 +257,7 @@ bool FtpConnection::sendPort(const SharedHandle<SocketCore>& serverSocket)
request += "\r\n"; request += "\r\n";
A2_LOG_INFO(fmt(MSG_SENDING_REQUEST, A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
cuid_, request.c_str())); cuid_, request.c_str()));
socketBuffer_.pushStrSwap(request); socketBuffer_.pushStr(request);
} }
socketBuffer_.send(); socketBuffer_.send();
return socketBuffer_.sendBufferIsEmpty(); return socketBuffer_.sendBufferIsEmpty();
@ -275,7 +275,7 @@ bool FtpConnection::sendRest(const SharedHandle<Segment>& segment)
request += "\r\n"; request += "\r\n";
A2_LOG_INFO(fmt(MSG_SENDING_REQUEST, A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
cuid_, request.c_str())); cuid_, request.c_str()));
socketBuffer_.pushStrSwap(request); socketBuffer_.pushStr(request);
} }
socketBuffer_.send(); socketBuffer_.send();
return socketBuffer_.sendBufferIsEmpty(); return socketBuffer_.sendBufferIsEmpty();
@ -290,7 +290,7 @@ bool FtpConnection::sendRetr()
request += "\r\n"; request += "\r\n";
A2_LOG_INFO(fmt(MSG_SENDING_REQUEST, A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
cuid_, request.c_str())); cuid_, request.c_str()));
socketBuffer_.pushStrSwap(request); socketBuffer_.pushStr(request);
} }
socketBuffer_.send(); socketBuffer_.send();
return socketBuffer_.sendBufferIsEmpty(); return socketBuffer_.sendBufferIsEmpty();

4
src/HttpConnection.cc
View File

@ -109,7 +109,7 @@ void HttpConnection::sendRequest(const SharedHandle<HttpRequest>& httpRequest)
A2_LOG_INFO(fmt(MSG_SENDING_REQUEST, A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
cuid_, cuid_,
eraseConfidentialInfo(request).c_str())); eraseConfidentialInfo(request).c_str()));
socketBuffer_.pushStrSwap(request); socketBuffer_.pushStr(request);
socketBuffer_.send(); socketBuffer_.send();
SharedHandle<HttpRequestEntry> entry(new HttpRequestEntry(httpRequest)); SharedHandle<HttpRequestEntry> entry(new HttpRequestEntry(httpRequest));
outstandingHttpRequests_.push_back(entry); outstandingHttpRequests_.push_back(entry);
@ -122,7 +122,7 @@ void HttpConnection::sendProxyRequest
A2_LOG_INFO(fmt(MSG_SENDING_REQUEST, A2_LOG_INFO(fmt(MSG_SENDING_REQUEST,
cuid_, cuid_,
eraseConfidentialInfo(request).c_str())); eraseConfidentialInfo(request).c_str()));
socketBuffer_.pushStrSwap(request); socketBuffer_.pushStr(request);
socketBuffer_.send(); socketBuffer_.send();
SharedHandle<HttpRequestEntry> entry(new HttpRequestEntry(httpRequest)); SharedHandle<HttpRequestEntry> entry(new HttpRequestEntry(httpRequest));
outstandingHttpRequests_.push_back(entry); outstandingHttpRequests_.push_back(entry);

4
src/HttpServer.cc
View File

@ -200,8 +200,8 @@ void HttpServer::feedResponse(const std::string& status,
header += "\r\n"; header += "\r\n";
A2_LOG_DEBUG(fmt("HTTP Server sends response:\n%s", header.c_str())); A2_LOG_DEBUG(fmt("HTTP Server sends response:\n%s", header.c_str()));
socketBuffer_.pushStrSwap(header); socketBuffer_.pushStr(header);
socketBuffer_.pushStrSwap(text); socketBuffer_.pushStr(text);
} }
ssize_t HttpServer::sendResponse() ssize_t HttpServer::sendResponse()

9
src/SocketBuffer.cc
View File

@ -106,15 +106,6 @@ void SocketBuffer::pushStr(const std::string& data)
} }
} }
void SocketBuffer::pushStrSwap(std::string& data)
{
if(data.size() > 0) {
SharedHandle<StringBufEntry> e(new StringBufEntry());
e->swap(data);
bufq_.push_back(e);
}
}
ssize_t SocketBuffer::send() ssize_t SocketBuffer::send()
{ {
size_t totalslen = 0; size_t totalslen = 0;

5
src/SocketBuffer.h
View File

@ -105,11 +105,6 @@ public:
// Feeds data into queue. This function doesn't send data. // Feeds data into queue. This function doesn't send data.
void pushStr(const std::string& data); void pushStr(const std::string& data);
// Feeds data into queue. This function doesn't send data. data is
// swapped with internal buffer, so after this call, data will be
// empty.
void pushStrSwap(std::string& data);
// Sends data in queue. Returns the number of bytes sent. // Sends data in queue. Returns the number of bytes sent.
ssize_t send(); ssize_t send();