Changeset 14114

Timestamp:

Jul 9, 2013, 5:05:32 PM (9 years ago)

Author:

jordan

Message:

in peer-msgs.c's tr_peerMsgsCalculateActive(), adjust some of those new tracer assertions to work better with magnet links.

Location:

trunk/libtransmission

Files:

• peer-mgr.c (modified) (2 diffs)
• peer-msgs.c (modified) (1 diff)
• session.c (modified) (1 diff)

trunk/libtransmission/peer-mgr.c

@@ -1913 +1913 @@
 {
   tr_peer * peer;
+  tr_peerMsgs * msgs;
   tr_swarm * swarm;
 
@@ -1932 +1933 @@
   assert (swarm->stats.peerCount == tr_ptrArraySize (&swarm->peers));
   assert (swarm->stats.peerFromCount[atom->fromFirst] <= swarm->stats.peerCount);
+
+  msgs = PEER_MSGS (peer);
+  tr_peerMsgsUpdateActive (msgs, TR_UP);
+  tr_peerMsgsUpdateActive (msgs, TR_DOWN);
 }
 

trunk/libtransmission/peer-msgs.c

@@ -709 +709 @@
     {
       if (!tr_torrentHasMetadata (msgs->torrent))
-        is_active = true;
+        {
+          is_active = true;
+        }
       else
-        is_active = tr_peerMsgsIsClientInterested (msgs)
-                && !tr_peerMsgsIsClientChoked (msgs);
-
-      if (is_active)
-        assert (!tr_torrentIsSeed (msgs->torrent));
+        {
+          is_active = tr_peerMsgsIsClientInterested (msgs)
+                  && !tr_peerMsgsIsClientChoked (msgs);
+
+          if (is_active)
+            assert (!tr_torrentIsSeed (msgs->torrent));
+        }
     }
 

trunk/libtransmission/session.c

@@ -942 +942 @@
 
 void
-tr_sessionSet (tr_session * session, tr_variant  * settings)
+tr_sessionSet (tr_session * session, tr_variant * settings)
 {
   struct init_data data;