Changeset 9557

Timestamp:

Nov 24, 2009, 5:31:20 PM (13 years ago)

Author:

charles

Message:

(trunk libT) don't allow duplicate torrents to be added via magnet links

Location:

trunk/libtransmission

Files:

• peer-msgs.c (modified) (1 diff)
• torrent.c (modified) (1 diff)

trunk/libtransmission/peer-msgs.c

@@ -1873 +1873 @@
             tr_bencDictAddInt( &tmp, "msg_type", METADATA_MSG_TYPE_DATA );
             tr_bencDictAddInt( &tmp, "piece", piece );
-            tr_bencDictAddInt( &tmp, "total_size", dataLen );
+            tr_bencDictAddInt( &tmp, "total_size", msgs->torrent->infoDictLength );
             payload = tr_bencToStr( &tmp, TR_FMT_BENC, &payloadLen );
             tr_bencFree( &tmp );

trunk/libtransmission/torrent.c

@@ -768 +768 @@
                int            * setmeError )
 {
-    int err;
     tr_info tmpInfo;
     tr_torrent * tor = NULL;
     const tr_magnet_info * magnetInfo;
+    tr_session * session = tr_ctorGetSession( ctor );
 
     assert( ctor != NULL );
-    assert( tr_isSession( tr_ctorGetSession( ctor ) ) );
+    assert( tr_isSession( session ) );
 
     if( !tr_ctorGetMagnet( ctor, &magnetInfo ) )
     {
-        tor = tr_new0( tr_torrent, 1 );
-        tr_metainfoSetFromMagnet( &tor->info, magnetInfo );
-        torrentInit( tor, ctor );
+        if( tr_torrentFindFromHash( session, magnetInfo->hash ) != NULL )
+        {
+            if( setmeError )
+                *setmeError = TR_PARSE_DUPLICATE;
+        }
+        else
+        {
+            tor = tr_new0( tr_torrent, 1 );
+            tr_metainfoSetFromMagnet( &tor->info, magnetInfo );
+            torrentInit( tor, ctor );
+        }
     }
     else
     {
-        err = tr_torrentParse( ctor, &tmpInfo );
+        const int err = tr_torrentParse( ctor, &tmpInfo );
         if( !err )
         {