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/DHTMessageFactoryImpl.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/DHTMessageFactoryImpl.cc')
| -rw-r--r-- | src/DHTMessageFactoryImpl.cc | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/DHTMessageFactoryImpl.cc b/src/DHTMessageFactoryImpl.cc index 9910abe8..b3294800 100644 --- a/src/DHTMessageFactoryImpl.cc +++ b/src/DHTMessageFactoryImpl.cc @@ -66,6 +66,11 @@ namespace aria2 { DHTMessageFactoryImpl::DHTMessageFactoryImpl(int family): family_(family), + connection_(0), + dispatcher_(0), + routingTable_(0), + peerAnnounceStorage_(0), + tokenTracker_(0), logger_(LogFactory::getInstance()) {} DHTMessageFactoryImpl::~DHTMessageFactoryImpl() {} @@ -75,7 +80,7 @@ DHTMessageFactoryImpl::getRemoteNode (const unsigned char* id, const std::string& ipaddr, uint16_t port) const { SharedHandle<DHTNode> node = routingTable_->getNode(id, ipaddr, port); - if(node.isNull()) { + if(!node) { node.reset(new DHTNode(id)); node->setIPAddress(ipaddr); node->setPort(port); @@ -309,8 +314,7 @@ void DHTMessageFactoryImpl::setCommonProperty m->setConnection(connection_); m->setMessageDispatcher(dispatcher_); m->setRoutingTable(routingTable_); - WeakHandle<DHTMessageFactory> factory(this); - m->setMessageFactory(factory); + m->setMessageFactory(this); m->setVersion(getDefaultVersion()); } @@ -506,32 +510,29 @@ DHTMessageFactoryImpl::createUnknownMessage return m; } -void DHTMessageFactoryImpl::setRoutingTable -(const WeakHandle<DHTRoutingTable>& routingTable) +void DHTMessageFactoryImpl::setRoutingTable(DHTRoutingTable* routingTable) { routingTable_ = routingTable; } -void DHTMessageFactoryImpl::setConnection -(const WeakHandle<DHTConnection>& connection) +void DHTMessageFactoryImpl::setConnection(DHTConnection* connection) { connection_ = connection; } void DHTMessageFactoryImpl::setMessageDispatcher -(const WeakHandle<DHTMessageDispatcher>& dispatcher) +(DHTMessageDispatcher* dispatcher) { dispatcher_ = dispatcher; } void DHTMessageFactoryImpl::setPeerAnnounceStorage -(const WeakHandle<DHTPeerAnnounceStorage>& storage) +(DHTPeerAnnounceStorage* storage) { peerAnnounceStorage_ = storage; } -void DHTMessageFactoryImpl::setTokenTracker -(const WeakHandle<DHTTokenTracker>& tokenTracker) +void DHTMessageFactoryImpl::setTokenTracker(DHTTokenTracker* tokenTracker) { tokenTracker_ = tokenTracker; } |