Ignore:
Timestamp:
Apr 10, 2009, 5:34:25 PM (13 years ago)
Author:
charles
Message:

(1.5x libT) various backports for 1.52:
(1) recognize Aria2 as a client
(2) remove jhujhiti's tr_suspectAddress(), since he removed it from trunka
(3) on Mac, better detection of where the Web UI files are located
(4) reintroduce the web task queue
(5) various minor formatting changes to reduce the diffs between 1.52 and trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/1.5x/libtransmission/tracker.c

    r7897 r8204  
    260260        memcpy( &addr.addr.addr4, compactWalk, 4 );
    261261        memcpy( &port, compactWalk + 4, 2 );
    262         tr_suspectAddress( &addr, "compact" );
    263262       
    264263        memcpy( walk, &addr, sizeof( addr ) );
     
    293292        memcpy( &port, compactWalk + 16, 2 );
    294293        compactWalk += 18;
    295         tr_suspectAddress( &addr, "compact6" );
    296294       
    297295        memcpy( walk, &addr, sizeof( addr ) );
     
    347345    const int peerCount = bePeers->val.l.count;
    348346
    349     assert( bePeers->type == TYPE_LIST );
     347    assert( tr_bencIsList( bePeers ) );
    350348
    351349    array = tr_new( uint8_t, peerCount * ( sizeof( tr_address ) + 2 ) );
     
    369367
    370368        memcpy( walk, &addr, sizeof( tr_address ) );
    371         tr_suspectAddress( &addr, "old tracker" );
    372369        port = htons( itmp );
    373370        memcpy( walk + sizeof( tr_address ), &port, 2 );
     
    485482                const int allAreSeeds = incomplete == 0;
    486483
    487                 if( tmp->type == TYPE_STR ) /* "compact" extension */
     484                if( tr_bencIsString( tmp ) ) /* "compact" extension */
    488485                {
    489486                    publishNewPeersCompact( t, allAreSeeds, tmp->val.s.s,
    490487                                            tmp->val.s.i );
    491488                }
    492                 else if( tmp->type == TYPE_LIST ) /* original protocol */
     489                else if( tr_bencIsList( tmp ) ) /* original protocol */
    493490                {
    494491                    size_t    byteCount = 0;
     
    503500                const int allAreSeeds = incomplete == 0;
    504501               
    505                 if( tmp->type == TYPE_STR ) /* "compact" extension */
     502                if( tr_bencIsString( tmp ) ) /* "compact" extension */
    506503                {
    507504                    publishNewPeersCompact6( t, allAreSeeds, tmp->val.s.s,
Note: See TracChangeset for help on using the changeset viewer.