2010-06-11 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Made protected member variable private. Added accessor funcs.
	* src/AbstractBtMessage.cc
	* src/AbstractBtMessage.h
	* src/BtAllowedFastMessage.cc
	* src/BtAllowedFastMessage.h
	* src/BtBitfieldMessage.cc
	* src/BtBitfieldMessage.h
	* src/BtCancelMessage.cc
	* src/BtCancelMessage.h
	* src/BtChokeMessage.cc
	* src/BtChokeMessage.h
	* src/BtExtendedMessage.cc
	* src/BtHaveAllMessage.cc
	* src/BtHaveAllMessage.h
	* src/BtHaveMessage.cc
	* src/BtHaveMessage.h
	* src/BtHaveNoneMessage.cc
	* src/BtHaveNoneMessage.h
	* src/BtInterestedMessage.cc
	* src/BtInterestedMessage.h
	* src/BtNotInterestedMessage.cc
	* src/BtNotInterestedMessage.h
	* src/BtPieceMessage.cc
	* src/BtPieceMessage.h
	* src/BtPortMessage.cc
	* src/BtPortMessage.h
	* src/BtRejectMessage.cc
	* src/BtRejectMessage.h
	* src/BtRequestMessage.cc
	* src/BtRequestMessage.h
	* src/BtUnchokeMessage.cc
	* src/BtUnchokeMessage.h
	* src/SimpleBtMessage.cc
	* src/SimpleBtMessage.h

1 files changed, 9 insertions, 4 deletions

diff --git a/src/BtRejectMessage.cc b/src/BtRejectMessage.cc
index d6c3a0ad..ee5dc6e1 100644
--- a/src/BtRejectMessage.cc
+++ b/src/BtRejectMessage.cc
@@ -43,6 +43,10 @@ namespace aria2 {
 
 const std::string BtRejectMessage::NAME("reject");
 
+BtRejectMessage::BtRejectMessage
+(size_t index, uint32_t begin, size_t length):
+  RangeBtMessage(ID, NAME, index, begin, length) {}
+
 SharedHandle<BtRejectMessage> BtRejectMessage::create
 (const unsigned char* data, size_t dataLength)
 {
@@ -51,22 +55,23 @@ SharedHandle<BtRejectMessage> BtRejectMessage::create
 
 void BtRejectMessage::doReceivedAction()
 {
-  if(!peer->isFastExtensionEnabled()) {
+  if(!getPeer()->isFastExtensionEnabled()) {
     throw DL_ABORT_EX
       (StringFormat("%s received while fast extension is disabled.",
                     toString().c_str()).str());
   }
-  if(_metadataGetMode) {
+  if(isMetadataGetMode()) {
     return;
   }
   // TODO Current implementation does not close a connection even if
   // a request for this reject message has never sent.
   RequestSlot slot =
-    dispatcher->getOutstandingRequest(getIndex(), getBegin(), getLength());
+    getBtMessageDispatcher()->getOutstandingRequest
+    (getIndex(), getBegin(), getLength());
   if(RequestSlot::isNull(slot)) {
     //throw DL_ABORT_EX("reject received, but it is not in the request slots.");
   } else {
-    dispatcher->removeOutstandingRequest(slot);
+    getBtMessageDispatcher()->removeOutstandingRequest(slot);
   }
 
 }