summaryrefslogtreecommitdiff
path: root/src/PeerInitiateConnectionCommand.cc
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2010-06-08 15:02:20 +0000
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2010-06-08 15:02:20 +0000
commit9afc36152a1ce428243a3ace608d0508716a2efb (patch)
tree2e144d04570a058f3e2716d7b98f16803392cdbe /src/PeerInitiateConnectionCommand.cc
parent7cd9b21937c42606354610c7ae85a0857b474cf5 (diff)
2010-06-09 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Made protected member variables of Command private. Added accessor funcs.
Diffstat (limited to 'src/PeerInitiateConnectionCommand.cc')
-rw-r--r--src/PeerInitiateConnectionCommand.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/PeerInitiateConnectionCommand.cc b/src/PeerInitiateConnectionCommand.cc
index 8374222a..30b83768 100644
--- a/src/PeerInitiateConnectionCommand.cc
+++ b/src/PeerInitiateConnectionCommand.cc
@@ -80,16 +80,16 @@ PeerInitiateConnectionCommand::~PeerInitiateConnectionCommand()
}
bool PeerInitiateConnectionCommand::executeInternal() {
- if(logger->info()) {
- logger->info(MSG_CONNECTING_TO_SERVER,
- util::itos(cuid).c_str(), peer->ipaddr.c_str(),
- peer->port);
+ if(getLogger()->info()) {
+ getLogger()->info(MSG_CONNECTING_TO_SERVER,
+ util::itos(getCuid()).c_str(), peer->ipaddr.c_str(),
+ peer->port);
}
socket.reset(new SocketCore());
socket->establishConnection(peer->ipaddr, peer->port);
if(_mseHandshakeEnabled) {
InitiatorMSEHandshakeCommand* c =
- new InitiatorMSEHandshakeCommand(cuid, _requestGroup, peer, e,
+ new InitiatorMSEHandshakeCommand(getCuid(), _requestGroup, peer, e,
_btRuntime, socket);
c->setPeerStorage(_peerStorage);
c->setPieceStorage(_pieceStorage);
@@ -97,7 +97,8 @@ bool PeerInitiateConnectionCommand::executeInternal() {
} else {
PeerInteractionCommand* command =
new PeerInteractionCommand
- (cuid, _requestGroup, peer, e, _btRuntime, _pieceStorage, _peerStorage,
+ (getCuid(), _requestGroup, peer, e, _btRuntime, _pieceStorage,
+ _peerStorage,
socket, PeerInteractionCommand::INITIATOR_SEND_HANDSHAKE);
e->addCommand(command);
}