Changeset 3121

Timestamp:

Sep 21, 2007, 2:20:55 PM (15 years ago)

Author:

charles

Message:

fix recursive crash when stopping a torrent, reported by plantain. silence a few more console messages.

Location:

trunk/libtransmission

Files:

• internal.h (modified) (4 diffs)
• peer-mgr.c (modified) (2 diffs)
• shared.c (modified) (2 diffs)
• shared.h (modified) (2 diffs)
• torrent.c (modified) (5 diffs)

trunk/libtransmission/internal.h

@@ -116 +116 @@
     int                        error;
     char                       errorString[128];
-    int                        hasChangedState;
 
     uint8_t                    obfuscatedHash[SHA_DIGEST_LENGTH];
@@ -137 +136 @@
     struct tr_completion     * completion;
 
-    volatile char              dieFlag;
     struct tr_bitfield       * uncheckedPieces;
     run_status_t               runStatus;
     run_status_t               runStatusToSave;
-    char                       runStatusToSaveIsSet;
     cp_status_t                cpStatus;
     struct tr_lock           * lock;
@@ -147 +144 @@
     struct tr_tracker        * tracker;
     struct tr_publisher_tag  * trackerSubscription;
-    uint64_t                   startDate;
-    uint64_t                   stopDate;
 
     uint64_t                   downloadedCur;
@@ -156 +151 @@
     uint64_t                   corruptCur;
     uint64_t                   corruptPrev;
+
+    uint64_t                   startDate;
+    uint64_t                   stopDate;
     uint64_t                   activityDate;
 
-    uint8_t                    pexDisabled;
+    unsigned int               runStatusToSaveIsSet : 1;
+    unsigned int               hasChangedState : 1;
+    unsigned int               pexDisabled : 1;
+    unsigned int               doStopAfterHashCheck : 1;
+    unsigned int               statCur : 1;
 
-    int8_t                     statCur;
     tr_stat                    stats[2];
 

trunk/libtransmission/peer-mgr.c

@@ -606 +606 @@
     }
 
-    fprintf( stderr, "peer-mgr: torrent [%s] finished a handshake; isConnected is %d\n", t->tor->info.name, isConnected );
+    fprintf( stderr, "peer-mgr: torrent [%s] finished a handshake. Connected? %s.\n", t->tor->info.name, (isConnected?"yes":"no") );
 
     /* if we couldn't connect or were snubbed,
@@ -612 +612 @@
     if( !ok ) {
         tr_peer * peer = getExistingPeer( t, in_addr );
-        fprintf( stderr, "peer-mgr: torrent [%s] got a bad one, and you know what? fuck them.\n", t->tor->info.name );
         tr_peerIoFree( io );
         --manager->connectionCount;

trunk/libtransmission/shared.c

@@ -170 +170 @@
 }
 
-int tr_sharedGetPublicPort( tr_shared * s )
-{
-fprintf( stderr, "%s:%d tr_sharedGetPublicPort returning %d\n", __FILE__, __LINE__, (int)s->publicPort );
+int
+tr_sharedGetPublicPort( const tr_shared * s )
+{
     return s->publicPort;
 }
@@ -195 +195 @@
 }
 
-int tr_sharedTraversalStatus( tr_shared * s )
-{
-    int statuses[] = {
+int tr_sharedTraversalStatus( const tr_shared * s )
+{
+    const int statuses[] = {
         TR_NAT_TRAVERSAL_MAPPED,
         TR_NAT_TRAVERSAL_MAPPING,

trunk/libtransmission/shared.h

@@ -55 +55 @@
  **********************************************************************/
 void         tr_sharedSetPort         ( tr_shared *, int port );
-int          tr_sharedGetPublicPort   ( tr_shared * s );
+int          tr_sharedGetPublicPort   ( const tr_shared * s );
 
 /***********************************************************************
@@ -64 +64 @@
  **********************************************************************/
 void         tr_sharedTraversalEnable ( tr_shared *, int enable );
-int          tr_sharedTraversalStatus ( tr_shared * );
+int          tr_sharedTraversalStatus ( const tr_shared * );
 
 

trunk/libtransmission/torrent.c

@@ -275 +275 @@
     recheckCpState( tor );
 
+    if( tor->doStopAfterHashCheck ) {
+        tor->doStopAfterHashCheck = 0;
+        tr_torrentStop( tor );
+    }
+
     if( tor->runStatus == TR_RUN_RUNNING )
         tr_torrentStartImpl( tor );
@@ -733 +738 @@
     tr_torrentLock( tor );
 
-    tor->statCur = ( tor->statCur + 1 ) % 2;
+    tor->statCur = !tor->statCur;
     s = &tor->stats[tor->statCur];
 
@@ -1060 +1065 @@
         case TR_RUN_CHECKING_WAIT:
         case TR_RUN_CHECKING:
+            tor->doStopAfterHashCheck = 1;
             tr_ioRecheckRemove( tor );
-            tr_torrentStop( tor );
             break;
 
@@ -1068 +1073 @@
             tr_peerMgrStopTorrent( tor->handle->peerMgr, tor->info.hash );
             tor->runStatus = TR_RUN_STOPPING;
-            tor->stopDate = tr_date( );
             tr_trackerStop( tor->tracker );
             tr_ioClose( tor );
@@ -1090 +1094 @@
     tor->runStatusToSave = tor->runStatus;
     tor->runStatusToSaveIsSet = TRUE;
-    tor->dieFlag = TRUE;
     tr_torrentStop( tor );
     tr_timerNew( tor->handle, freeWhenStopped, tor, 250 );