Some minor tweaks

diff --git a/client.go b/client.go
index bdc391779f33fbcc7ad3638f07bcf92375f3f64c..77e9dce1ca8cd99933c6506ee5bf3b02e23f9ce4 100644 (file)
--- 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 2b45cab99efd3b0e8d3b3754e9e33b714e11732d..3c8bc9f0ed0a47b130979cfcaa577e048855076d 100644 (file)
--- 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 d98b3fbe8f955f9ef0e20bdaf2bbfebce76304d9..96fd13295548f1b21e1364c7a1bfe7870e46acfd 100644 (file)
--- 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) {