Changeset 7769

Timestamp:

Jan 22, 2009, 4:20:30 AM (12 years ago)

Author:

charles

Message:

(trunk libT) well, maybe it's not a problem with sending the pex messages, but with parsing it...

File:

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

trunk/libtransmission/peer-msgs.c

@@ -1173 +1173 @@
     tr_peerIoReadUint8( msgs->peer->io, inbuf, &id );
     msgs->incoming.id = id;
+    dbgmsg( msgs, "msgs->incoming.id is now %d; msgs->incoming.length is %zu", id, (size_t)msgs->incoming.length );
 
     if( id == BT_PIECE )
@@ -1342 +1343 @@
     --msglen; /* id length */
 
+    dbgmsg( msgs, "got BT id %d, len %d, buffer size is %zu", (int)id, (int)msglen, inlen );
+
     if( inlen < msglen )
         return READ_LATER;
-
-    dbgmsg( msgs, "got BT id %d, len %d, buffer size is %zu", (int)id, (int)msglen, inlen );
 
     if( !messageLengthIsCorrect( msgs, id, msglen + 1 ) )
@@ -1607 +1608 @@
     const size_t      inlen = EVBUFFER_LENGTH( in );
 
+    dbgmsg( msgs, "canRead: inlen is %zu, msgs->state is %d", inlen, msgs->state );
+
     if( !inlen )
     {
@@ -1630 +1633 @@
             assert( 0 );
     }
+
+    dbgmsg( msgs, "canRead: ret is %d", (int)ret );
 
     /* log the raw data that was read */
@@ -1963 +1968 @@
             int bencLen;
             uint8_t * tmp, *walk;
+            tr_peerIo       * io  = msgs->peer->io;
             struct evbuffer * out = msgs->outMessages;
 
@@ -2045 +2051 @@
             /* write the pex message */
             benc = tr_bencSave( &val, &bencLen );
-            tr_peerIoWriteUint32( msgs->peer->io, out, 2 * sizeof( uint8_t ) + bencLen );
-            tr_peerIoWriteUint8 ( msgs->peer->io, out, BT_LTEP );
-            tr_peerIoWriteUint8 ( msgs->peer->io, out, msgs->ut_pex_id );
-            tr_peerIoWriteBytes ( msgs->peer->io, out, benc, bencLen );
+            tr_peerIoWriteUint32( io, out, 2 * sizeof( uint8_t ) + bencLen );
+            tr_peerIoWriteUint8 ( io, out, BT_LTEP );
+            tr_peerIoWriteUint8 ( io, out, msgs->ut_pex_id );
+            tr_peerIoWriteBytes ( io, out, benc, bencLen );
             pokeBatchPeriod( msgs, HIGH_PRIORITY_INTERVAL_SECS );
             dbgmsg( msgs, "sending a pex message; outMessage size is now %zu", EVBUFFER_LENGTH( out ) );
+            dbgOutMessageLen( msgs );
 
             tr_free( benc );