Changeset 3226

Timestamp:

Sep 28, 2007, 4:14:19 PM (15 years ago)

Author:

charles

Message:

fix John_Clay's tracker assertion failure.

Location:

trunk/libtransmission

Files:

• peer-msgs.c (modified) (4 diffs)
• tracker.c (modified) (1 diff)

trunk/libtransmission/peer-msgs.c

@@ -1111 +1111 @@
 **/
 
-#define MAX_DIFFS 50
+/* some peers give us error messages if we send
+   more than this many peers in a single pex message */
+#define MAX_PEX_DIFFS 50
 
 typedef struct
@@ -1130 +1132 @@
     PexDiffs * diffs = (PexDiffs *) userData;
     tr_pex * pex = (tr_pex *) vpex;
-    if( diffs->diffCount < MAX_DIFFS )
+    if( diffs->diffCount < MAX_PEX_DIFFS )
     {
         diffs->diffCount++;
@@ -1143 +1145 @@
     PexDiffs * diffs = (PexDiffs *) userData;
     tr_pex * pex = (tr_pex *) vpex;
-    if( diffs->diffCount < MAX_DIFFS )
+    if( diffs->diffCount < MAX_PEX_DIFFS )
     {
         diffs->diffCount++;
@@ -1155 +1157 @@
     PexDiffs * diffs = (PexDiffs *) userData;
     tr_pex * pex = (tr_pex *) vpex;
-    if( diffs->diffCount < MAX_DIFFS )
+    if( diffs->diffCount < MAX_PEX_DIFFS )
     {
         diffs->diffCount++;

trunk/libtransmission/tracker.c

@@ -621 +621 @@
                         t->scrapeIntervalMsec = tmp->val.i * 1000;
 
-                assert( tr_ptrArrayFindSorted(t->scraping,tor,torrentCompare) ); /* FIXME This is the line that crashes for John_Clay */
                 tr_ptrArrayRemoveSorted( t->scraping, tor, torrentCompare );
 
-                assert( !tor->scrapeTimer );
+                tr_timerFree( &tor->scrapeTimer );
                 tor->scrapeTimer = tr_timerNew( t->handle, onTorrentScrapeNow, tor, t->scrapeIntervalMsec );
                 tr_dbg( "Torrent '%s' scrape successful."