Changeset 10195

Timestamp:

Feb 14, 2010, 3:40:39 AM (12 years ago)

Author:

charles

Message:

(trunk libT) #2850 "tr_torrentSetAnnounceList() should not trigger reannounces to trackers" -- further revision to get newly-added tiers to announce

File:

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

trunk/libtransmission/announcer.c

@@ -28 +28 @@
 #include "utils.h"
 #include "web.h"
+
+#define STARTED "started"
 
 #define dbgmsg( tier, ... ) \
@@ -823 +825 @@
 }
 
+static void
+tierAddAnnounce( tr_tier * tier, const char * announceEvent, time_t announceAt );
+
 void
 tr_announcerResetTorrent( tr_announcer * announcer, tr_torrent * tor )
@@ -872 +877 @@
         }
     }
-    else
-    {
-        /* start the torrent, if applicable */
-        if( tor->isRunning )
-            tr_announcerTorrentStarted( tor );
+
+    /* kickstart any tiers that didn't get started */
+    if( tor->isRunning )
+    {
+        int i, n;
+        const time_t now = tr_time( );
+        tr_tier ** tiers = (tr_tier**) tr_ptrArrayPeek( &tor->tiers->tiers, &n );
+        for( i=0; i<n; ++i ) {
+            tr_tier * tier = tiers[i];
+            if( !tier->isRunning )    
+                tierAddAnnounce( tier, STARTED, now );
+        }
     }
 
@@ -976 +988 @@
 tr_announcerTorrentStarted( tr_torrent * tor )
 {
-    torrentAddAnnounce( tor, "started", tr_time( ) );
+    torrentAddAnnounce( tor, STARTED, tr_time( ) );
 }
 void