Changeset 9274

Timestamp:

Oct 10, 2009, 7:16:21 PM (13 years ago)

Author:

charles

Message:

(trunk libT) #2489: tr_torrentSetAnnounceList() should check for invalid and duplicate announce URLs

Location:

trunk/libtransmission

Files:

• torrent.c (modified) (2 diffs)
• transmission.h (modified) (2 diffs)

trunk/libtransmission/torrent.c

@@ -2012 +2012 @@
 ***/
 
-void
+tr_announce_list_err
 tr_torrentSetAnnounceList( tr_torrent *            tor,
                            const tr_tracker_info * trackers,
                            int                     trackerCount )
 {
+    int i, j;
     tr_benc metainfo;
 
     assert( tr_isTorrent( tor ) );
+
+    /* look for bad URLs */
+    for( i=0; i<trackerCount; ++i )
+        if( !tr_httpIsValidURL( trackers[i].announce ) )
+            return TR_ANNOUNCE_LIST_HAS_BAD;
+
+    /* look for duplicates */
+    for( i=0; i<trackerCount; ++i )
+        for( j=0; j<trackerCount; ++j )
+            if(    ( i != j )
+                && ( trackers[i].tier == trackers[j].tier)
+                && ( !strcmp( trackers[i].announce, trackers[j].announce ) ) )
+                    return TR_ANNOUNCE_LIST_HAS_DUPLICATES;
 
     /* save to the .torrent file */
@@ -2069 +2083 @@
         tr_announcerResetTorrent( tor->session->announcer, tor );
     }
+
+    return TR_ANNOUNCE_LIST_OK;
 }
 

trunk/libtransmission/transmission.h

@@ -1102 +1102 @@
 tr_tracker_info;
 
+
+typedef enum
+{
+  TR_ANNOUNCE_LIST_OK,
+  TR_ANNOUNCE_LIST_HAS_DUPLICATES,
+  TR_ANNOUNCE_LIST_HAS_BAD
+}
+tr_announce_list_err;
+
 /**
  * @brief Modify a torrent's tracker list.
@@ -1114 +1123 @@
  * @param trackerCount size of the `trackers' array
  */
-void tr_torrentSetAnnounceList( tr_torrent *            torrent,
-                                const tr_tracker_info * trackers,
-                                int                     trackerCount );
+tr_announce_list_err
+tr_torrentSetAnnounceList( tr_torrent             * torrent,
+                           const tr_tracker_info  * trackers,
+                           int                      trackerCount );