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

	Removed unused option member from PeerConnection.
	* src/InitiatorMSEHandshakeCommand.cc
	* src/PeerConnection.cc
	* src/PeerConnection.h
	* src/PeerInteractionCommand.cc
	* src/PeerReceiveHandshakeCommand.cc
	* src/ReceiverMSEHandshakeCommand.cc

7 files changed, 23 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index cad3d899..c0f22725 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2009-05-13  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
+	Removed unused option member from PeerConnection.
+	* src/InitiatorMSEHandshakeCommand.cc
+	* src/PeerConnection.cc
+	* src/PeerConnection.h
+	* src/PeerInteractionCommand.cc
+	* src/PeerReceiveHandshakeCommand.cc
+	* src/ReceiverMSEHandshakeCommand.cc
+
+2009-05-13  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
 	Added "seeder" key to getPeers response.
 	* src/XmlRpcMethodImpl.cc
 
diff --git a/src/InitiatorMSEHandshakeCommand.cc b/src/InitiatorMSEHandshakeCommand.cc
index 8fbd1bd2..b29fe38c 100644
--- a/src/InitiatorMSEHandshakeCommand.cc
+++ b/src/InitiatorMSEHandshakeCommand.cc
@@ -145,7 +145,7 @@ bool InitiatorMSEHandshakeCommand::executeInternal() {
   case INITIATOR_RECEIVE_PAD_D: {
     if(_mseHandshake->receivePad()) {
       SharedHandle<PeerConnection> peerConnection
-	(new PeerConnection(cuid, socket, getOption().get()));
+	(new PeerConnection(cuid, socket));
       if(_mseHandshake->getNegotiatedCryptoType() == MSEHandshake::CRYPTO_ARC4) {
 	peerConnection->enableEncryption(_mseHandshake->getEncryptor(),
 					 _mseHandshake->getDecryptor());
diff --git a/src/PeerConnection.cc b/src/PeerConnection.cc
index c1170ed4..65147ee3 100644
--- a/src/PeerConnection.cc
+++ b/src/PeerConnection.cc
@@ -33,6 +33,11 @@
  */
 /* copyright --> */
 #include "PeerConnection.h"
+
+#include <cstring>
+#include <cassert>
+#include <algorithm>
+
 #include "message.h"
 #include "DlAbortEx.h"
 #include "LogFactory.h"
@@ -43,18 +48,13 @@
 #include "ARC4Encryptor.h"
 #include "ARC4Decryptor.h"
 #include "StringFormat.h"
-#include <cstring>
-#include <cassert>
-#include <algorithm>
 
 namespace aria2 {
 
-PeerConnection::PeerConnection(int32_t cuid,
-			       const SocketHandle& socket,
-			       const Option* op)
+PeerConnection::PeerConnection(int32_t cuid, const SocketHandle& socket)
+
   :cuid(cuid),
    socket(socket),
-   option(op),
    logger(LogFactory::getInstance()),
    resbufLength(0),
    currentPayloadLength(0),
diff --git a/src/PeerConnection.h b/src/PeerConnection.h
index fc231802..2e01ba5b 100644
--- a/src/PeerConnection.h
+++ b/src/PeerConnection.h
@@ -42,7 +42,6 @@
 
 namespace aria2 {
 
-class Option;
 class Logger;
 class SocketCore;
 class ARC4Encryptor;
@@ -56,7 +55,6 @@ class PeerConnection {
 private:
   int32_t cuid;
   SharedHandle<SocketCore> socket;
-  const Option* option;
   Logger* logger;
 
   unsigned char resbuf[MAX_PAYLOAD_LEN];
@@ -78,7 +76,7 @@ private:
   ssize_t sendData(const unsigned char* data, size_t length, bool encryption);
 
 public:
-  PeerConnection(int32_t cuid, const SharedHandle<SocketCore>& socket, const Option* op);
+  PeerConnection(int32_t cuid, const SharedHandle<SocketCore>& socket);
 
   ~PeerConnection();
   
diff --git a/src/PeerInteractionCommand.cc b/src/PeerInteractionCommand.cc
index 291d3f3c..d6f7c256 100644
--- a/src/PeerInteractionCommand.cc
+++ b/src/PeerInteractionCommand.cc
@@ -123,7 +123,7 @@ PeerInteractionCommand::PeerInteractionCommand
 
   PeerConnectionHandle peerConnection;
   if(passedPeerConnection.isNull()) {
-    peerConnection.reset(new PeerConnection(cuid, socket, getOption().get()));
+    peerConnection.reset(new PeerConnection(cuid, socket));
   } else {
     peerConnection = passedPeerConnection;
   }
diff --git a/src/PeerReceiveHandshakeCommand.cc b/src/PeerReceiveHandshakeCommand.cc
index c77dd843..9a95deba 100644
--- a/src/PeerReceiveHandshakeCommand.cc
+++ b/src/PeerReceiveHandshakeCommand.cc
@@ -70,8 +70,7 @@ PeerReceiveHandshakeCommand::PeerReceiveHandshakeCommand
   _peerConnection(peerConnection)
 {
   if(_peerConnection.isNull()) {
-    // TODO referring global option
-    _peerConnection.reset(new PeerConnection(cuid, socket, e->option));
+    _peerConnection.reset(new PeerConnection(cuid, socket));
   }
 }
 
diff --git a/src/ReceiverMSEHandshakeCommand.cc b/src/ReceiverMSEHandshakeCommand.cc
index 9d89e11d..fca6c007 100644
--- a/src/ReceiverMSEHandshakeCommand.cc
+++ b/src/ReceiverMSEHandshakeCommand.cc
@@ -98,7 +98,7 @@ bool ReceiverMSEHandshakeCommand::executeInternal()
 	throw DlAbortEx("The legacy BitTorrent handshake is not acceptable by the preference.");
       }
       SharedHandle<PeerConnection> peerConnection
-	(new PeerConnection(cuid, socket, e->option));
+	(new PeerConnection(cuid, socket));
       peerConnection->presetBuffer(_mseHandshake->getBuffer(),
 				   _mseHandshake->getBufferLength());
       Command* c = new PeerReceiveHandshakeCommand(cuid, peer, e, socket,
@@ -180,7 +180,7 @@ bool ReceiverMSEHandshakeCommand::executeInternal()
 void ReceiverMSEHandshakeCommand::createCommand()
 {
   SharedHandle<PeerConnection> peerConnection
-    (new PeerConnection(cuid, socket, e->option));
+    (new PeerConnection(cuid, socket));
   if(_mseHandshake->getNegotiatedCryptoType() == MSEHandshake::CRYPTO_ARC4) {
     peerConnection->enableEncryption(_mseHandshake->getEncryptor(),
 				     _mseHandshake->getDecryptor());