Changeset 1234

Timestamp:

Dec 16, 2006, 1:58:07 AM (16 years ago)

Author:

livings124

Message:

libT can now better report if it can connect to a tracker, and as a result the mac's queue system will now start the next for any error (not just those sent by the tracker)

Location:

branches/multitracker

Files:

• libtransmission/tracker.c (modified) (4 diffs)
• libtransmission/tracker.h (modified) (1 diff)
• libtransmission/transmission.c (modified) (3 diffs)
• libtransmission/transmission.h (modified) (1 diff)
• macosx/Torrent.m (modified) (2 diffs)

branches/multitracker/libtransmission/tracker.c

@@ -71 +71 @@
     int            complete;
     int            randOffset;
+    
+    int            completelyUnconnectable;
 
     uint64_t       dateTry;
@@ -202 +204 @@
                                 || tc->announceTierLast + 1 < inf->trackerList[tc->announceTier].count
                                 ? TC_CHANGE_NEXT : TC_CHANGE_NO;
+    
+    if( tc->shouldChangeAnnounce == TC_CHANGE_NO )
+    {
+        tc->completelyUnconnectable = 1;
+    }
 }
 
@@ -316 +323 @@
     if( ( NULL == tc->http ) && shouldConnect( tc ) )
     {
+        tc->completelyUnconnectable = 0;
         tc->randOffset = tr_rand( 60000 );
         
@@ -1055 +1063 @@
 }
 
+int tr_trackerCannotConnecting( tr_tracker_t * tc )
+{
+    if( !tc )
+    {
+        return 0;
+    }
+    return tc->completelyUnconnectable;
+}
+
 /* Blocking version */
 int tr_trackerScrape( tr_torrent_t * tor, int * s, int * l, int * d )

branches/multitracker/libtransmission/tracker.h

@@ -61 +61 @@
 const char * tr_trackerAnnounce( tr_tracker_t * tc );
 
+int tr_trackerCannotConnecting( tr_tracker_t * tc );
+
 /***********************************************************************
  * tr_trackerScrape

branches/multitracker/libtransmission/transmission.c

@@ -455 +455 @@
     tr_peer_t * peer;
     tr_info_t * inf = &tor->info;
+    tr_tracker_t * tc = tor->tracker;
     int i;
 
@@ -474 +475 @@
     memcpy( s->trackerError, tor->trackerError,
             sizeof( s->trackerError ) );
+    s->cannotConnect = tr_trackerCannotConnecting( tc );
     
     if( tor->tracker )
@@ -532 +534 @@
     s->rateUpload = tr_rcRate( tor->upload );
     
-    s->seeders  = tr_trackerSeeders( tor->tracker );
-    s->leechers = tr_trackerLeechers( tor->tracker );
+    s->seeders  = tr_trackerSeeders( tc );
+    s->leechers = tr_trackerLeechers( tc );
     s->completedFromTracker = tr_trackerDownloaded( tor->tracker );
 

branches/multitracker/libtransmission/transmission.h

@@ -364 +364 @@
     int                 error;
     char                trackerError[128];
+    int                 cannotConnect;
     
     const char        * trackerAddress;

branches/multitracker/macosx/Torrent.m

@@ -351 +351 @@
         [fStatusString setString: [NSLocalizedString(@"Error: ", "Torrent -> status string") stringByAppendingString:
                                     [self errorMessage]]];
-        if (!fError && [self isActive])
+    }
+    
+    BOOL wasError = fError;
+    if ((fError = fStat->cannotConnect))
+    {
+        if (!wasError && [self isActive])
         {
             fError = YES;
@@ -357 +362 @@
                 [[NSNotificationCenter defaultCenter] postNotificationName: @"StoppedDownloading" object: self];
         }
-    }
-    else
-    {
-        if (fError)
-            fError = NO;
     }