Changeset 9230 for trunk/libtransmission/announcer.c

Timestamp:

Oct 2, 2009, 4:54:02 AM (13 years ago)

Author:

charles

Message:

(trunk libT) #2471: added/removed trackers aren't applied until restart

File:

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

trunk/libtransmission/announcer.c

@@ -290 +290 @@
     /* sent as the "key" argument in tracker requests
      * to verify us if our IP address changes.
-     * This is immutable for the life of the tracker object. */
+     * This is immutable for the life of the tracker object.
+     * The +1 is for '\0' */
     char key_param[KEYLEN + 1];
 }
@@ -394 +395 @@
 
     t = tr_new0( tr_tier, 1 );
-    t->randOffset = tr_cryptoRandInt( 60 );
+    t->randOffset = tr_cryptoRandInt( tor->uniqueId % 60 );
     t->key = nextKey++;
     t->trackers = TR_PTR_ARRAY_INIT;
@@ -474 +475 @@
     tiers->publisher = TR_PUBLISHER_INIT;
     return tiers;
+}
+
+static void
+tiersClear( tr_torrent_tiers * tiers )
+{
+    tr_ptrArrayDestruct( &tiers->tiers, tierFree );
+    tiers->tiers = TR_PTR_ARRAY_INIT;
 }
 
@@ -702 +710 @@
 }
 
-tr_torrent_tiers *
-tr_announcerAddTorrent( tr_announcer * announcer, tr_torrent * tor )
+static void
+addTorrentToTier( tr_announcer * announcer, tr_torrent_tiers * tiers, tr_torrent * tor )
 {
     int i, n;
-    tr_torrent_tiers * tiers;
     tr_tracker_info ** infos;
+    const int trackerCount = tor->info.trackerCount;
+    const tr_tracker_info  * trackers = tor->info.trackers;
 
     /* get the trackers that we support... */
-    infos = tr_new( tr_tracker_info*, tor->info.trackerCount );
-    for( i=n=0; i<tor->info.trackerCount; ++i )
-        if( announceURLIsSupported( tor->info.trackers[i].announce ) )
-            infos[n++] = &tor->info.trackers[i];
-
-    assert( announcer != NULL );
-    assert( tr_isTorrent( tor ) );
-
-    tiers = tiersNew( );
+    infos = tr_new0( tr_tracker_info*, trackerCount );
+    for( i=n=0; i<trackerCount; ++i )
+        if( announceURLIsSupported( trackers[i].announce ) )
+            infos[n++] = &trackers[i];
 
     /* build our private table of tiers... */
@@ -726 +730 @@
         tr_tier * tier = NULL;
 
-        for( i=0; i<tor->info.trackerCount; ++i )
+        for( i=0; i<trackerCount; ++i )
         {
             const tr_tracker_info * info = infos[i];
@@ -746 +750 @@
 
     tr_free( infos );
+}
+
+tr_torrent_tiers *
+tr_announcerAddTorrent( tr_announcer * announcer, tr_torrent * tor )
+{
+    tr_torrent_tiers * tiers;
+
+    assert( announcer != NULL );
+    assert( tr_isTorrent( tor ) );
+
+    tiers = tiersNew( );
+
+    addTorrentToTier( announcer, tiers, tor );
+
     return tiers;
+}
+
+void
+tr_announcerResetTorrent( tr_announcer * announcer, tr_torrent * tor )
+{
+    if( tor->tiers != NULL )
+    {
+        tiersClear( tor->tiers );
+
+        addTorrentToTier( announcer, tor->tiers, tor );
+    }
 }