Merge branch 'master' of https://github.com/anacrolix/torrent

diff --combined client.go
index a64b1f2288c63d860f55598d3da22c2c0a7a35c5,322c7e704b138531fab1188465086016247b4254..d5414d340f102991a463647fde9be744ed6227af
--- 1/client.go
--- 2/client.go
+++ b/client.go
@@@ -109,14 -109,14 +109,14 @@@ const 
  )
  
  // Currently doesn't really queue, but should in the future.
- func (cl *Client) queuePieceCheck(t *torrent, pieceIndex pp.Integer) {
+ func (cl *Client) queuePieceCheck(t *torrent, pieceIndex int) {
        piece := &t.Pieces[pieceIndex]
        if piece.QueuedForHash {
                return
        }
        piece.QueuedForHash = true
        t.publishPieceChange(int(pieceIndex))
-       go cl.verifyPiece(t, pieceIndex)
+       go cl.verifyPiece(t, int(pieceIndex))
  }
  
  // Queue a piece check if one isn't already queued, and the piece has never
@@@ -126,7 -126,7 +126,7 @@@ func (cl *Client) queueFirstHash(t *tor
        if p.EverHashed || p.Hashing || p.QueuedForHash || t.pieceComplete(piece) {
                return
        }
-       cl.queuePieceCheck(t, pp.Integer(piece))
+       cl.queuePieceCheck(t, piece)
  }
  
  // Clients contain zero or more Torrents. A client manages a blocklist, the
@@@ -671,7 -671,7 +671,7 @@@ func (cl *Client) incomingConnection(n
  }
  
  // Returns a handle to the given torrent, if it's present in the client.
 -func (cl *Client) Torrent(ih InfoHash) (T Torrent, ok bool) {
 +func (cl *Client) Torrent(ih InfoHash) (T Download, ok bool) {
        cl.mu.Lock()
        defer cl.mu.Unlock()
        t, ok := cl.torrents[ih]
@@@ -1226,10 -1226,7 +1226,7 @@@ func (me *Client) sendInitialMessages(c
                })
        }
        if torrent.haveAnyPieces() {
-               conn.Post(pp.Message{
-                       Type:     pp.Bitfield,
-                       Bitfield: torrent.bitfield(),
-               })
+               conn.Bitfield(torrent.bitfield())
        } else if me.extensionBytes.SupportsFast() && conn.PeerExtensionBytes.SupportsFast() {
                conn.Post(pp.Message{
                        Type: pp.HaveNone,
@@@ -1831,7 -1828,7 +1828,7 @@@ func (me *Client) openNewConns(t *torre
                        return
                }
                var (
 -                      k peersKey
 +                      k PeersKey
                        p Peer
                )
                for k, p = range t.Peers {
@@@ -1905,7 -1902,7 +1902,7 @@@ func (cl *Client) startTorrent(t *torre
                }
                go func() {
                        for i := range t.Pieces {
-                               cl.verifyPiece(t, pp.Integer(i))
+                               cl.verifyPiece(t, i)
                        }
                }()
        }
@@@ -1948,7 -1945,7 +1945,7 @@@ func newTorrent(ih InfoHash) (t *torren
        t = &torrent{
                InfoHash:  ih,
                chunkSize: defaultChunkSize,
 -              Peers:     make(map[peersKey]Peer),
 +              Peers:     make(map[PeersKey]Peer),
  
                closing:           make(chan struct{}),
                ceasingNetworking: make(chan struct{}),
@@@ -2160,10 -2157,8 +2157,10 @@@ func TorrentSpecFromMetaInfo(mi *metain
  // trackers will be merged with the existing ones. If the Info isn't yet
  // known, it will be set. The display name is replaced if the new spec
  // provides one. Returns new if the torrent wasn't already in the client.
 -func (cl *Client) AddTorrentSpec(spec *TorrentSpec) (T Torrent, new bool, err error) {
 +func (cl *Client) AddTorrentSpec(spec *TorrentSpec) (D Download, new bool, err error) {
 +      T := Torrent{}
        T.cl = cl
 +      D = &T
        cl.mu.Lock()
        defer cl.mu.Unlock()
  
@@@ -2434,8 -2429,7 +2431,7 @@@ newAnnounce
                        for trIndex, tr := range tier {
                                numTrackersTried++
                                err := cl.announceTorrentSingleTracker(tr, &req, t)
-                               if err != nil && missinggo.CryHeard() {
-                                       log.Printf("%s: error announcing to %s: %s", t, tr, err)
+                               if err != nil {
                                        continue
                                }
                                // Float the successful announce to the top of the tier. If
@@@ -2603,7 -2597,7 +2599,7 @@@ func (me *Client) downloadedChunk(t *to
        // It's important that the piece is potentially queued before we check if
        // the piece is still wanted, because if it is queued, it won't be wanted.
        if piece.numPendingChunks() == 0 {
-               me.queuePieceCheck(t, req.Index)
+               me.queuePieceCheck(t, int(req.Index))
        }
        if !t.wantPiece(int(req.Index)) {
                for _, c := range t.Conns {
@@@ -2633,7 -2627,7 +2629,7 @@@ func (me *Client) reapPieceTouches(t *t
        return
  }
  
- func (me *Client) pieceHashed(t *torrent, piece pp.Integer, correct bool) {
+ func (me *Client) pieceHashed(t *torrent, piece int, correct bool) {
        p := &t.Pieces[piece]
        if p.EverHashed {
                // Don't score the first time a piece is hashed, it could be an
@@@ -2662,7 -2656,6 +2658,6 @@@
        me.pieceChanged(t, int(piece))
  }
  
- // TODO: Check this isn't called more than once for each piece being correct.
  func (me *Client) pieceChanged(t *torrent, piece int) {
        correct := t.pieceComplete(piece)
        p := &t.Pieces[piece]
@@@ -2686,11 -2679,7 +2681,7 @@@
        }
        for _, conn := range t.Conns {
                if correct {
-                       conn.Post(pp.Message{
-                               Type:  pp.Have,
-                               Index: pp.Integer(piece),
-                       })
-                       // TODO: Cancel requests for this piece.
+                       conn.Have(piece)
                        for r := range conn.Requests {
                                if int(r.Index) == piece {
                                        conn.Cancel(r)
@@@ -2706,20 -2695,20 +2697,20 @@@
        me.event.Broadcast()
  }
  
- func (cl *Client) verifyPiece(t *torrent, index pp.Integer) {
+ func (cl *Client) verifyPiece(t *torrent, piece int) {
        cl.mu.Lock()
        defer cl.mu.Unlock()
-       p := &t.Pieces[index]
+       p := &t.Pieces[piece]
        for p.Hashing || t.data == nil {
                cl.event.Wait()
        }
        p.QueuedForHash = false
-       if t.isClosed() || t.pieceComplete(int(index)) {
+       if t.isClosed() || t.pieceComplete(piece) {
                return
        }
        p.Hashing = true
        cl.mu.Unlock()
-       sum := t.hashPiece(index)
+       sum := t.hashPiece(piece)
        cl.mu.Lock()
        select {
        case <-t.closing:
@@@ -2727,11 -2716,11 +2718,11 @@@
        default:
        }
        p.Hashing = false
-       cl.pieceHashed(t, index, sum == p.Hash)
+       cl.pieceHashed(t, piece, sum == p.Hash)
  }
  
  // Returns handles to all the torrents loaded in the Client.
 -func (me *Client) Torrents() (ret []Torrent) {
 +func (me *Client) Torrents() (ret []Download) {
        me.mu.Lock()
        for _, t := range me.torrents {
                ret = append(ret, Torrent{me, t})
@@@ -2740,7 -2729,7 +2731,7 @@@
        return
  }
  
 -func (me *Client) AddMagnet(uri string) (T Torrent, err error) {
 +func (me *Client) AddMagnet(uri string) (T Download, err error) {
        spec, err := TorrentSpecFromMagnetURI(uri)
        if err != nil {
                return
@@@ -2749,12 -2738,12 +2740,12 @@@
        return
  }
  
 -func (me *Client) AddTorrent(mi *metainfo.MetaInfo) (T Torrent, err error) {
 +func (me *Client) AddTorrent(mi *metainfo.MetaInfo) (T Download, err error) {
        T, _, err = me.AddTorrentSpec(TorrentSpecFromMetaInfo(mi))
        return
  }
  
 -func (me *Client) AddTorrentFromFile(filename string) (T Torrent, err error) {
 +func (me *Client) AddTorrentFromFile(filename string) (T Download, err error) {
        mi, err := metainfo.LoadFromFile(filename)
        if err != nil {
                return

diff --combined torrent.go
index 242dfb8535baf68811f5f49ce94faf434495f209,b2478656cc72d5fe7f4cf4d19dc662dc5956bf6b..db554e679d5433f6d91b8fc41e2a908e9da6b8b5
--- 1/torrent.go
--- 2/torrent.go
+++ b/torrent.go
@@@ -39,7 -39,7 +39,7 @@@ func (t *torrent) pieceNumPendingBytes(
        return
  }
  
 -type peersKey struct {
 +type PeersKey struct {
        IPBytes string
        Port    int
  }
@@@ -78,7 -78,7 +78,7 @@@ type torrent struct 
        // Reserve of peers to connect to. A peer can be both here and in the
        // active connections if were told about the peer after connecting with
        // them. That encourages us to reconnect to peers that are well known.
 -      Peers     map[peersKey]Peer
 +      Peers     map[PeersKey]Peer
        wantPeers sync.Cond
  
        // BEP 12 Multitracker Metadata Extension. The tracker.Client instances
@@@ -180,7 -180,7 +180,7 @@@ func (t *torrent) addPeer(p Peer, cl *C
        if len(t.Peers) >= torrentPeersHighWater {
                return
        }
 -      key := peersKey{string(p.IP), p.Port}
 +      key := PeersKey{string(p.IP), p.Port}
        if _, ok := t.Peers[key]; ok {
                return
        }
@@@ -659,7 -659,7 +659,7 @@@ func (t *torrent) pieceLength(piece int
        return
  }
  
- func (t *torrent) hashPiece(piece pp.Integer) (ps pieceSum) {
+ func (t *torrent) hashPiece(piece int) (ps pieceSum) {
        hash := pieceHash.New()
        p := &t.Pieces[piece]
        p.pendingWritesMutex.Lock()