Changeset 2452

Timestamp:

Jul 21, 2007, 5:35:47 PM (15 years ago)

Author:

charles

Message:

fix looooong-standing bug that choked tracker connections

Location:

trunk/libtransmission

Files:

• fdlimit.c (modified) (1 diff)
• torrent.c (modified) (1 diff)

trunk/libtransmission/fdlimit.c

@@ -330 +330 @@
 
     tr_lockLock( &gFd->lock );
-    if( ( priority && gFd->reserved < TR_RESERVED_FDS ) ||
-        ( !priority && gFd->normal < gFd->normalMax ) )
-    {
+
+    if( priority && gFd->reserved >= TR_RESERVED_FDS )
+        priority = FALSE;
+
+    if( priority || ( gFd->normal < gFd->normalMax ) )
        if( ( s = socket( AF_INET, type, 0 ) ) < 0 )
-       {
            tr_err( "Could not create socket (%s)", strerror( errno ) );
-       }
-    }
+
     if( s > -1 )
     {

trunk/libtransmission/torrent.c

@@ -970 +970 @@
     }
 
+    h->torrentCount--;
+
+    fprintf(stderr, "closing torrent %s... %d torrents left",
+            tor->info.name, h->torrentCount );
+
     tr_free( tor );
-
-    h->torrentCount--;
 
     tr_sharedUnlock( h->shared );