Changeset 7456

Timestamp:

Dec 22, 2008, 12:52:44 AM (12 years ago)

Author:

charles

Message:

(trunk libT) minor cleanups found while diffing for backport to 1.4x in r7455

Location:

trunk/libtransmission

Files:

• handshake.h (modified) (2 diffs)
• peer-common.h (modified) (1 diff)
• peer-io.c (modified) (1 diff)
• peer-mgr.c (modified) (22 diffs)
• peer-msgs.c (modified) (14 diffs)
• peer-msgs.h (modified) (1 diff)
• transmission.h (modified) (1 diff)

trunk/libtransmission/handshake.h

@@ -19 +19 @@
 
 #include "transmission.h"
+#include "net.h"
 
-struct tr_address;
 struct tr_peerIo;
 typedef struct tr_handshake tr_handshake;
@@ -36 +36 @@
                                         void *             doneUserData );
 
-const struct tr_address *
-                      tr_handshakeGetAddr( const struct tr_handshake  * handshake,
+const tr_address *     tr_handshakeGetAddr( const struct tr_handshake  * handshake,
                                             tr_port                    * port );
 

trunk/libtransmission/peer-common.h

@@ -61 +61 @@
     float            progress;     /* for PEER_PROGRESS */
     int              err;          /* errno for GOT_ERROR */
-    int              wasPieceData; /* for GOT_DATA */
+    tr_bool          wasPieceData; /* for GOT_DATA */
     tr_bool          uploadOnly;   /* for UPLOAD_ONLY */
 }

trunk/libtransmission/peer-io.c

@@ -466 +466 @@
 
 const char*
