Changeset 5647 for trunk/libtransmission/tracker.c

Timestamp:

Apr 19, 2008, 3:07:59 PM (14 years ago)

Author:

charles

Message:

#890: be smarter about noticing seeds from tracker & pex

File:

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

trunk/libtransmission/tracker.c

@@ -222 +222 @@
 ***/
 
-static const tr_tracker_event emptyEvent = { 0, NULL, NULL, NULL, 0 };
+static const tr_tracker_event emptyEvent = { 0, NULL, NULL, NULL, 0, 0 };
 
 static void
@@ -257 +257 @@
 
 static void
-publishNewPeers( tr_tracker * t, int count, uint8_t * peers )
+publishNewPeers( tr_tracker * t, int allAreSeeds, void * compact, int compactLen )
 {
     tr_tracker_event event = emptyEvent;
     event.hash = t->hash;
     event.messageType = TR_TRACKER_PEERS;
-    event.peerCount = count;
-    event.peerCompact = peers;
-    tr_ndbg( t->name, "Torrent got %d new peers", count );
-    if( count )
+    event.allAreSeeds = allAreSeeds;
+    event.compact = compact;
+    event.compactLen = compactLen;
+    if( compactLen )
         tr_publisherPublish( t->publisher, t, &event );
 }
@@ -361 +361 @@
 /* Convert to compact form */
 static uint8_t *
-parseOldPeers( tr_benc * bePeers, int * setmePeerCount )
+parseOldPeers( tr_benc * bePeers, size_t * byteCount )
 {
     int i;
@@ -394 +394 @@
     }
 
-    *setmePeerCount = peerCount;
+    *byteCount = peerCount * 6;
     return compact;
 }
@@ -433 +433 @@
         {
             tr_benc * tmp;
+            int incomplete = -1;
 
             if(( tmp = tr_bencDictFind( &benc, "failure reason" ))) {
@@ -461 +462 @@
 
             if(( tmp = tr_bencDictFind( &benc, "incomplete" )))
-                t->leecherCount = tmp->val.i;
+                t->leecherCount = incomplete = tmp->val.i;
 
             if(( tmp = tr_bencDictFind( &benc, "peers" )))
             {
-                int peerCount = 0;
-                uint8_t * peerCompact = NULL;
-
-                if( tmp->type == TYPE_LIST ) /* original protocol */
+                const int allAreSeeds = incomplete == 0;
+
+                if( tmp->type == TYPE_STR ) /* "compact" extension */
                 {
-                    if( tmp->val.l.count > 0 )
-                        peerCompact = parseOldPeers( tmp, &peerCount );
+                    publishNewPeers( t, allAreSeeds, tmp->val.s.s, tmp->val.s.i );
                 }
-                else if( tmp->type == TYPE_STR ) /* "compact" extension */
+                else if( tmp->type == TYPE_LIST ) /* original protocol */
                 {
-                    if( tmp->val.s.i >= 6 )
-                    {
-                        peerCount = tmp->val.s.i / 6;
-                        peerCompact = tr_new( uint8_t, tmp->val.s.i );
-                        memcpy( peerCompact, tmp->val.s.s, tmp->val.s.i );
-                    }
+                    size_t byteCount = 0;
+                    uint8_t * compact = parseOldPeers( tmp, &byteCount );
+                    publishNewPeers( t, allAreSeeds, compact, byteCount );
+                    tr_free( compact );
                 }
-
-                publishNewPeers( t, peerCount, peerCompact );
-                tr_free( peerCompact );
             }
         }