Changeset 4285

Timestamp:

Dec 22, 2007, 5:30:31 PM (14 years ago)

Author:

charles

Message:

(1) fix peer limits in fastresume (2) possible fastresume corruption (3) add `save' field to torrent ctor

Location:

trunk/libtransmission

Files:

• fastresume.c (modified) (4 diffs)
• internal.h (modified) (1 diff)
• torrent-ctor.c (modified) (3 diffs)
• torrent.c (modified) (4 diffs)
• transmission.c (modified) (1 diff)
• transmission.h (modified) (2 diffs)

trunk/libtransmission/fastresume.c

@@ -58 +58 @@
 #include "completion.h"
 #include "fastresume.h"
+#include "internal.h" /* tr_torrentInitFileDLs */
 #include "peer-mgr.h"
 #include "platform.h"
@@ -351 +352 @@
     switch( id )
     {
-        case FR_ID_DOWNLOADED:     ret = TR_FR_DOWNLOADED;  break;
-        case FR_ID_UPLOADED:       ret = TR_FR_UPLOADED;    break;
-        case FR_ID_PROGRESS:       ret = TR_FR_PROGRESS;    break;
-        case FR_ID_PRIORITY:       ret = TR_FR_PRIORITY;    break;
-        case FR_ID_SPEED:          ret = TR_FR_SPEEDLIMIT;  break;
-        case FR_ID_RUN:            ret = TR_FR_RUN;         break;
-        case FR_ID_CORRUPT:        ret = TR_FR_CORRUPT;     break;
-        case FR_ID_PEERS:          ret = TR_FR_PEERS;       break;
-        case FR_ID_DESTINATION:    ret = TR_FR_DESTINATION; break;
-        case FR_ID_PEX:            ret = TR_FR_PEX;         break;
+        case FR_ID_DOWNLOADED:     ret = TR_FR_DOWNLOADED;    break;
+        case FR_ID_UPLOADED:       ret = TR_FR_UPLOADED;      break;
+        case FR_ID_PROGRESS:       ret = TR_FR_PROGRESS;      break;
+        case FR_ID_PRIORITY:       ret = TR_FR_PRIORITY;      break;
+        case FR_ID_SPEED:          ret = TR_FR_SPEEDLIMIT;    break;
+        case FR_ID_RUN:            ret = TR_FR_RUN;           break;
+        case FR_ID_CORRUPT:        ret = TR_FR_CORRUPT;       break;
+        case FR_ID_PEERS:          ret = TR_FR_PEERS;         break;
+        case FR_ID_DESTINATION:    ret = TR_FR_DESTINATION;   break;
+        case FR_ID_PEX:            ret = TR_FR_PEX;           break;
+        case FR_ID_MAX_PEERS:      ret = TR_FR_MAX_PEERS;     break;
+        case FR_ID_MAX_UNCHOKED:   ret = TR_FR_MAX_UNCHOKED;  break;
     }
 
@@ -502 +505 @@
 
         if( dndCount )
-            tr_torrentSetFileDLs ( tor, dnd, dndCount, FALSE );
+            tr_torrentInitFileDLs ( tor, dnd, dndCount, FALSE );
         if( dlCount )
-            tr_torrentSetFileDLs ( tor, dl, dlCount, TRUE );
+            tr_torrentInitFileDLs ( tor, dl, dlCount, TRUE );
 
         tr_free( dnd );
@@ -617 +620 @@
             case FR_ID_MAX_PEERS:    ret |= parseConnections( tor, buf, len ); break;
             case FR_ID_MAX_UNCHOKED: ret |= parseUnchoked( tor, buf, len ); break;
-            case FR_ID_PEX:         ret |= parsePex( tor, buf, len ); break;
-            case FR_ID_DESTINATION: ret |= parseDestination( tor, buf, len ); break;
-            default:                tr_dbg( "Skipping unknown resume code %d", (int)id ); break;
+            case FR_ID_PEX:          ret |= parsePex( tor, buf, len ); break;
+            case FR_ID_DESTINATION:  ret |= parseDestination( tor, buf, len ); break;
+            default:                 tr_dbg( "Skipping unknown resume code %d", (int)id ); break;
         }
 

trunk/libtransmission/internal.h

@@ -44 +44 @@
 #endif
 
+/* just like tr_torrentSetFileDLs but doesn't trigger a fastresume save */
+void tr_torrentInitFileDLs( tr_torrent   * tor,
+                            int          * files,
+                            int            fileCount,
+                            int            do_download );
+
 int tr_torrentIsPrivate( const tr_torrent * );
 

trunk/libtransmission/torrent-ctor.c

@@ -36 +36 @@
 {
     const tr_handle * handle;
+    unsigned int saveInOurTorrentsDir : 1;
 
     unsigned int isSet_metainfo : 1;
@@ -117 +118 @@
 
 void
+tr_ctorSetSave( tr_ctor  * ctor,
+                int        saveInOurTorrentsDir )
+{
+    ctor->saveInOurTorrentsDir = saveInOurTorrentsDir ? 1 : 0;
+}
+
+int
+tr_ctorGetSave( const tr_ctor * ctor )
+{
+    return ctor && ctor->saveInOurTorrentsDir;
+}
+
+void
 tr_ctorSetPaused( tr_ctor        * ctor,
                   tr_ctorMode      mode,
@@ -246 +260 @@
     tr_ctorSetMaxUnchokedPeers( ctor, TR_FALLBACK, DEFAULT_MAX_UNCHOKED_PEERS );
     tr_ctorSetPaused( ctor, TR_FALLBACK, FALSE );
+    tr_ctorSetSave( ctor, TRUE );
     return ctor;
 }

trunk/libtransmission/torrent.c

@@ -397 +397 @@
     tr_info tmp;
     const benc_val_t * metainfo;
+    const int doSave = tr_ctorGetSave( ctor );
 
     if( setmeInfo == NULL )
@@ -405 +406 @@
         return TR_EINVALID;
 
-    err = tr_metainfoParseBenc( setmeInfo, handle->tag, metainfo, FALSE );
+    err = tr_metainfoParseBenc( setmeInfo, handle->tag, metainfo, doSave );
     doFree = !err && ( setmeInfo == &tmp );
 
@@ -1186 +1187 @@
 
 void
+tr_torrentInitFileDLs ( tr_torrent   * tor,
+                        int          * files,
+                        int            fileCount,
+                        int            doDownload )
+{
+    int i;
+    tr_torrentLock( tor );
+
+    for( i=0; i<fileCount; ++i )
+        setFileDND( tor, files[i], doDownload );
+    tr_cpInvalidateDND ( tor->completion );
+
+    tr_torrentUnlock( tor );
+}
+
+void
 tr_torrentSetFileDLs ( tr_torrent  * tor,
                        int         * files,
@@ -1191 +1208 @@
                        int           doDownload )
 {
-    int i;
     tr_torrentLock( tor );
-
-    for( i=0; i<fileCount; ++i )
-        setFileDND( tor, files[i], doDownload );
-    tr_cpInvalidateDND ( tor->completion );
+    tr_torrentInitFileDLs( tor, files, fileCount, doDownload );
     saveFastResumeNow( tor );
-
     tr_torrentUnlock( tor );
 }

trunk/libtransmission/transmission.c

@@ -394 +394 @@
     tr_list *l=NULL, *list=NULL;
 
+    tr_ctorSetSave( ctor, FALSE ); /* since we already have them */
+
     if( !stat( dirname, &sb )
         && S_ISDIR( sb.st_mode )

trunk/libtransmission/transmission.h

@@ -388 +388 @@
 void     tr_ctorFree                   ( tr_ctor        * ctor );
 
+void     tr_ctorSetSave                ( tr_ctor        * ctor,
+                                         int              saveMetadataInOurTorrentsDir );
+
 int      tr_ctorSetMetainfo            ( tr_ctor        * ctor,
                                          const uint8_t  * metainfo,
@@ -432 +435 @@
 int      tr_ctorGetMetainfo            ( const tr_ctor  * ctor,
                                          const struct benc_val_s ** setme );
+
+int      tr_ctorGetSave                ( const tr_ctor  * ctor );
 
 typedef struct tr_info tr_info;