Changeset 6548

Timestamp:

Aug 16, 2008, 5:11:28 AM (15 years ago)

Author:

charles

Message:

(libT) route all outbound peer protocol messages through the outMessages buffer, to ensure that they're sent in sequence. previously the outbound pex message wasn't queued in this way.

File:

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

trunk/libtransmission/peer-msgs.c

@@ -389 +389 @@
     tr_peerIoWriteUint32( io, out, req->length );
     pokeBatchPeriod( msgs, HIGH_PRIORITY_INTERVAL_SECS );
+    dbgmsg( msgs, "outMessage size is now %d", (int)EVBUFFER_LENGTH(out) );
 }
 
@@ -404 +405 @@
     tr_peerIoWriteUint32( io, out, req->length );
     pokeBatchPeriod( msgs, IMMEDIATE_PRIORITY_INTERVAL_SECS );
+    dbgmsg( msgs, "outMessage size is now %d", (int)EVBUFFER_LENGTH(out) );
 }
 
@@ -417 +419 @@
     tr_peerIoWriteUint32( io, out, index );
     pokeBatchPeriod( msgs, LOW_PRIORITY_INTERVAL_SECS );
+    dbgmsg( msgs, "outMessage size is now %d", (int)EVBUFFER_LENGTH(out) );
 }
 
@@ -429 +432 @@
     tr_peerIoWriteUint8 ( io, out, choke ? BT_CHOKE : BT_UNCHOKE );
     pokeBatchPeriod( msgs, IMMEDIATE_PRIORITY_INTERVAL_SECS );
+    dbgmsg( msgs, "outMessage size is now %d", (int)EVBUFFER_LENGTH(out) );
 }
 
@@ -552 +556 @@
 sendInterest( tr_peermsgs * msgs, int weAreInterested )
 {
+    struct evbuffer * out = msgs->outMessages;
+
     assert( msgs );
     assert( weAreInterested==0 || weAreInterested==1 );
 
     msgs->info->clientIsInterested = weAreInterested;
-    dbgmsg( msgs, "Sending %s",
-            weAreInterested ? "Interested" : "Not Interested");
-
-    tr_peerIoWriteUint32( msgs->io, msgs->outMessages, sizeof(uint8_t) );
-    tr_peerIoWriteUint8 ( msgs->io, msgs->outMessages,
-                   weAreInterested ? BT_INTERESTED : BT_NOT_INTERESTED );
+    dbgmsg( msgs, "Sending %s", weAreInterested ? "Interested" : "Not Interested");
+    tr_peerIoWriteUint32( msgs->io, out, sizeof(uint8_t) );
+    tr_peerIoWriteUint8 ( msgs->io, out, weAreInterested ? BT_INTERESTED : BT_NOT_INTERESTED );
     pokeBatchPeriod( msgs, HIGH_PRIORITY_INTERVAL_SECS );
+    dbgmsg( msgs, "outMessage size is now %d", (int)EVBUFFER_LENGTH(out) );
 }
 
@@ -656 +660 @@
     if( tr_peerIoSupportsFEXT( msgs->io ) )
     {
+        struct evbuffer * out = msgs->outMessages;
         const uint32_t len = sizeof(uint8_t) + 3 * sizeof(uint32_t);
-        tr_peerIoWriteUint32( msgs->io, msgs->outMessages, len );
-        tr_peerIoWriteUint8( msgs->io, msgs->outMessages, BT_REJECT );
-        tr_peerIoWriteUint32( msgs->io, msgs->outMessages, pieceIndex );
-        tr_peerIoWriteUint32( msgs->io, msgs->outMessages, offset );
-        tr_peerIoWriteUint32( msgs->io, msgs->outMessages, length );
+        dbgmsg( msgs, "sending fast reject %u:%u->%u", pieceIndex, offset, length );
+        tr_peerIoWriteUint32( msgs->io, out, len );
+        tr_peerIoWriteUint8( msgs->io, out, BT_REJECT );
+        tr_peerIoWriteUint32( msgs->io, out, pieceIndex );
+        tr_peerIoWriteUint32( msgs->io, out, offset );
+        tr_peerIoWriteUint32( msgs->io, out, length );
         pokeBatchPeriod( msgs, LOW_PRIORITY_INTERVAL_SECS );
+        dbgmsg( msgs, "outMessage size is now %d", (int)EVBUFFER_LENGTH(out) );
     }
 }
