Changeset 7341

Timestamp:

Dec 10, 2008, 5:20:32 AM (12 years ago)

Author:

charles

Message:

(1.4x libT) fix minor r7267 oops that could keep us from disconnecting if we made a peer connection to ourself

File:

• branches/1.4x/libtransmission/handshake.c (modified) (6 diffs)

branches/1.4x/libtransmission/handshake.c

@@ -209 +209 @@
     const uint8_t    * torrentHash = tr_cryptoGetTorrentHash( handshake->crypto );
     const tr_torrent * tor = tr_torrentFindFromHash( handshake->handle, torrentHash );
-    const uint8_t    * peerId = tor && tor->peer_id ? tor->peer_id : tr_getPeerId( );
+    const uint8_t    * peer_id = tor && tor->peer_id ? tor->peer_id : tr_getPeerId( );
 
     memcpy( walk, HANDSHAKE_NAME, HANDSHAKE_NAME_LEN );
@@ -220 +220 @@
     memcpy( walk, torrentHash, SHA_DIGEST_LENGTH );
     walk += SHA_DIGEST_LENGTH;
-    memcpy( walk, peerId, PEER_ID_LEN );
+    memcpy( walk, peer_id, PEER_ID_LEN );
     walk += PEER_ID_LEN;
 
-    assert( strlen( ( const char* )peerId ) == PEER_ID_LEN );
+    assert( strlen( ( const char* )peer_id ) == PEER_ID_LEN );
     assert( walk - buf == HANDSHAKE_SIZE );
     *setme_len = walk - buf;
@@ -247 +247 @@
     uint8_t reserved[HANDSHAKE_FLAGS_LEN];
     uint8_t hash[SHA_DIGEST_LENGTH];
+    const tr_torrent * tor;
+    const uint8_t * peer_id;
 
     dbgmsg( handshake, "payload: need %d, got %d", (int)HANDSHAKE_SIZE,
@@ -282 +284 @@
     dbgmsg( handshake, "peer-id is [%*.*s]", PEER_ID_LEN, PEER_ID_LEN,
             handshake->peer_id );
-    if( !memcmp( handshake->peer_id, tr_getPeerId( ), PEER_ID_LEN ) )
+
+    tor = tr_torrentFindFromHash( handshake->handle, hash );
+    peer_id = tor && tor->peer_id ? tor->peer_id : tr_getPeerId( );
+    if( !memcmp( handshake->peer_id, peer_id, PEER_ID_LEN ) )
     {
         dbgmsg( handshake, "streuth!  we've connected to ourselves." );
@@ -720 +725 @@
 
 static int
-readPeerId( tr_handshake *    handshake,
+readPeerId( tr_handshake    * handshake,
             struct evbuffer * inbuf )
 {
     int  peerIsGood;
     char client[128];
+    tr_torrent * tor;
+    const uint8_t * peer_id;
 
     if( EVBUFFER_LENGTH( inbuf ) < PEER_ID_LEN )
@@ -740 +747 @@
 
     /* if we've somehow connected to ourselves, don't keep the connection */
-    peerIsGood =
-        memcmp( handshake->peer_id, tr_getPeerId( ), PEER_ID_LEN ) ? 1 : 0;
+    tor = tr_torrentFindFromHash( handshake->handle, tr_peerIoGetTorrentHash( handshake->io ) );
+    peer_id = tor && tor->peer_id ? tor->peer_id : tr_getPeerId( );
+    peerIsGood = memcmp( handshake->peer_id, peer_id, PEER_ID_LEN ) != 0;
     dbgmsg( handshake, "isPeerGood == %d", peerIsGood );
     return tr_handshakeDone( handshake, peerIsGood );