Changeset 8583 for trunk/libtransmission/tracker.c

Timestamp:

Jun 1, 2009, 6:12:36 PM (13 years ago)

Author:

charles

Message:

(trunk libT) tracker.c was using tr_benc's private fields

File:

• trunk/libtransmission/tracker.c (modified) (11 diffs)

trunk/libtransmission/tracker.c

@@ -228 +228 @@
 publishNewPeers( tr_tracker * t,
                  int          allAreSeeds,
-                 void *       compact,
+                 const void * compact,
                  int          compactLen )
 {
@@ -244 +244 @@
 publishNewPeersCompact( tr_tracker * t,
                         int          allAreSeeds,
-                        void       * compact,
+                        const void * compact,
                         int          compactLen )
 {
     int i;
-    uint8_t *array, *walk, *compactWalk;
+    const uint8_t *compactWalk;
+    uint8_t *array, *walk;
     const int peerCount = compactLen / 6;
     const int arrayLen = peerCount * ( sizeof( tr_address ) + 2 );
@@ -275 +276 @@
 publishNewPeersCompact6( tr_tracker * t,
                          int          allAreSeeds,
-                         void       * compact,
+                         const void * compact,
                          int          compactLen )
 {
     int i;
-    uint8_t *array, *walk, *compactWalk;
+    const uint8_t *compactWalk;
+    uint8_t *array, *walk;
     const int peerCount = compactLen / 18;
     const int arrayLen = peerCount * ( sizeof( tr_address ) + 2 );
@@ -433 +435 @@
             int          incomplete = -1;
             const char * str;
+            const uint8_t * raw;
+            size_t rawlen;
 
             success = TRUE;
             t->retryAnnounceIntervalSec = FIRST_SCRAPE_RETRY_INTERVAL_SEC;
 
-            if( ( tr_bencDictFindStr( &benc, "failure reason", &str ) ) )
+            if( tr_bencDictFindStr( &benc, "failure reason", &str ) )
             {
                 publishMessage( t, str, TR_TRACKER_ERROR );
@@ -443 +447 @@
             }
 
-            if( ( tr_bencDictFindStr( &benc, "warning message", &str ) ) )
+            if( tr_bencDictFindStr( &benc, "warning message", &str ) )
                 publishWarning( t, str );
 
-            if( ( tr_bencDictFindInt( &benc, "interval", &i ) ) )
+            if( tr_bencDictFindInt( &benc, "interval", &i ) )
             {
                 dbgmsg( t->name, "setting interval to %d", (int)i );
@@ -452 +456 @@
             }
 
-            if( ( tr_bencDictFindInt( &benc, "min interval", &i ) ) )
+            if( tr_bencDictFindInt( &benc, "min interval", &i ) )
             {
                 dbgmsg( t->name, "setting min interval to %d", (int)i );
@@ -458 +462 @@
             }
 
-            if( ( tr_bencDictFindStr( &benc, "tracker id", &str ) ) )
+            if( tr_bencDictFindStr( &benc, "tracker id", &str ) )
                 t->trackerID = tr_strdup( str );
 
-            if( ( tr_bencDictFindInt( &benc, "complete", &i ) ) )
+            if( tr_bencDictFindInt( &benc, "complete", &i ) )
             {
                 ++scrapeFields;
@@ -467 +471 @@
             }
 
-            if( ( tr_bencDictFindInt( &benc, "incomplete", &i ) ) )
+            if( tr_bencDictFindInt( &benc, "incomplete", &i ) )
             {
                 ++scrapeFields;
@@ -473 +477 @@
             }
 
-            if( ( tr_bencDictFindInt( &benc, "downloaded", &i ) ) )
+            if( tr_bencDictFindInt( &benc, "downloaded", &i ) )
             {
                 ++scrapeFields;
@@ -479 +483 @@
             }
 
-            if( ( tmp = tr_bencDictFind( &benc, "peers" ) ) )
+            if( tr_bencDictFindRaw( &benc, "peers", &raw, &rawlen ) )
             {
+                /* "compact" extension */
                 const int allAreSeeds = incomplete == 0;
-
-                if( tr_bencIsString( tmp ) ) /* "compact" extension */
-                {
-                    publishNewPeersCompact( t, allAreSeeds, tmp->val.s.s,
-                                            tmp->val.s.i );
-                }
-                else if( tr_bencIsList( tmp ) ) /* original protocol */
-                {
-                    size_t    byteCount = 0;
-                    uint8_t * array = parseOldPeers( tmp, &byteCount );
-                    publishNewPeers( t, allAreSeeds, array, byteCount );
-                    tr_free( array );
-                }
+                publishNewPeersCompact( t, allAreSeeds, raw, rawlen );
             }
-            
-            if( ( tmp = tr_bencDictFind( &benc, "peers6" ) ) )
+            else if( tr_bencDictFindList( &benc, "peers", &tmp ) )
             {
+                /* original version of peers */
                 const int allAreSeeds = incomplete == 0;
-                
-                if( tr_bencIsString( tmp ) ) /* "compact" extension */
-                {
-                    publishNewPeersCompact6( t, allAreSeeds, tmp->val.s.s,
-                                             tmp->val.s.i );
-                }
+                size_t byteCount = 0;
+                uint8_t * array = parseOldPeers( tmp, &byteCount );
+                publishNewPeers( t, allAreSeeds, array, byteCount );
+                tr_free( array );
+            }
+
+            if( tr_bencDictFindRaw( &benc, "peers6", &raw, &rawlen ) )
+            {
+                /* "compact" extension */
+                const int allAreSeeds = incomplete == 0;
+                publishNewPeersCompact6( t, allAreSeeds, raw, rawlen );
             }
         }
@@ -625 +623 @@
         if( bencLoaded && tr_bencDictFindDict( &benc, "files", &files ) )
         {
-            size_t i;
-            for( i = 0; i < files->val.l.count; i += 2 )
+            const char * key;
+            tr_benc * val;
+            int i = 0;
+            while( tr_bencDictChild( files, i++, &key, &val ))
             {
-                int64_t        itmp;
-                const uint8_t* hash =
-                    (const uint8_t*) files->val.l.vals[i].val.s.s;
-                tr_benc *      flags;
-                tr_benc *      tordict = &files->val.l.vals[i + 1];
-                if( memcmp( t->hash, hash, SHA_DIGEST_LENGTH ) )
+                int64_t intVal;
+                tr_benc * flags;
+
+                if( memcmp( t->hash, key, SHA_DIGEST_LENGTH ) )
                     continue;
 
                 publishErrorClear( t );
 
-                if( ( tr_bencDictFindInt( tordict, "complete", &itmp ) ) )
-                    t->seederCount = itmp;
-
-                if( ( tr_bencDictFindInt( tordict, "incomplete", &itmp ) ) )
-                    t->leecherCount = itmp;
-
-                if( ( tr_bencDictFindInt( tordict, "downloaded", &itmp ) ) )
-                    t->timesDownloaded = itmp;
-
-                if( ( tr_bencDictFindInt( tordict, "downloaders", &itmp ) ) )
-                    t->downloaderCount = itmp;
-
-                if( tr_bencDictFindDict( tordict, "flags", &flags ) )
-                    if( ( tr_bencDictFindInt( flags, "min_request_interval", &itmp ) ) )
-                        t->scrapeIntervalSec = itmp;
+                if( ( tr_bencDictFindInt( val, "complete", &intVal ) ) )
+                    t->seederCount = intVal;
+
+                if( ( tr_bencDictFindInt( val, "incomplete", &intVal ) ) )
+                    t->leecherCount = intVal;
+
+                if( ( tr_bencDictFindInt( val, "downloaded", &intVal ) ) )
+                    t->timesDownloaded = intVal;
+
+                if( ( tr_bencDictFindInt( val, "downloaders", &intVal ) ) )
+                    t->downloaderCount = intVal;
+
+                if( tr_bencDictFindDict( val, "flags", &flags ) )
+                    if( ( tr_bencDictFindInt( flags, "min_request_interval", &intVal ) ) )
+                        t->scrapeIntervalSec = intVal;
 
                 /* as per ticket #1045, safeguard against trackers returning