diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-04-20 00:50:22 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-04-20 00:50:22 +0000 |
| commit | 3505201f3333c937b5b870d70019d400c722a69f (patch) | |
| tree | def64ac6be50375e43da5e3e91eb443dd4c171fc /src/ReceiverMSEHandshakeCommand.cc | |
| parent | 99733a84e2102739ee7c9de08ffae9e9216b6003 (diff) | |
2008-04-20 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Rewritten SharedHandle. Now copy constructor taking raw pointer
has
keyword explicit and SharedHandle's default constructor
initializes
its internal obj to null, old implementation initializes it
using
obj's default constructor.
To assign null, write SharedHandle<T> x(...); x.reset();
TODO: test/SharedHandleTest.cc needs more tests.
* src/SharedHandle.h
Diffstat (limited to 'src/ReceiverMSEHandshakeCommand.cc')
| -rw-r--r-- | src/ReceiverMSEHandshakeCommand.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ReceiverMSEHandshakeCommand.cc b/src/ReceiverMSEHandshakeCommand.cc index e01cf346..75240f8c 100644 --- a/src/ReceiverMSEHandshakeCommand.cc +++ b/src/ReceiverMSEHandshakeCommand.cc @@ -90,8 +90,8 @@ bool ReceiverMSEHandshakeCommand::executeInternal() if(e->option->getAsBool(PREF_BT_REQUIRE_CRYPTO)) { throw new DlAbortEx("The legacy BitTorrent handshake is not acceptable by the preference."); } - SharedHandle<PeerConnection> peerConnection = - new PeerConnection(cuid, socket, e->option); + SharedHandle<PeerConnection> peerConnection + (new PeerConnection(cuid, socket, e->option)); peerConnection->presetBuffer(_mseHandshake->getBuffer(), _mseHandshake->getBufferLength()); Command* c = new PeerReceiveHandshakeCommand(cuid, peer, e, socket, @@ -138,8 +138,8 @@ bool ReceiverMSEHandshakeCommand::executeInternal() case RECEIVER_RECEIVE_IA: { if(_mseHandshake->receiveReceiverIA()) { _mseHandshake->sendReceiverStep2(); - SharedHandle<PeerConnection> peerConnection = - new PeerConnection(cuid, socket, e->option); + SharedHandle<PeerConnection> peerConnection + (new PeerConnection(cuid, socket, e->option)); if(_mseHandshake->getNegotiatedCryptoType() == MSEHandshake::CRYPTO_ARC4) { peerConnection->enableEncryption(_mseHandshake->getEncryptor(), _mseHandshake->getDecryptor()); |