From 51431c7cfcfa91ba414af449fb31a7730bc67091 Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Sun, 29 Jun 2014 19:10:59 +1000 Subject: [PATCH] Some minor tweaks --- client.go | 2 +- client_test.go | 11 ----------- torrent.go | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/client.go b/client.go index bdc39177..77e9dce1 100644 --- a/client.go +++ b/client.go @@ -314,7 +314,7 @@ func (me *Client) runConnection(sock net.Conn, torrent *torrent) (err error) { PeerChoked: true, write: make(chan []byte), post: make(chan pp.Message), - PeerMaxRequests: 64, + PeerMaxRequests: 250, // Default in libtorrent is 250. } defer func() { // There's a lock and deferred unlock later in this function. The diff --git a/client_test.go b/client_test.go index 2b45cab9..3c8bc9f0 100644 --- a/client_test.go +++ b/client_test.go @@ -52,17 +52,6 @@ func TestTorrentInitialState(t *testing.T) { } } -func TestUnmarshalCompactPeer(t *testing.T) { - var p Peer - err := bencode.Unmarshal([]byte("6:\x01\x02\x03\x04\x05\x06"), &p) - if err != nil { - t.Fatal(err) - } - if p.IP.String() != "1.2.3.4" { - t.FailNow() - } -} - func TestUnmarshalPEXMsg(t *testing.T) { var m peerExchangeMessage if err := bencode.Unmarshal([]byte("d5:added12:\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0ce"), &m); err != nil { diff --git a/torrent.go b/torrent.go index d98b3fbe..96fd1329 100644 --- a/torrent.go +++ b/torrent.go @@ -240,7 +240,7 @@ func (t *torrent) NumPiecesCompleted() (num int) { } func (t *torrent) Length() int64 { - return int64(t.PieceLength(pp.Integer(len(t.Pieces)-1))) + int64(len(t.Pieces)-1)*int64(t.PieceLength(0)) + return int64(t.LastPieceSize()) + int64(len(t.Pieces)-1)*int64(t.UsualPieceSize()) } func (t *torrent) Close() (err error) { -- 2.48.1