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
liurenjin · Jan 25, 2007 · cd9e35b · cd9e35b
1 parent 139f463
commit cd9e35b
Show file tree

Hide file tree

Showing 104 changed files with 695 additions and 661 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,28 @@
+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
+
 2007-01-23  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	To add chunk checksum validation:

diff --git a/TODO b/TODO
@@ -23,8 +23,8 @@
 * Fix DefaultBtProgressInfoFile.cc: save(), load()
 * remove blockIndex
 * Add an ability of seeding
+* Continue file allocation with existing file
 
 * Stopping while piece hash checking and file allocation
 * Stop download after selective download completes
 * Remove -pg option in Makefile.am
-* Continue file allocation with existing file
diff --git a/src/AbstractDiskWriter.cc b/src/AbstractDiskWriter.cc
@@ -55,7 +55,7 @@ AbstractDiskWriter::~AbstractDiskWriter()
   closeFile();
 }
 
-void AbstractDiskWriter::openFile(const string& filename, uint64_t totalLength) {
+void AbstractDiskWriter::openFile(const string& filename, int64_t totalLength) {
   File f(filename);
   if(f.exists()) {
     openExistingFile(filename);
@@ -95,15 +95,15 @@ void AbstractDiskWriter::createFile(const string& filename, int32_t addFlags) {
   }  
 }
 
-int32_t AbstractDiskWriter::writeDataInternal(const char* data, uint32_t len) {
+int32_t AbstractDiskWriter::writeDataInternal(const char* data, int32_t len) {
   return write(fd, data, len);
 }
 
-int AbstractDiskWriter::readDataInternal(char* data, uint32_t len) {
+int32_t AbstractDiskWriter::readDataInternal(char* data, int32_t len) {
   return read(fd, data, len);
 }
 
-string AbstractDiskWriter::messageDigest(int64_t offset, uint64_t length,
+string AbstractDiskWriter::messageDigest(int64_t offset, int64_t length,
 					 const MessageDigestContext::DigestAlgo& algo)
 {
 #ifdef ENABLE_MESSAGE_DIGEST
@@ -112,7 +112,7 @@ string AbstractDiskWriter::messageDigest(int64_t offset, uint64_t length,
 
   int32_t BUFSIZE = 16*1024;
   char buf[BUFSIZE];
-  for(uint64_t i = 0; i < length/BUFSIZE; i++) {
+  for(int64_t i = 0; i < length/BUFSIZE; i++) {
     int32_t rs = readData(buf, BUFSIZE, offset);
     if(BUFSIZE != readData(buf, BUFSIZE, offset)) {
       throw new DlAbortEx(EX_FILE_SHA1SUM, filename.c_str(), strerror(errno));
@@ -143,14 +143,14 @@ void AbstractDiskWriter::seek(int64_t offset) {
   }
 }
 
-void AbstractDiskWriter::writeData(const char* data, uint32_t len, int64_t offset) {
+void AbstractDiskWriter::writeData(const char* data, int32_t len, int64_t offset) {
   seek(offset);
   if(writeDataInternal(data, len) < 0) {
     throw new DlAbortEx(EX_FILE_WRITE, filename.c_str(), strerror(errno));
   }
 }
 
-int AbstractDiskWriter::readData(char* data, uint32_t len, int64_t offset) {
+int32_t AbstractDiskWriter::readData(char* data, int32_t len, int64_t offset) {
   int32_t ret;
   seek(offset);
   if((ret = readDataInternal(data, len)) < 0) {

diff --git a/src/AbstractDiskWriter.h b/src/AbstractDiskWriter.h
@@ -49,27 +49,27 @@ class AbstractDiskWriter : public DiskWriter {
   void createFile(const string& filename, int32_t addFlags = 0);
 
 private:
-  int writeDataInternal(const char* data, uint32_t len);
-  int readDataInternal(char* data, uint32_t len);
+  int32_t writeDataInternal(const char* data, int32_t len);
+  int32_t readDataInternal(char* data, int32_t len);
 
   void seek(int64_t offset);
 
 public:
   AbstractDiskWriter();
   virtual ~AbstractDiskWriter();
 
-  virtual void openFile(const string& filename, uint64_t totalLength = 0);
+  virtual void openFile(const string& filename, int64_t totalLength = 0);
 
   virtual void closeFile();
 
   virtual void openExistingFile(const string& filename);
 
-  virtual string messageDigest(int64_t offset, uint64_t length,
+  virtual string messageDigest(int64_t offset, int64_t length,
 			       const MessageDigestContext::DigestAlgo& algo);
 
-  virtual void writeData(const char* data, uint32_t len, int64_t offset);
+  virtual void writeData(const char* data, int32_t len, int64_t offset);
 
-  virtual int readData(char* data, uint32_t len, int64_t offset);
+  virtual int32_t readData(char* data, int32_t len, int64_t offset);
 
   void setFileAllocator(const FileAllocatorHandle& fileAllocator) {
     this->fileAllocator = fileAllocator;

diff --git a/src/AbstractSingleDiskAdaptor.cc b/src/AbstractSingleDiskAdaptor.cc
@@ -51,15 +51,15 @@ void AbstractSingleDiskAdaptor::openExistingFile() {
   diskWriter->openExistingFile(getFilePath());
 }
 
-void AbstractSingleDiskAdaptor::writeData(const unsigned char* data, uint32_t len, int64_t offset) {
+void AbstractSingleDiskAdaptor::writeData(const unsigned char* data, int32_t len, int64_t offset) {
   diskWriter->writeData(data, len, offset);
 }
 
-int AbstractSingleDiskAdaptor::readData(unsigned char* data, uint32_t len, int64_t offset) {
+int32_t AbstractSingleDiskAdaptor::readData(unsigned char* data, int32_t len, int64_t offset) {
   return diskWriter->readData(data, len, offset);
 }
 
-string AbstractSingleDiskAdaptor::messageDigest(int64_t offset, uint64_t length, const MessageDigestContext::DigestAlgo& algo) {
+string AbstractSingleDiskAdaptor::messageDigest(int64_t offset, int64_t length, const MessageDigestContext::DigestAlgo& algo) {
   return diskWriter->messageDigest(offset, length, algo);
 }
 

diff --git a/src/AbstractSingleDiskAdaptor.h b/src/AbstractSingleDiskAdaptor.h
@@ -41,7 +41,7 @@
 class AbstractSingleDiskAdaptor : public DiskAdaptor {
 protected:
   DiskWriterHandle diskWriter;
-  uint64_t totalLength;
+  int64_t totalLength;
 public:
   AbstractSingleDiskAdaptor():diskWriter(0), totalLength(0) {}
 
@@ -55,12 +55,12 @@ class AbstractSingleDiskAdaptor : public DiskAdaptor {
 
   virtual void openExistingFile();
 
-  virtual void writeData(const unsigned char* data, uint32_t len,
+  virtual void writeData(const unsigned char* data, int32_t len,
 			 int64_t offset);
 
-  virtual int readData(unsigned char* data, uint32_t len, int64_t offset);
+  virtual int32_t readData(unsigned char* data, int32_t len, int64_t offset);
 
-  virtual string messageDigest(int64_t offset, uint64_t length,
+  virtual string messageDigest(int64_t offset, int64_t length,
 			       const MessageDigestContext::DigestAlgo& algo);
 
   virtual bool fileExists();
@@ -71,11 +71,11 @@ class AbstractSingleDiskAdaptor : public DiskAdaptor {
 
   DiskWriterHandle getDiskWriter() const { return diskWriter; }
 
-  void setTotalLength(const uint64_t& totalLength) {
+  void setTotalLength(const int64_t& totalLength) {
     this->totalLength = totalLength;
   }
 
-  uint64_t getTotalLength() const { return totalLength; }
+  int64_t getTotalLength() const { return totalLength; }
 };
 
 #endif // _D_ABSTRACT_SINGLE_DISK_ADAPTOR_H_