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

2007-12-12 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 

Code cleanup and added debug log.
	* src/PeerConnection.cc
pull/1/head
Tatsuhiro Tsujikawa 2007-12-12 13:49:09 +00:00
parent 5a050dacfa
commit ae2555313b
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-12-12 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Code cleanup and added debug log.
* src/PeerConnection.cc
2007-12-10 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Compiler error fix: applied the patch by Tiziano Mueller

12
src/PeerConnection.cc
View File

@ -71,10 +71,10 @@ int32_t PeerConnection::sendMessage(const unsigned char* data, int32_t dataLengt
}
bool PeerConnection::receiveMessage(unsigned char* data, int32_t& dataLength) {
if(!socket->isReadable(0)) {
return false;
}
if(resbufLength == 0 && lenbufLength != 4) {
if(!socket->isReadable(0)) {
return false;
}
// read payload size, 4-byte integer
int32_t remain = 4-lenbufLength;
int32_t temp = remain;
@ -82,6 +82,8 @@ bool PeerConnection::receiveMessage(unsigned char* data, int32_t& dataLength) {
socket->readData((char*)lenbuf+lenbufLength, temp);
if(temp == 0) {
// we got EOF
logger->debug("CUID#%d - In PeerConnection::receiveMessage(), remain=%d",
cuid, remain);
throw new DlAbortEx(EX_EOF_FROM_PEER);
}
if(remain != temp) {
@ -106,6 +108,8 @@ bool PeerConnection::receiveMessage(unsigned char* data, int32_t& dataLength) {
socket->readData((char*)resbuf+resbufLength, remaining);
if(remaining == 0) {
// we got EOF
logger->debug("CUID#%d - In PeerConnection::receiveMessage(), payloadlen=%d, remaining=%d",
cuid, currentPayloadLength, remaining);
throw new DlAbortEx(EX_EOF_FROM_PEER);
}
resbufLength += remaining;
@ -134,6 +138,8 @@ bool PeerConnection::receiveHandshake(unsigned char* data, int32_t& dataLength,
socket->readData((char*)resbuf+resbufLength, temp);
if(temp == 0) {
// we got EOF
logger->debug("CUID#%d - In PeerConnection::receiveHandshake(), remain=%d",
cuid, remain);
throw new DlAbortEx(EX_EOF_FROM_PEER);
}
}