Changeset 1213

Timestamp:

Dec 14, 2006, 6:47:01 AM (16 years ago)

Author:

livings124

Message:

fix and improvement

File:

• branches/multitracker/libtransmission/tracker.c (modified) (4 diffs)

branches/multitracker/libtransmission/tracker.c

@@ -186 +186 @@
 static void failureAnnouncing( tr_tracker_t * tc )
 {
+    tr_torrent_t * tor = tc->tor;
     tr_info_t    * inf = &tor->info;
     
@@ -296 +297 @@
 {
     tr_torrent_t * tor = tc->tor;
+    tr_info_t    * inf = &tor->info;
     const char   * data;
     int            len, i;
@@ -308 +310 @@
             tr_inf( "Tracker: failed to connect to %s, trying next", tc->trackerAddress );
             
-            prevAnnouncePtr = tc->trackerAnnounceListPtr[tc->announceTier];
-            announcePtr = prevAnnouncePtr->nextItem;
-            for( i = 0; i < tc->announceTierLast; i++ )
+            if( tc->announceTierLast + 1 < inf->trackerList[tc->announceTier].count )
             {
-                prevAnnouncePtr = announcePtr;
-                announcePtr = announcePtr->nextItem;
-            }
-            
-            if( announcePtr != NULL )
-            {
-                tc->announceTierLast++;
+                prevAnnouncePtr = tc->trackerAnnounceListPtr[tc->announceTier];
+                announcePtr = prevAnnouncePtr->nextItem;
+                for( i = 0; i < tc->announceTierLast; i++ )
+                {
+                    prevAnnouncePtr = announcePtr;
+                    announcePtr = announcePtr->nextItem;
+                }
                 
                 /* Move address to front of tier in announce list */
@@ -324 +324 @@
                 announcePtr->nextItem =  tc->trackerAnnounceListPtr[tc->announceTier];
                 tc->trackerAnnounceListPtr[tc->announceTier] = announcePtr;
+                
+                tc->announceTierLast++;
             }
             else