[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/network/ktorrent/libbtcore
From:       Joris Guisson <joris.guisson () gmail ! com>
Date:       2009-11-25 18:23:55
Message-ID: 1259173435.675761.10435.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1054195 by guisson:

Rename DHTTrackerBackend to DHTPeerSource and decouple it from TorrentInterface


 M  +2 -2      CMakeLists.txt  
 A             dht/dhtpeersource.cpp   dht/dhttrackerbackend.cpp#1054177 [License: \
GPL (v2+)]  A             dht/dhtpeersource.h   dht/dhttrackerbackend.h#1054177 \
[License: GPL (v2+)]  D             dht/dhttrackerbackend.cpp  
 D             dht/dhttrackerbackend.h  
 M  +4 -2      torrent/peersourcemanager.cpp  
 M  +2 -2      torrent/peersourcemanager.h  


--- trunk/extragear/network/ktorrent/libbtcore/CMakeLists.txt #1054194:1054195
@@ -144,7 +144,7 @@
 	dht/rpcmsg.cpp     
 	dht/taskmanager.cpp
 	dht/database.cpp      
-	dht/dhttrackerbackend.cpp  
+	dht/dhtpeersource.cpp 
 	dht/key.cpp                  
 	dht/pack.cpp        
 	dht/rpcserver.cpp
@@ -371,7 +371,7 @@
 	./dht/key.h
 	./dht/pack.h
 	./dht/rpcmsg.h
-	./dht/dhttrackerbackend.h
+	./dht/dhtpeersource.h
 	./dht/announcetask.h
 	./dht/rpccall.h
 	./dht/kclosestnodessearch.h
--- trunk/extragear/network/ktorrent/libbtcore/torrent/peersourcemanager.cpp \
#1054194:1054195 @@ -26,7 +26,7 @@
 #include <util/log.h>
 #include <torrent/globals.h>
 #include <dht/dhtbase.h>
-#include <dht/dhttrackerbackend.h>
+#include <dht/dhtpeersource.h>
 #include <tracker/tracker.h>
 #include "torrentcontrol.h"
 #include "torrent.h"
@@ -134,7 +134,9 @@
 			delete m_dht;
 		}
 		
-		m_dht = new dht::DHTTrackerBackend(Globals::instance().getDHT(),tor);
+		m_dht = new dht::DHTPeerSource(Globals::instance().getDHT(),tor->getInfoHash(),tor->getStats().torrent_name);
 +		for (Uint32 i = 0;i < tor->getNumDHTNodes();i++)
+			m_dht->addDHTNode(tor->getDHTNode(i));
 		
 		// add the DHT source
 		addPeerSource(m_dht);
--- trunk/extragear/network/ktorrent/libbtcore/torrent/peersourcemanager.h \
#1054194:1054195 @@ -31,7 +31,7 @@
 
 namespace dht
 {
-	class DHTTrackerBackend;
+	class DHTPeerSource;
 }
 
 namespace bt
@@ -50,7 +50,7 @@
 		Q_OBJECT
 		
 		QList<PeerSource*> additional;
-		dht::DHTTrackerBackend* m_dht;
+		dht::DHTPeerSource* m_dht;
 		
 	public:
 		PeerSourceManager(TorrentControl* tor,PeerManager* pman);


[prev in list] [next in list] [prev in thread] [next in thread]