Changeset 931

Timestamp:

09/27/2006 12:36:04 AM (3 years ago)

Author:

joshe

Message:

Fix possible uint64_t underflow which could cause insanely huge (16,000,000 TB)

upload and/or download totals to be reported to the tracker.

Location:

trunk/libtransmission

Files:

• fastresume.h (modified) (4 diffs)
• internal.h (modified) (1 diff)
• peer.c (modified) (1 diff)
• peerparse.h (modified) (1 diff)
• tracker.c (modified) (4 diffs)
• transmission.c (modified) (2 diffs)

trunk/libtransmission/fastresume.h

@@ -126 +126 @@
     char    * path;
     uint8_t * buf;
+    uint64_t  total;
 
     buf = malloc( FR_PROGRESS_LEN( tor ) );
@@ -162 +163 @@
 
     /* Write download and upload totals */
-    fastResumeWriteData( FR_ID_DOWNLOADED, &tor->downloaded, 8, 1, file );
-    fastResumeWriteData( FR_ID_UPLOADED, &tor->uploaded, 8, 1, file );
+    total = tor->downloadedCur + tor->downloadedPrev;
+    fastResumeWriteData( FR_ID_DOWNLOADED, &total, 8, 1, file );
+    total = tor->uploadedCur + tor->uploadedPrev;
+    fastResumeWriteData( FR_ID_UPLOADED, &total, 8, 1, file );
 
     fclose( file );
@@ -334 +337 @@
                 if( 8 == len)
                 {
-                    if( 1 != fread( &tor->downloaded, 8, 1, file ) )
+                    if( 1 != fread( &tor->downloadedPrev, 8, 1, file ) )
                     {
                         fclose( file );
@@ -347 +350 @@
                 if( 8 == len)
                 {
-                    if( 1 != fread( &tor->uploaded, 8, 1, file ) )
+                    if( 1 != fread( &tor->uploadedPrev, 8, 1, file ) )
                     {
                         fclose( file );

trunk/libtransmission/internal.h

@@ -182 +182 @@
 
     uint64_t          date;
-    uint64_t          downloaded;
-    uint64_t          uploaded;
+    uint64_t          downloadedCur;
+    uint64_t          downloadedPrev;
+    uint64_t          uploadedCur;
+    uint64_t          uploadedPrev;
 
     tr_stat_t         stats[2];

trunk/libtransmission/peer.c

@@ -432 +432 @@
             tr_rcTransferred( tor->globalUpload, ret );
 
-            tor->uploaded  += ret;
-            peer->outTotal += ret;
-            peer->outDate   = tr_date();
+            tor->uploadedCur += ret;
+            peer->outTotal   += ret;
+            peer->outDate     = tr_date();
 
             /* In case this block is done, you may have messages

trunk/libtransmission/peerparse.h

@@ -273 +273 @@
     }
 
-    tor->downloaded += r->length;
+    tor->downloadedCur += r->length;
 
     block = tr_block( r->index, r->begin );

trunk/libtransmission/tracker.c

@@ -52 +52 @@
     int            bindPort;
     int            newPort;
-
-    uint64_t       download;
-    uint64_t       upload;
 };
 
@@ -78 +75 @@
     tc->bindPort = *(tor->bindPort);
     tc->newPort  = -1;
-
-    tc->download = tor->downloaded;
-    tc->upload   = tor->uploaded;
 
     return tc;
@@ -244 +238 @@
     uint64_t       up;
 
-    assert( tor->downloaded >= tc->download && tor->uploaded >= tc->upload );
-    down = tor->downloaded - tc->download;
-    up = tor->uploaded - tc->upload;
+    down = tor->downloadedCur;
+    up = tor->uploadedCur;
     if( tc->started )
     {
@@ -480 +473 @@
     {
         tc->started  = 1;
-        tc->download = tor->downloaded;
-        tc->upload   = tor->uploaded;
     }
 

trunk/libtransmission/transmission.c

@@ -393 +393 @@
     }
 
+    tor->downloadedPrev += tor->downloadedCur;
+    tor->downloadedCur   = 0;
+    tor->uploadedPrev   += tor->uploadedCur;
+    tor->uploadedCur     = 0;
+
     tor->status  = TR_STATUS_CHECK;
     tor->tracker = tr_trackerInit( tor );
@@ -541 +546 @@
     }
 
-    s->downloaded = tor->downloaded;
-    s->uploaded   = tor->uploaded;
+    s->downloaded = tor->downloadedCur + tor->downloadedPrev;
+    s->uploaded   = tor->uploadedCur   + tor->uploadedPrev;
 
     tr_lockUnlock( &tor->lock );