Changeset 5602

Timestamp:

Apr 12, 2008, 11:01:40 PM (14 years ago)

Author:

charles

Message:

#870: follow PEX conventions agreed upon by Azureus and uTorrent

File:

• trunk/libtransmission/peer-msgs.c (modified) (7 diffs)

trunk/libtransmission/peer-msgs.c

@@ -66 +66 @@
     KEEPALIVE_INTERVAL_SECS = 90,
 
-    PEX_INTERVAL            = (60 * 1000), /* msec between sendPex() calls */
+    PEX_INTERVAL            = (90 * 1000), /* msec between sendPex() calls */
     PEER_PULSE_INTERVAL     = (100),       /* msec between pulse() calls */
     RATE_PULSE_INTERVAL     = (250),       /* msec between ratePulse() calls */
@@ -1754 +1754 @@
 
 /* some peers give us error messages if we send
-   more than this many peers in a single pex message */
-#define MAX_PEX_DIFFS 200
+   more than this many peers in a single pex message
+   http://wiki.theory.org/BitTorrentPeerExchangeConventions */
+#define MAX_PEX_ADDED 50
+#define MAX_PEX_DROPPED 50
 
 typedef struct
@@ -1765 +1767 @@
     int droppedCount;
     int elementCount;
-    int diffCount;
 }
 PexDiffs;
@@ -1772 +1773 @@
 pexAddedCb( void * vpex, void * userData )
 {
-    PexDiffs * diffs = (PexDiffs *) userData;
-    tr_pex * pex = (tr_pex *) vpex;
-    if( diffs->diffCount < MAX_PEX_DIFFS )
-    {
-        diffs->diffCount++;
+    PexDiffs * diffs = userData;
+    tr_pex * pex = vpex;
+    if( diffs->addedCount < MAX_PEX_ADDED )
+    {
         diffs->added[diffs->addedCount++] = *pex;
         diffs->elements[diffs->elementCount++] = *pex;
@@ -1783 +1783 @@
 
 static void
-pexRemovedCb( void * vpex, void * userData )
-{
-    PexDiffs * diffs = (PexDiffs *) userData;
-    tr_pex * pex = (tr_pex *) vpex;
-    if( diffs->diffCount < MAX_PEX_DIFFS )
-    {
-        diffs->diffCount++;
+pexDroppedCb( void * vpex, void * userData )
+{
+    PexDiffs * diffs = userData;
+    tr_pex * pex = vpex;
+    if( diffs->droppedCount < MAX_PEX_DROPPED )
+    {
         diffs->dropped[diffs->droppedCount++] = *pex;
     }
@@ -1797 +1796 @@
 pexElementCb( void * vpex, void * userData )
 {
-    PexDiffs * diffs = (PexDiffs *) userData;
-    tr_pex * pex = (tr_pex *) vpex;
-    if( diffs->diffCount < MAX_PEX_DIFFS )
-    {
-        diffs->diffCount++;
-        diffs->elements[diffs->elementCount++] = *pex;
-    }
+    PexDiffs * diffs = userData;
+    tr_pex * pex = vpex;
+    diffs->elements[diffs->elementCount++] = *pex;
 }
 
@@ -1827 +1822 @@
         diffs.elements = tr_new( tr_pex, newCount + msgs->pexCount );
         diffs.elementCount = 0;
-        diffs.diffCount = 0;
         tr_set_compare( msgs->pex, msgs->pexCount,
                         newPex, newCount,
                         tr_pexCompare, sizeof(tr_pex),
-                        pexRemovedCb, pexAddedCb, pexElementCb, &diffs );
+                        pexDroppedCb, pexAddedCb, pexElementCb, &diffs );
         dbgmsg( msgs, "pex: old peer count %d, new peer count %d, added %d, removed %d", msgs->pexCount, newCount, diffs.addedCount, diffs.droppedCount );