Changeset 3226


Ignore:
Timestamp:
Sep 28, 2007, 4:14:19 PM (14 years ago)
Author:
charles
Message:

fix John_Clay's tracker assertion failure.

Location:
trunk/libtransmission
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/libtransmission/peer-msgs.c

    r3217 r3226  
    11111111**/
    11121112
    1113 #define MAX_DIFFS 50
     1113/* some peers give us error messages if we send
     1114   more than this many peers in a single pex message */
     1115#define MAX_PEX_DIFFS 50
    11141116
    11151117typedef struct
     
    11301132    PexDiffs * diffs = (PexDiffs *) userData;
    11311133    tr_pex * pex = (tr_pex *) vpex;
    1132     if( diffs->diffCount < MAX_DIFFS )
     1134    if( diffs->diffCount < MAX_PEX_DIFFS )
    11331135    {
    11341136        diffs->diffCount++;
     
    11431145    PexDiffs * diffs = (PexDiffs *) userData;
    11441146    tr_pex * pex = (tr_pex *) vpex;
    1145     if( diffs->diffCount < MAX_DIFFS )
     1147    if( diffs->diffCount < MAX_PEX_DIFFS )
    11461148    {
    11471149        diffs->diffCount++;
     
    11551157    PexDiffs * diffs = (PexDiffs *) userData;
    11561158    tr_pex * pex = (tr_pex *) vpex;
    1157     if( diffs->diffCount < MAX_DIFFS )
     1159    if( diffs->diffCount < MAX_PEX_DIFFS )
    11581160    {
    11591161        diffs->diffCount++;
  • trunk/libtransmission/tracker.c

    r3201 r3226  
    621621                        t->scrapeIntervalMsec = tmp->val.i * 1000;
    622622
    623                 assert( tr_ptrArrayFindSorted(t->scraping,tor,torrentCompare) ); /* FIXME This is the line that crashes for John_Clay */
    624623                tr_ptrArrayRemoveSorted( t->scraping, tor, torrentCompare );
    625624
    626                 assert( !tor->scrapeTimer );
     625                tr_timerFree( &tor->scrapeTimer );
    627626                tor->scrapeTimer = tr_timerNew( t->handle, onTorrentScrapeNow, tor, t->scrapeIntervalMsec );
    628627                tr_dbg( "Torrent '%s' scrape successful."
Note: See TracChangeset for help on using the changeset viewer.