Changeset 9306 for trunk/libtransmission/announcer.c

Timestamp:

Oct 12, 2009, 11:16:51 PM (13 years ago)

Author:

charles

Message:

(trunk libT) #2498: DHT broken

File:

• trunk/libtransmission/announcer.c (modified) (4 diffs)

trunk/libtransmission/announcer.c

@@ -24 +24 @@
 #include "publish.h"
 #include "session.h"
+#include "tr-dht.h"
 #include "torrent.h"
 #include "utils.h"
@@ -1566 +1567 @@
     const tr_bool canAnnounce = announcer->announceSlotsAvailable > 0;
     const tr_bool canScrape = announcer->scrapeSlotsAvailable > 0;
+    tr_torrent * tor = NULL;
+    const time_t now = time( NULL );
 
     if( announcer->announceSlotsAvailable > 0 )
@@ -1571 +1574 @@
         int i;
         int n;
-        const time_t now = time( NULL );
-        tr_torrent * tor = NULL;
         tr_ptrArray announceMe = TR_PTR_ARRAY_INIT;
         tr_ptrArray scrapeMe = TR_PTR_ARRAY_INIT;
@@ -1615 +1616 @@
         tr_ptrArrayDestruct( &scrapeMe, NULL );
         tr_ptrArrayDestruct( &announceMe, NULL );
+    }
+
+    tor = NULL;
+    while(( tor = tr_torrentNext( announcer->session, tor ))) {
+        if( tor->dhtAnnounceAt <= now ) {
+            int rc = 1;
+            if( tor->isRunning && tr_torrentAllowsDHT(tor) )
+                rc = tr_dhtAnnounce(tor, 1);
+            if(rc == 0)
+                /* The DHT is not ready yet.  Try again soon. */
+                tor->dhtAnnounceAt = now + 5 + tr_cryptoWeakRandInt( 5 );
+            else
+                /* We should announce at least once every 30 minutes. */
+                tor->dhtAnnounceAt = now + 25 * 60 + tr_cryptoWeakRandInt( 3 * 60 );
+        }
     }
 }