2009-05-07 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Removed unused uploadLimitCheck and uploadLimit from
	PeerAbstractCommand. Removed unused maxDownloadLimit from
	PeerInteractionCommand.
	* src/PeerAbstractCommand.cc
	* src/PeerAbstractCommand.h
	* src/PeerInteractionCommand.cc
	* src/PeerInteractionCommand.h

ChangeLog

@@ -1,3 +1,13 @@
+2009-05-07  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Removed unused uploadLimitCheck and uploadLimit from
+	PeerAbstractCommand. Removed unused maxDownloadLimit from
+	PeerInteractionCommand.
+	* src/PeerAbstractCommand.cc
+	* src/PeerAbstractCommand.h
+	* src/PeerInteractionCommand.cc
+	* src/PeerInteractionCommand.h
+
 2009-05-07  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Fixed broken file renaming feature since r1202.

src/PeerAbstractCommand.cc

@@ -56,8 +56,6 @@ PeerAbstractCommand::PeerAbstractCommand(int32_t cuid,
   peer(peer),
   checkSocketIsReadable(false),
   checkSocketIsWritable(false),
-  uploadLimitCheck(false),
-  uploadLimit(0),
   noCheck(false)
 {
   if(!socket.isNull() && socket->isOpen()) {
@@ -172,16 +170,6 @@ void PeerAbstractCommand::setWriteCheckSocket(const SocketHandle& socket)
   }
 }
 
-void PeerAbstractCommand::setUploadLimit(unsigned int uploadLimit)
-{
-  this->uploadLimit = uploadLimit;
-}
-
-void PeerAbstractCommand::setUploadLimitCheck(bool check)
-{
-  this->uploadLimitCheck = check;
-}
-
 void PeerAbstractCommand::setNoCheck(bool check)
 {
   this->noCheck = check;

src/PeerAbstractCommand.h

@@ -67,8 +67,6 @@ protected:
   void setWriteCheckSocket(const SharedHandle<SocketCore>& socket);
   void disableReadCheckSocket();
   void disableWriteCheckSocket();
-  void setUploadLimit(unsigned int uploadLimit);
-  void setUploadLimitCheck(bool check);
   void setNoCheck(bool check);
   void updateKeepAlive();
 private:
@@ -76,8 +74,6 @@ private:
   bool checkSocketIsWritable;
   SharedHandle<SocketCore> readCheckTarget;
   SharedHandle<SocketCore> writeCheckTarget;
-  bool uploadLimitCheck;
-  unsigned int uploadLimit;
   bool noCheck;
 public:
   PeerAbstractCommand(int32_t cuid,

src/PeerInteractionCommand.cc

@@ -89,8 +89,7 @@ PeerInteractionCommand::PeerInteractionCommand
    _btContext(btContext),
    _btRuntime(btRuntime),
    _pieceStorage(pieceStorage),
-   sequence(sequence),
-   maxDownloadSpeedLimit(0)
+   sequence(sequence)
 {
   // TODO move following bunch of processing to separate method, like init()
   if(sequence == INITIATOR_SEND_HANDSHAKE) {
@@ -190,13 +189,10 @@ PeerInteractionCommand::PeerInteractionCommand
   factory->setBtRequestFactory(reqFactory);
   factory->setPeerConnection(peerConnection);
 
-  setUploadLimit(e->option->getAsInt(PREF_MAX_UPLOAD_LIMIT));
   peer->allocateSessionResource(_btContext->getPieceLength(),
 				_btContext->getTotalLength());
   peer->setBtMessageDispatcher(dispatcher);
 
-  maxDownloadSpeedLimit = e->option->getAsInt(PREF_MAX_DOWNLOAD_LIMIT);
-
   _btRuntime->increaseConnections();
   _requestGroup->increaseNumCommand();
 }
@@ -215,7 +211,6 @@ PeerInteractionCommand::~PeerInteractionCommand() {
 }
 
 bool PeerInteractionCommand::executeInternal() {
-  setUploadLimitCheck(false);
   setNoCheck(false);
   switch(sequence) {
   case INITIATOR_SEND_HANDSHAKE:

src/PeerInteractionCommand.h

@@ -67,7 +67,6 @@ private:
 
   Seq sequence;
   SharedHandle<BtInteractive> btInteractive;
-  unsigned int maxDownloadSpeedLimit;
 protected:
   virtual bool executeInternal();
   virtual bool prepareForNextPeer(time_t wait);