From cd9e35bc632dd4a4bb6a543266803e34376e7964 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Thu, 25 Jan 2007 16:47:29 +0000
Subject: 2007-01-26  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>

	* src/message.h: Added EX_INVALID_PAYLOAD_SIZE and
	EX_INVALID_BT_MESSAGE_ID. Following source files affected.
	* src/BtAllowedFastMessage.cc:
	* src/BtBitfieldMessage.cc
	* src/BtCancelMessage.cc
	* src/BtChokeMessage.cc
	* src/BtHaveAllMessage.cc
	* src/BtHaveMessage.cc
	* src/BtHaveNoneMessage.cc
	* src/BtInterestedMessage.cc
	* src/BtNotInterestedMessage.cc
	* src/BtPieceMessage.cc
	* src/BtPortMessage.cc
	* src/BtRejectMessage.cc
	* src/BtRequestMessage.cc
	* src/BtSuggestPieceMessage.cc
	* src/BtUnchokeMessage.cc

	* src/message.h: Added EX_INVALID_CHUNK_CHECKSUM. Following
source
	files are affected.
	* src/ChunkChecksumValidator.cc
	* src/SegmentMan.cc
---
 src/PeerConnection.cc | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/PeerConnection.cc')

diff --git a/src/PeerConnection.cc b/src/PeerConnection.cc
index f9e459d5..06348d0a 100644
--- a/src/PeerConnection.cc
+++ b/src/PeerConnection.cc
@@ -56,8 +56,8 @@ PeerConnection::PeerConnection(int32_t cuid,
 
 PeerConnection::~PeerConnection() {}
 
-uint32_t PeerConnection::sendMessage(const unsigned char* data, uint32_t dataLength) {
-  uint32_t writtenLength = 0;
+int32_t PeerConnection::sendMessage(const unsigned char* data, int32_t dataLength) {
+  int32_t writtenLength = 0;
   if(socket->isWritable(0)) {
     // TODO fix this
     socket->writeData((const char*)data, dataLength);
@@ -66,14 +66,14 @@ uint32_t PeerConnection::sendMessage(const unsigned char* data, uint32_t dataLen
   return writtenLength;
 }
 
-bool PeerConnection::receiveMessage(unsigned char* data, uint32_t& dataLength) {
+bool PeerConnection::receiveMessage(unsigned char* data, int32_t& dataLength) {
   if(!socket->isReadable(0)) {
     return false;
   }
   if(resbufLength == 0 && lenbufLength != 4) {
     // read payload size, 4-byte integer
-    uint32_t remain = 4-lenbufLength;
-    uint32_t temp = remain;
+    int32_t remain = 4-lenbufLength;
+    int32_t temp = remain;
     // TODO fix this
     socket->readData((char*)lenbuf+lenbufLength, (int&)temp);
     if(temp == 0) {
@@ -86,7 +86,7 @@ bool PeerConnection::receiveMessage(unsigned char* data, uint32_t& dataLength) {
       return false;
     }
     //payloadLen = ntohl(nPayloadLen);
-    uint32_t payloadLength = ntohl(*((uint32_t*)lenbuf));
+    int32_t payloadLength = ntohl(*((int32_t*)lenbuf));
     if(payloadLength > MAX_PAYLOAD_LEN || payloadLength < 0) {
       throw new DlAbortEx("max payload length exceeded or invalid. length = %d",
 			  payloadLength);
@@ -97,7 +97,7 @@ bool PeerConnection::receiveMessage(unsigned char* data, uint32_t& dataLength) {
     return false;
   }
   // we have currentPayloadLen-resbufLen bytes to read
-  uint32_t remaining = currentPayloadLength-resbufLength;
+  int32_t remaining = currentPayloadLength-resbufLength;
   if(remaining > 0) {
     socket->readData((char*)resbuf+resbufLength, (int&)remaining);
     if(remaining == 0) {
@@ -118,13 +118,13 @@ bool PeerConnection::receiveMessage(unsigned char* data, uint32_t& dataLength) {
   return true;
 }
 
-bool PeerConnection::receiveHandshake(unsigned char* data, uint32_t& dataLength) {
+bool PeerConnection::receiveHandshake(unsigned char* data, int32_t& dataLength) {
   if(!socket->isReadable(0)) {
     dataLength = 0;
     return false;
   }
-  uint32_t remain = BtHandshakeMessage::MESSAGE_LENGTH-resbufLength;
-  uint32_t temp = remain;
+  int32_t remain = BtHandshakeMessage::MESSAGE_LENGTH-resbufLength;
+  int32_t temp = remain;
   socket->readData((char*)resbuf+resbufLength, (int&)temp);
   if(temp == 0) {
     // we got EOF
@@ -138,7 +138,7 @@ bool PeerConnection::receiveHandshake(unsigned char* data, uint32_t& dataLength)
   }
   resbufLength += temp;
   // we got whole handshake payload
-  uint32_t writeLength = resbufLength > dataLength ? dataLength : resbufLength;
+  int32_t writeLength = resbufLength > dataLength ? dataLength : resbufLength;
   memcpy(data, resbuf, writeLength);
   dataLength = writeLength;
   if(retval) {
-- 
cgit