From 9afc36152a1ce428243a3ace608d0508716a2efb Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Tue, 8 Jun 2010 15:02:20 +0000 Subject: 2010-06-09 Tatsuhiro Tsujikawa Made protected member variables of Command private. Added accessor funcs. --- src/ReceiverMSEHandshakeCommand.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/ReceiverMSEHandshakeCommand.cc') diff --git a/src/ReceiverMSEHandshakeCommand.cc b/src/ReceiverMSEHandshakeCommand.cc index 822da7ff..5edf1030 100644 --- a/src/ReceiverMSEHandshakeCommand.cc +++ b/src/ReceiverMSEHandshakeCommand.cc @@ -98,13 +98,15 @@ bool ReceiverMSEHandshakeCommand::executeInternal() break; case MSEHandshake::HANDSHAKE_LEGACY: { if(e->getOption()->getAsBool(PREF_BT_REQUIRE_CRYPTO)) { - throw DL_ABORT_EX("The legacy BitTorrent handshake is not acceptable by the preference."); + throw DL_ABORT_EX + ("The legacy BitTorrent handshake is not acceptable by the" + " preference."); } SharedHandle peerConnection - (new PeerConnection(cuid, socket)); + (new PeerConnection(getCuid(), socket)); peerConnection->presetBuffer(_mseHandshake->getBuffer(), _mseHandshake->getBufferLength()); - Command* c = new PeerReceiveHandshakeCommand(cuid, peer, e, socket, + Command* c = new PeerReceiveHandshakeCommand(getCuid(), peer, e, socket, peerConnection); e->addCommand(c); return true; @@ -185,7 +187,7 @@ bool ReceiverMSEHandshakeCommand::executeInternal() void ReceiverMSEHandshakeCommand::createCommand() { SharedHandle peerConnection - (new PeerConnection(cuid, socket)); + (new PeerConnection(getCuid(), socket)); if(_mseHandshake->getNegotiatedCryptoType() == MSEHandshake::CRYPTO_ARC4) { peerConnection->enableEncryption(_mseHandshake->getEncryptor(), _mseHandshake->getDecryptor()); @@ -198,7 +200,7 @@ void ReceiverMSEHandshakeCommand::createCommand() // as a hint. If this info hash and one in BitTorrent Handshake does not // match, then drop connection. Command* c = - new PeerReceiveHandshakeCommand(cuid, peer, e, socket, peerConnection); + new PeerReceiveHandshakeCommand(getCuid(), peer, e, socket, peerConnection); e->addCommand(c); } -- cgit