Ticket #1447: tracker.patch

libtransmission/fdlimit.c

@@ -38 +38 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef HAVE_GETRLIMIT
- #include <sys/time.h> /* getrlimit */
- #include <sys/resource.h> /* getrlimit */
-#endif
 #include <unistd.h>
 #include <fcntl.h> /* O_LARGEFILE */
 
@@ -504 +500 @@
     assert( gFd == NULL );
     gFd = tr_new0( struct tr_fd_s, 1 );
     gFd->lock = tr_lockNew( );
-
-#ifdef HAVE_GETRLIMIT
-    {
-        struct rlimit rlim;
-        getrlimit( RLIMIT_NOFILE, &rlim );
-        rlim.rlim_cur = MIN( rlim.rlim_max,
-                            (rlim_t)( globalPeerLimit + NOFILE_BUFFER ) );
-        setrlimit( RLIMIT_NOFILE, &rlim );
-        gFd->socketMax = rlim.rlim_cur - NOFILE_BUFFER;
-        tr_dbg( "setrlimit( RLIMIT_NOFILE, %d )", (int)rlim.rlim_cur );
-    }
-#else
     gFd->socketMax = globalPeerLimit;
-#endif
     tr_dbg( "%d usable file descriptors", globalPeerLimit );
 
     for( i = 0; i < TR_MAX_OPEN_FILES; ++i )

libtransmission/tracker.c

@@ -257 +257 @@
     {
         /* multitracker spec: "if a connection with a tracker is
            successful, it will be moved to the front of the tier." */
-        t->trackerIndex = tr_torrentPromoteTracker( torrent,
-                                                    t->trackerIndex );
+        t->trackerIndex = tr_torrentPromoteTracker( torrent, t->trackerIndex );
         retry = FALSE; /* we succeeded; no need to retry */
     }
     else if( ++t->trackerIndex >= torrent->info.trackerCount )
@@ -268 +267 @@
     }
     else
     {
-        const tr_tracker_info * n = getCurrentAddressFromTorrent( t,
-                                                                  torrent );
+        const tr_tracker_info * n = getCurrentAddressFromTorrent( t, torrent );
         tr_ninf( t->name, _( "Trying tracker \"%s\"" ), n->announce );
         retry = TRUE;
     }
@@ -444 +442 @@
         if( bencLoaded )
             tr_bencFree( &benc );
     }
-    else
+    else if( responseCode )
     {
         /* %1$ld - http status code, such as 404
          * %2$s - human-readable explanation of the http status code */
@@ -457 +455 @@
 
     retry = updateAddresses( t, success );
 
-    /**
-    ***
-    **/
-
-    if( retry )
+    if( responseCode && retry )
         responseCode = 300;
 
-    if( 200 <= responseCode && responseCode <= 299 )
+    if( responseCode == 0 )
+    {
+        dbgmsg( t->name, "No response from tracker... retrying in two minutes." );
+        t->manualAnnounceAllowedAt = ~(time_t)0;
+        t->reannounceAt = time( NULL ) + t->randOffset + 120;
+    }
+    else if( 200 <= responseCode && responseCode <= 299 )
     {
         const int    interval = t->announceIntervalSec + t->randOffset;
         const time_t now = time ( NULL );
-        dbgmsg( t->name, "request succeeded. reannouncing in %d seconds",
-                interval );
+        dbgmsg( t->name, "request succeeded. reannouncing in %d seconds", interval );
 
         /* if the announce response was a superset of the scrape response,
            treat this as both a successful announce AND scrape. */
@@ -499 +498 @@
         const int interval = 5;
         dbgmsg( t->name, "got a redirect. retrying in %d seconds", interval );
         t->reannounceAt = time( NULL ) + interval;
-        t->manualAnnounceAllowedAt = time( NULL ) +
-                                     t->announceMinIntervalSec;
+        t->manualAnnounceAllowedAt = time( NULL ) + t->announceMinIntervalSec;
     }
     else if( 400 <= responseCode && responseCode <= 499 )
     {
@@ -524 +522 @@
     else
     {
         /* WTF did we get?? */
-        dbgmsg(
-            t->name,
-            "Invalid response from tracker... retrying in two minutes." );
+        dbgmsg( t->name, "Invalid response from tracker... retrying in two minutes." );
         t->manualAnnounceAllowedAt = ~(time_t)0;
         t->reannounceAt = time( NULL ) + t->randOffset + 120;
     }