diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-11-12 12:48:48 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-11-12 12:48:48 +0000 |
| commit | 93e5dbed325f29c1bf867a2847d3b839d545cfb2 (patch) | |
| tree | f657b55b41a05cf364403a36edf9d0921f426e7d /src/DefaultBtInteractive.cc | |
| parent | f6f5a7e5eeec4f14418fec5a7be1bbe57a7ea7e1 (diff) | |
2010-11-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Removed SharedHandle::isNull(). Instead we added operator* and
operator unspecified_bool_type. Removed use of WeakHandle and
replaced with raw pointer.
Diffstat (limited to 'src/DefaultBtInteractive.cc')
| -rw-r--r-- | src/DefaultBtInteractive.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/DefaultBtInteractive.cc b/src/DefaultBtInteractive.cc index d7234b7e..1fe827b8 100644 --- a/src/DefaultBtInteractive.cc +++ b/src/DefaultBtInteractive.cc @@ -83,6 +83,7 @@ DefaultBtInteractive::DefaultBtInteractive downloadContext_(downloadContext), peer_(peer), metadataGetMode_(false), + localNode_(0), logger_(LogFactory::getInstance()), allowedFastSetSize_(10), haveTimer_(global::wallclock), @@ -95,7 +96,8 @@ DefaultBtInteractive::DefaultBtInteractive utPexEnabled_(false), dhtEnabled_(false), numReceivedMessage_(0), - maxOutstandingRequest_(DEFAULT_MAX_OUTSTANDING_REQUEST) + maxOutstandingRequest_(DEFAULT_MAX_OUTSTANDING_REQUEST), + requestGroupMan_(0) {} DefaultBtInteractive::~DefaultBtInteractive() {} @@ -111,7 +113,7 @@ void DefaultBtInteractive::initiateHandshake() { BtMessageHandle DefaultBtInteractive::receiveHandshake(bool quickReply) { SharedHandle<BtHandshakeMessage> message = btMessageReceiver_->receiveHandshake(quickReply); - if(message.isNull()) { + if(!message) { return SharedHandle<BtMessage>(); } if(memcmp(message->getPeerId(), bittorrent::getStaticPeerId(), @@ -290,7 +292,7 @@ size_t DefaultBtInteractive::receiveMessages() { break; } BtMessageHandle message = btMessageReceiver_->receiveMessage(); - if(message.isNull()) { + if(!message) { break; } ++msgcount; @@ -569,7 +571,7 @@ void DefaultBtInteractive::doInteractionProcessing() { sendPendingMessage(); } -void DefaultBtInteractive::setLocalNode(const WeakHandle<DHTNode>& node) +void DefaultBtInteractive::setLocalNode(DHTNode* node) { localNode_ = node; } @@ -657,8 +659,7 @@ void DefaultBtInteractive::setBtMessageFactory messageFactory_ = factory; } -void DefaultBtInteractive::setRequestGroupMan -(const WeakHandle<RequestGroupMan>& rgman) +void DefaultBtInteractive::setRequestGroupMan(RequestGroupMan* rgman) { requestGroupMan_ = rgman; } |