Changeset 3095

Timestamp:

Sep 17, 2007, 1:09:48 PM (15 years ago)

Author:

charles

Message:

fix a couple of bugs I introduced yesterday.

Location:

branches/encryption/libtransmission

Files:

• peer-mgr.c (modified) (4 diffs)
• peer-msgs.c (modified) (10 diffs)

branches/encryption/libtransmission/peer-mgr.c

@@ -347 +347 @@
 #if 0
 fprintf (stderr, "new pool: ");
-for (i=0; i<15 && i<poolSize; ++i ) fprintf (stderr, "%d, ", pool[i] );
+for (i=0; i<15 && i<(int)poolSize; ++i ) fprintf (stderr, "%d, ", (int)pool[i] );
 fprintf (stderr, "\n");
 #endif
@@ -362 +362 @@
     uint32_t pieceCount;
     uint32_t * pieces;
-    uint64_t *req, *unreq, *ret;
+    uint64_t *req, *unreq, *ret, *walk;
     int reqCount, unreqCount;
     const tr_torrent * tor = t->tor;
@@ -388 +388 @@
     }
 
-fprintf( stderr, "REFILL refillPulse for {%s} reqCount is %d\n", tor->info.name, (int)reqCount );
-fprintf( stderr, "REFILL refillPulse for {%s} unreqCount is %d\n", tor->info.name, (int)unreqCount );
-    ret = tr_new( uint64_t, unreqCount + reqCount );
-    memcpy( ret, unreq, sizeof(uint64_t) * unreqCount );
-    memcpy( ret, req, sizeof(uint64_t) * reqCount );
-    *setmeCount = unreqCount + reqCount;
+fprintf( stderr, "REFILL refillPulse for {%s} reqCount is %d, unreqCount is %d\n", tor->info.name, (int)reqCount, (int)unreqCount );
+    ret = walk = tr_new( uint64_t, unreqCount + reqCount );
+    memcpy( walk, unreq, sizeof(uint64_t) * unreqCount );
+    walk += unreqCount;
+    memcpy( walk, req, sizeof(uint64_t) * reqCount );
+    walk += reqCount;
+    assert( ( walk - ret ) == ( unreqCount + reqCount ) );
+    *setmeCount = walk - ret;
 
     tr_free( req );
@@ -651 +653 @@
                   int              pexCount )
 {
-    int i;
-    const tr_pex * walk = pex;
     Torrent * t = getExistingTorrent( manager, torrentHash );
-    for( i=0; i<pexCount; ++i )
+    const tr_pex * end = pex + pexCount;
+    while( pex != end )
     {
         int isNew;
-        tr_peer * peer = getPeer( t, &walk->in_addr, &isNew );
+        tr_peer * peer = getPeer( t, &pex->in_addr, &isNew );
         if( isNew ) {
-            peer->port = walk->port;
+            peer->port = pex->port;
             peer->from = from;
             maybeConnect( manager, t, peer );
         }
+        ++pex;
     }
 }

branches/encryption/libtransmission/peer-msgs.c

@@ -231 +231 @@
     const uint32_t len = sizeof(uint8_t);
     const uint8_t bt_msgid = weAreInterested ? BT_INTERESTED : BT_NOT_INTERESTED;
+const time_t now = time( NULL );
 
     assert( msgs != NULL );
@@ -236 +237 @@
 
     msgs->info->clientIsInterested = weAreInterested;
-    fprintf( stderr, "peer %p: sending an %s message\n", msgs, (weAreInterested ? "INTERESTED" : "NOT_INTERESTED") );
+    fprintf( stderr, "peer %p: sending an %s message at %s\n", msgs, (weAreInterested ? "INTERESTED" : "NOT_INTERESTED"), ctime(&now) );
     tr_peerIoWriteUint32( msgs->io, msgs->outMessages, len );
     tr_peerIoWriteBytes( msgs->io, msgs->outMessages, &bt_msgid, 1 );
@@ -257 +258 @@
     assert( msgs->info != NULL );
     assert( choke==0 || choke==1 );
+const time_t now = time( NULL );
 
     if( msgs->info->peerIsChoked != choke )
@@ -270 +272 @@
         }
 
-        fprintf( stderr, "peer %p: sending a %s message\n", msgs, (choke ? "CHOKE" : "UNCHOKE") );
+        fprintf( stderr, "peer %p: sending a %s message at %s\n", msgs, (choke ? "CHOKE" : "UNCHOKE"), ctime(&now) );
         tr_peerIoWriteUint32( msgs->io, msgs->outMessages, len );
         tr_peerIoWriteBytes( msgs->io, msgs->outMessages, &bt_msgid, 1 );
@@ -530 +532 @@
     uint32_t ui32;
     uint32_t msglen = msgs->incomingMessageLength;
+const time_t now = time( NULL );
 
     if( EVBUFFER_LENGTH(inbuf) < msglen )
@@ -543 +546 @@
         case BT_CHOKE:
             assert( msglen == 0 );
-            fprintf( stderr, "w00t peer-msgs %p sent us a BT_CHOKE\n", msgs );
+            fprintf( stderr, "w00t peer-msgs %p sent us a BT_CHOKE at %s\n", msgs, ctime(&now) );
             msgs->info->clientIsChoked = 1;
             tr_list_foreach( msgs->peerAskedFor, tr_free );
             tr_list_free( &msgs->peerAskedFor );
-            /* FIXME: unmark anything we'd requested from them... */
+            tr_list_foreach( msgs->clientAskedFor, tr_free );
+            tr_list_free( &msgs->clientAskedFor );
             break;
 
         case BT_UNCHOKE:
             assert( msglen == 0 );
-            fprintf( stderr, "w00t peer-msgs %p sent us a BT_UNCHOKE\n", msgs );
+            fprintf( stderr, "w00t peer-msgs %p sent us a BT_UNCHOKE at %s\n", msgs, ctime(&now) );
             msgs->info->clientIsChoked = 0;
             fireNeedReq( msgs );
@@ -559 +563 @@
         case BT_INTERESTED:
             assert( msglen == 0 );
-            fprintf( stderr, "w00t peer-msgs %p sent us a BT_INTERESTED\n", msgs );
+            fprintf( stderr, "w00t peer-msgs %p sent us a BT_INTERESTED at %s\n", msgs, ctime(&now) );
             msgs->info->peerIsInterested = 1;
             break;
@@ -565 +569 @@
         case BT_NOT_INTERESTED:
             assert( msglen == 0 );
-            fprintf( stderr, "w00t peer-msgs %p sent us a BT_NOT_INTERESTED\n", msgs );
+            fprintf( stderr, "w00t peer-msgs %p sent us a BT_NOT_INTERESTED at %s\n", msgs, ctime(&now) );
             msgs->info->peerIsInterested = 0;
             break;
@@ -736 +740 @@
     const int block = _tr_block( tor, index, offset );
     struct peer_request key, *req;
+    const time_t now = time( NULL );
 
     /**
@@ -746 +751 @@
     req = (struct peer_request*) tr_list_remove( &msgs->clientAskedFor, &key,
                                                  peer_request_compare );
-    fprintf( stderr, "w00t got a block from %p. turnaround time for this block was %d seconds\n",
-                     msgs, (int)(time(NULL) - req->time_requested) );
+    fprintf( stderr, "w00t got a block from %p. turnaround time for this block was %d seconds... at %s\n",
+                     msgs, (int)(time(NULL) - req->time_requested), ctime(&now) );
     if( req == NULL ) {
         gotUnwantedBlock( msgs, index, offset, length );