-tr_peerIoAddrStr( const tr_address * addr,
-                  tr_port            port )
+tr_peerIoAddrStr( const tr_address * addr, tr_port port )
 {
     static char buf[512];

trunk/libtransmission/peer-mgr.c

@@ -199 +199 @@
 
 static int
-handshakeCompareToAddr( const void * va,
-                        const void * vb )
+handshakeCompareToAddr( const void * va, const void * vb )
 {
     const tr_handshake * a = va;
@@ -208 +207 @@
 
 static int
-handshakeCompare( const void * a,
-                  const void * b )
+handshakeCompare( const void * a, const void * b )
 {
     return handshakeCompareToAddr( a, tr_handshakeGetAddr( b, NULL ) );
@@ -535 +533 @@
 
 tr_bool
-tr_peerMgrPeerIsSeed( const tr_peerMgr   * mgr,
-                      const uint8_t      * torrentHash,
-                      const tr_address   * addr )
+tr_peerMgrPeerIsSeed( const tr_peerMgr  * mgr,
+                      const uint8_t     * torrentHash,
+                      const tr_address  * addr )
 {
     tr_bool isSeed = FALSE;
@@ -633 +631 @@
 
 static tr_piece_index_t *
-getPreferredPieces( Torrent * t, tr_piece_index_t  * pieceCount )
+getPreferredPieces( Torrent * t, tr_piece_index_t * pieceCount )
 {
     const tr_torrent  * tor = t->tor;
@@ -831 +829 @@
         for( j=0; !handled && j<peerCount; )
         {
-            const tr_addreq_t val = tr_peerMsgsAddRequest( peers[j]->msgs, index, offset, length, FALSE );
+            const tr_addreq_t val = tr_peerMsgsAddRequest( peers[j]->msgs, index, offset, length );
             switch( val )
             {
@@ -858 +856 @@
         for( j=0; !handled && j<webseedCount; )
         {
-            const tr_addreq_t val = tr_webseedAddRequest( webseeds[j],
-                                                          index, offset, length );
+            const tr_addreq_t val = tr_webseedAddRequest( webseeds[j], index, offset, length );
             switch( val )
             {
@@ -942 +939 @@
 
 static void
-peerSuggestedPiece( Torrent            * t,
-                    tr_peer            * peer,
-                    tr_piece_index_t     pieceIndex,
-                    int                  isFastAllowed )
-{
+peerSuggestedPiece( Torrent            * t UNUSED,
+                    tr_peer            * peer UNUSED,
+                    tr_piece_index_t     pieceIndex UNUSED,
+                    int                  isFastAllowed UNUSED )
+{
+#if 0
     assert( t );
     assert( peer );
@@ -980 +978 @@
                 const uint32_t offset = getBlockOffsetInPiece( tor, block );
                 const uint32_t length = tr_torBlockCountBytes( tor, block );
-                tr_peerMsgsAddRequest( peer->msgs, pieceIndex, offset, length, TRUE );
+                tr_peerMsgsAddRequest( peer->msgs, pieceIndex, offset, length );
                 incrementPieceRequests( t, pieceIndex );
             }
         }
     }
+#endif
 }
 
 static void
-peerCallbackFunc( void * vpeer,
-                  void * vevent,
-                  void * vt )
-{
-    tr_peer             * peer = vpeer; /* may be NULL if peer is a webseed */
-    Torrent             * t = vt;
+peerCallbackFunc( void * vpeer, void * vevent, void * vt )
+{
+    tr_peer * peer = vpeer; /* may be NULL if peer is a webseed */
+    Torrent * t = vt;
     const tr_peer_event * e = vevent;
 
@@ -1204 +1201 @@
 /* FIXME: this is kind of a mess. */
 static tr_bool
-myHandshakeDoneCB( tr_handshake  *  handshake,
+myHandshakeDoneCB( tr_handshake  * handshake,
                    tr_peerIo     * io,
                    int             isConnected,
@@ -1344 +1341 @@
 }
 
-static int
+static tr_bool
 tr_isPex( const tr_pex * pex )
 {
@@ -1361 +1358 @@
         managerLock( manager );
 
-
         t = getExistingTorrent( manager, torrentHash );
         if( !tr_sessionIsAddressBlocked( t->manager->session, &pex->addr ) )
             ensureAtomExists( t, &pex->addr, pex->port, pex->flags, from );
-    
+
         managerUnlock( manager );
     }
@@ -1539 +1535 @@
             {
                 const struct peer_atom * atom = getExistingAtom( t, &peer->addr );
+
                 assert( tr_isAddress( &peer->addr ) );
                 walk->addr = peer->addr;
@@ -1545 +1542 @@
                 if( peerPrefersCrypto( peer ) )
                     walk->flags |= ADDED_F_ENCRYPTION_FLAG;
-                if( ( atom->uploadOnly == UPLOAD_ONLY_YES ) ||
-                    ( peer->progress >= 1.0 ) )
+                if( ( atom->uploadOnly == UPLOAD_ONLY_YES ) || ( peer->progress >= 1.0 ) )
                     walk->flags |= ADDED_F_SEED_FLAG;
                 ++peersReturning;
@@ -1555 +1551 @@
         assert( ( walk - pex ) == peersReturning );
         qsort( pex, peersReturning, sizeof( tr_pex ), tr_pexCompare );
-
         *setme_pex = pex;
     }
@@ -1678 +1673 @@
     const tr_torrent * tor;
     float              interval;
-    int                isSeed;
+    tr_bool            isSeed;
     int                peerCount;
     const tr_peer **   peers;
@@ -1698 +1693 @@
         if( isSeed || tr_cpPieceIsComplete( tor->completion, piece ) )
             tab[i] = -1;
-        else if( peerCount )
-        {
+        else if( peerCount ) {
             int j;
             for( j = 0; j < peerCount; ++j )
@@ -1802 +1796 @@
     webseeds = (const tr_webseed **) tr_ptrArrayPeek( t->webseeds, &size );
     for( i=0; i<size; ++i )
-    {
         if( tr_webseedIsActive( webseeds[i] ) )
             ++*setmeWebseedsSendingToUs;
-    }
 
     managerUnlock( manager );
@@ -1872 +1864 @@
         tr_address               norm_addr;
 
-        memcpy( &norm_addr, &peer->addr, sizeof( tr_address ) );
+        norm_addr = peer->addr;
         tr_normalizeV4Mapped( &norm_addr );
         tr_ntop( &norm_addr, stat->addr, sizeof( stat->addr ) );
@@ -2048 +2040 @@
     }
 
-    for( i = 0; i < size; ++i )
+    for( i=0; i<size; ++i )
         tr_peerMsgsSetChoke( choke[i].peer->msgs, !choke[i].doUnchoke );
 
@@ -2105 +2097 @@
             tr_bitfieldFree( tmp );
         }
-        if( peerHasEverything && ( !tr_torrentAllowsPex(tor) || (now-atom->time>=30 ))) {
+
+        if( peerHasEverything && ( !tr_torrentAllowsPex(tor) || (now-atom->time>=30 )))
+        {
             tordbg( t, "purging peer %s because we're both seeds",
-                   tr_peerIoAddrStr( &atom->addr, atom->port ) );
+                    tr_peerIoAddrStr( &atom->addr, atom->port ) );
             return TRUE;
         }
@@ -2303 +2297 @@
         if( nBad || nCandidates )
             tordbg( t, "reconnect pulse for [%s]: %d bad connections, "
-                   "%d connection candidates, %d atoms, max per pulse is %d",
-                   t->tor->info.name, nBad, nCandidates,
-                   tr_ptrArraySize( t->pool ),
-                   (int)MAX_RECONNECTIONS_PER_PULSE );
+                    "%d connection candidates, %d atoms, max per pulse is %d",
+                    t->tor->info.name, nBad, nCandidates,
+                    tr_ptrArraySize( t->pool ),
+                    (int)MAX_RECONNECTIONS_PER_PULSE );
 
         /* disconnect some peers.
@@ -2319 +2313 @@
             else
                 ++atom->numFails;
-             
             tordbg( t, "removing bad peer %s", tr_peerIoGetAddrStr( peer->io ) );
             removePeer( t, peer );

trunk/libtransmission/peer-msgs.c

@@ -402 +402 @@
 
 static void
-protocolSendRequest( tr_peermsgs *               msgs,
+protocolSendRequest( tr_peermsgs               * msgs,
                      const struct peer_request * req )
 {
@@ -420 +420 @@
 
 static void
-protocolSendCancel( tr_peermsgs *               msgs,
+protocolSendCancel( tr_peermsgs               * msgs,
                     const struct peer_request * req )
 {
@@ -448 +448 @@
     tr_peerIoWriteUint32( io, out, index );
 
-    dbgmsg( msgs, "sending Have %u...", index );
+    dbgmsg( msgs, "sending Have %u", index );
     dbgOutMessageLen( msgs );
     pokeBatchPeriod( msgs, LOW_PRIORITY_INTERVAL_SECS );
@@ -773 +773 @@
     tr_peerIoWriteUint32( msgs->peer->io, out, sizeof( uint8_t ) );
     tr_peerIoWriteUint8 ( msgs->peer->io, out, weAreInterested ? BT_INTERESTED : BT_NOT_INTERESTED );
+
     pokeBatchPeriod( msgs, HIGH_PRIORITY_INTERVAL_SECS );
     dbgOutMessageLen( msgs );
@@ -876 +877 @@
     oldestAllowed = now - QUEUED_REQUEST_TTL_SECS;
     reqListCopy( &tmp, &msgs->clientWillAskFor );
-    for( i = 0; i < tmp.count; ++i ) {
+    for( i=0; i<tmp.count; ++i ) {
         const struct peer_request * req = &tmp.requests[i];
         if( req->time_requested < oldestAllowed )
@@ -934 +935 @@
     if( sent )
         dbgmsg( msgs, "pump sent %d requests, now have %d active and %d queued",
-                sent,
-                msgs->clientAskedFor.count,
-                msgs->clientWillAskFor.count );
+                sent, msgs->clientAskedFor.count, msgs->clientWillAskFor.count );
 
     if( count < max )
@@ -953 +952 @@
                        uint32_t         index,
                        uint32_t         offset,
-                       uint32_t         length,
-                       int              doForce )
+                       uint32_t         length )
 {
     struct peer_request req;
@@ -967 +965 @@
 
     /* don't send requests to choked clients */
-    if( !doForce && msgs->peer->clientIsChoked ) {
+    if( msgs->peer->clientIsChoked ) {
         dbgmsg( msgs, "declining request because they're choking us" );
         return TR_ADDREQ_CLIENT_CHOKED;
@@ -973 +971 @@
 
     /* peer doesn't have this piece */
-    if( !doForce && !tr_bitfieldHas( msgs->peer->have, index ) )
+    if( !tr_bitfieldHas( msgs->peer->have, index ) )
         return TR_ADDREQ_MISSING;
 
     /* peer's queue is full */
-    if( !doForce && requestQueueIsFull( msgs ) ) {
+    if( requestQueueIsFull( msgs ) ) {
         dbgmsg( msgs, "declining request because we're full" );
         return TR_ADDREQ_FULL;
@@ -986 +984 @@
     req.offset = offset;
     req.length = length;
-    if( !doForce ) {
-        if( reqListFind( &msgs->clientAskedFor, &req ) != -1 ) {
-            dbgmsg( msgs, "declining because it's a duplicate" );
-            return TR_ADDREQ_DUPLICATE;
-        }
-        if( reqListFind( &msgs->clientWillAskFor, &req ) != -1 ) {
-            dbgmsg( msgs, "declining because it's a duplicate" );
-            return TR_ADDREQ_DUPLICATE;
-        }
+    if( reqListFind( &msgs->clientAskedFor, &req ) != -1 ) {
+        dbgmsg( msgs, "declining because it's a duplicate" );
+        return TR_ADDREQ_DUPLICATE;
+    }
+    if( reqListFind( &msgs->clientWillAskFor, &req ) != -1 ) {
+        dbgmsg( msgs, "declining because it's a duplicate" );
+        return TR_ADDREQ_DUPLICATE;
     }
 
@@ -1582 +1578 @@
             break;
 
-
         case BT_FEXT_HAVE_NONE:
             dbgmsg( msgs, "Got a BT_FEXT_HAVE_NONE" );
@@ -1781 +1776 @@
     size_t bytesWritten = 0;
     struct peer_request req;
-    const int haveMessages = EVBUFFER_LENGTH( msgs->outMessages ) != 0;
+    const tr_bool haveMessages = EVBUFFER_LENGTH( msgs->outMessages ) != 0;
     const tr_bool fext = tr_peerIoSupportsFEXT( msgs->peer->io );
 
@@ -1881 +1876 @@
 tr_peerMsgsPulse( tr_peermsgs * msgs )
 {
-    if( msgs )
+    if( msgs != NULL )
         peerPulse( msgs );
 }
@@ -2203 +2198 @@
 tr_peermsgs*
 tr_peerMsgsNew( struct tr_torrent * torrent,
-                struct tr_peer *    peer,
+                struct tr_peer    * peer,
                 tr_delivery_func    func,
-                void *              userData,
-                tr_publisher_tag *  setme )
+                void              * userData,
+                tr_publisher_tag  * setme )
 {
     tr_peermsgs * m;

trunk/libtransmission/peer-msgs.h

@@ -54 +54 @@
                                     uint32_t      pieceIndex,
                                     uint32_t      offset,
-                                    uint32_t      length,
-                                    int           doForce );
+                                    uint32_t      length );
 
 void         tr_peerMsgsUnsubscribe( tr_peermsgs      * peer,

trunk/libtransmission/transmission.h

@@ -1409 +1409 @@
 tr_bool tr_isDirection( tr_direction );
 
-
 /** @} */