Changeset 12181 for trunk/libtransmission/announcer.c

Timestamp:

Mar 17, 2011, 12:34:43 PM (11 years ago)

Author:

jordan

Message:

(trunk libT) move tr_dhtUpkeep() out of the announcer module

During shutdown, we can stop DHT almost immediately, but need to leave the announcer running for the DHT tracker event=stopped messages. So it doesn't make sense to keep them on the same periodic timer.

File:

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

trunk/libtransmission/announcer.c

@@ -29 +29 @@
 #include "ptrarray.h"
 #include "session.h"
-#include "tr-dht.h"
 #include "tr-lpd.h"
 #include "torrent.h"
@@ -1495 +1494 @@
 
 static void
-dht_upkeep( tr_session * session )
-{
-    tr_torrent * tor = NULL;
-    const time_t now = tr_time( );
-
-    while(( tor = tr_torrentNext( session, tor )))
-    {
-        if( tor->dhtAnnounceAt <= now )
-        {
-            if( tor->isRunning && tr_torrentAllowsDHT(tor) ) {
-                const int rc = tr_dhtAnnounce(tor, AF_INET, 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 );
-            }
-        }
-
-        if( tor->dhtAnnounce6At <= now )
-        {
-            if( tor->isRunning && tr_torrentAllowsDHT(tor) ) {
-                const int rc = tr_dhtAnnounce(tor, AF_INET6, 1);
-                if(rc == 0)
-                    tor->dhtAnnounce6At = now + 5 + tr_cryptoWeakRandInt( 5 );
-                else
-                    tor->dhtAnnounce6At =
-                        now + 25 * 60 + tr_cryptoWeakRandInt( 3 * 60 );
-            }
-        }
-    }
-}
-
-static void
 onUpkeepTimer( int foo UNUSED, short bar UNUSED, void * vannouncer )
 {
@@ -1542 +1505 @@
     /* maybe send out some announcements to trackers */
     announceMore( announcer );
-
-    dht_upkeep( announcer->session );
 
     /* LPD upkeep */