Changeset 14114


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/libtransmission/peer-mgr.c

    r14111 r14114  
    19131913{
    19141914  tr_peer * peer;
     1915  tr_peerMsgs * msgs;
    19151916  tr_swarm * swarm;
    19161917
     
    19321933  assert (swarm->stats.peerCount == tr_ptrArraySize (&swarm->peers));
    19331934  assert (swarm->stats.peerFromCount[atom->fromFirst] <= swarm->stats.peerCount);
     1935
     1936  msgs = PEER_MSGS (peer);
     1937  tr_peerMsgsUpdateActive (msgs, TR_UP);
     1938  tr_peerMsgsUpdateActive (msgs, TR_DOWN);
    19341939}
    19351940
  • trunk/libtransmission/peer-msgs.c

    r14109 r14114  
    709709    {
    710710      if (!tr_torrentHasMetadata (msgs->torrent))
    711         is_active = true;
     711        {
     712          is_active = true;
     713        }
    712714      else
    713         is_active = tr_peerMsgsIsClientInterested (msgs)
    714                 && !tr_peerMsgsIsClientChoked (msgs);
    715 
    716       if (is_active)
    717         assert (!tr_torrentIsSeed (msgs->torrent));
     715        {
     716          is_active = tr_peerMsgsIsClientInterested (msgs)
     717                  && !tr_peerMsgsIsClientChoked (msgs);
     718
     719          if (is_active)
     720            assert (!tr_torrentIsSeed (msgs->torrent));
     721        }
    718722    }
    719723
  • trunk/libtransmission/session.c

    r14110 r14114  
    942942
    943943void
    944 tr_sessionSet (tr_session * session, tr_variant  * settings)
     944tr_sessionSet (tr_session * session, tr_variant * settings)
    945945{
    946946  struct init_data data;
Note: See TracChangeset for help on using the changeset viewer.