From c58f736bb91f55fb68151c5c7d977911f993b1ab Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Thu, 21 Jul 2011 23:42:41 +0900 Subject: BtRegistry now holds BitTorrent TCP server port. Because BitTorrent TCP server port is global configuration, it is not preferable that per download resource BtRuntime holds it. We also refactored and eliminated ugly static variable in PeerListenCommand. If TCP port is necessary, we inject it to them directly. --- src/DHTTaskFactoryImpl.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/DHTTaskFactoryImpl.cc') diff --git a/src/DHTTaskFactoryImpl.cc b/src/DHTTaskFactoryImpl.cc index d4488560..efc9afc3 100644 --- a/src/DHTTaskFactoryImpl.cc +++ b/src/DHTTaskFactoryImpl.cc @@ -46,7 +46,6 @@ #include "Peer.h" #include "DHTNodeLookupEntry.h" #include "PeerStorage.h" -#include "BtRuntime.h" #include "DHTMessageCallback.h" namespace aria2 { @@ -90,12 +89,11 @@ DHTTaskFactoryImpl::createBucketRefreshTask() SharedHandle DHTTaskFactoryImpl::createPeerLookupTask (const SharedHandle& ctx, - const SharedHandle& btRuntime, + uint16_t tcpPort, const SharedHandle& peerStorage) { - SharedHandle task(new DHTPeerLookupTask(ctx)); - // TODO these may be not freed by RequestGroup::releaseRuntimeResource() - task->setBtRuntime(btRuntime); + SharedHandle task(new DHTPeerLookupTask(ctx, tcpPort)); + // TODO this may be not freed by RequestGroup::releaseRuntimeResource() task->setPeerStorage(peerStorage); setCommonProperty(task); return task; -- cgit