@@ -689 +696 @@
     if( tr_peerIoSupportsFEXT( msgs->io ) )
     {
-        tr_peerIoWriteUint32( msgs->io, msgs->outMessages, sizeof(uint8_t) + sizeof(uint32_t) );
-        tr_peerIoWriteUint8( msgs->io, msgs->outMessages, BT_ALLOWED_FAST );
-        tr_peerIoWriteUint32( msgs->io, msgs->outMessages, pieceIndex );
+        struct evbuffer * out = msgs->outMessages;
+        dbgmsg( msgs, "sending fast allowed" );
+        tr_peerIoWriteUint32( msgs->io, out,  sizeof(uint8_t) + sizeof(uint32_t) );
+        tr_peerIoWriteUint8( msgs->io, out, BT_ALLOWED_FAST );
+        tr_peerIoWriteUint32( msgs->io, out, pieceIndex );
         pokeBatchPeriod( msgs, LOW_PRIORITY_INTERVAL_SECS );
+        dbgmsg( msgs, "outMessage size is now %d", (int)EVBUFFER_LENGTH(out) );
     }
 }
@@ -925 +935 @@
     int len;
     int pex;
-    struct evbuffer * outbuf;
+    struct evbuffer * out = msgs->outMessages;
 
     if( msgs->clientSentLtepHandshake )
         return;
 
-    outbuf = evbuffer_new( );
     dbgmsg( msgs, "sending an ltep handshake" );
     msgs->clientSentLtepHandshake = 1;
@@ -951 +960 @@
     buf = tr_bencSave( &val, &len );
 
-    tr_peerIoWriteUint32( msgs->io, outbuf, 2*sizeof(uint8_t) + len );
-    tr_peerIoWriteUint8 ( msgs->io, outbuf, BT_LTEP );
-    tr_peerIoWriteUint8 ( msgs->io, outbuf, LTEP_HANDSHAKE );
-    tr_peerIoWriteBytes ( msgs->io, outbuf, buf, len );
-
-    tr_peerIoWriteBuf( msgs->io, outbuf );
-
-    dbgmsg( msgs, "here is the ltep handshake we sent [%*.*s]", len, len, buf );
+    tr_peerIoWriteUint32( msgs->io, out, 2*sizeof(uint8_t) + len );
+    tr_peerIoWriteUint8 ( msgs->io, out, BT_LTEP );
+    tr_peerIoWriteUint8 ( msgs->io, out, LTEP_HANDSHAKE );
+    tr_peerIoWriteBytes ( msgs->io, out, buf, len );
+    pokeBatchPeriod( msgs, IMMEDIATE_PRIORITY_INTERVAL_SECS );
+    dbgmsg( msgs, "outMessage size is now %d", (int)EVBUFFER_LENGTH(out) );
 
     /* cleanup */
     tr_bencFree( &val );
     tr_free( buf );
-    evbuffer_free( outbuf );
 }
 
@@ -1753 +1759 @@
     tr_peerIoWriteBytes ( msgs->io, out, bitfield->bits, bitfield->byteCount );
     pokeBatchPeriod( msgs, IMMEDIATE_PRIORITY_INTERVAL_SECS );
+    dbgmsg( msgs, "outMessage size is now %d", (int)EVBUFFER_LENGTH(out) );
 }
 
@@ -1820 +1827 @@
         char * benc;
         int bencLen;
+        struct evbuffer * out = msgs->outMessages;
 
         /* build the diffs */
@@ -1872 +1880 @@
         /* write the pex message */
         benc = tr_bencSave( &val, &bencLen );
-        tr_peerIoWriteUint32( msgs->io, msgs->outMessages, 2*sizeof(uint8_t) + bencLen );
-        tr_peerIoWriteUint8 ( msgs->io, msgs->outMessages, BT_LTEP );
-        tr_peerIoWriteUint8 ( msgs->io, msgs->outMessages, msgs->ut_pex_id );
-        tr_peerIoWriteBytes ( msgs->io, msgs->outMessages, benc, bencLen );
+        tr_peerIoWriteUint32( msgs->io, out, 2*sizeof(uint8_t) + bencLen );
+        tr_peerIoWriteUint8 ( msgs->io, out, BT_LTEP );
+        tr_peerIoWriteUint8 ( msgs->io, out, msgs->ut_pex_id );
+        tr_peerIoWriteBytes ( msgs->io, out, benc, bencLen );
         pokeBatchPeriod( msgs, IMMEDIATE_PRIORITY_INTERVAL_SECS );
+        dbgmsg( msgs, "outMessage size is now %d", (int)EVBUFFER_LENGTH(out) );
 
         /* cleanup */