From 075852b8477bac4c18fda6e48956f02baf31c068 Mon Sep 17 00:00:00 2001
From: liwei <liwei2633@163.com>
Date: Tue, 9 Jul 2019 10:34:33 +0800
Subject: [PATCH] fix message encode issue

---
 down/bt/peer/message.go       |  4 ++--
 down/bt/torrent/peer_state.go | 20 ++++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/down/bt/peer/message.go b/down/bt/peer/message.go
index 54706b3c..80ec6621 100644
--- a/down/bt/peer/message.go
+++ b/down/bt/peer/message.go
@@ -4,7 +4,7 @@ import (
 	"encoding/binary"
 )
 
-type MessageID byte
+type MessageID int
 
 const (
 	Keepalive     MessageID = -1
@@ -42,7 +42,7 @@ func (msg *Message) Encode() []byte {
 		buf := make([]byte, 5+len(msg.Payload))
 		binary.BigEndian.PutUint32(buf, msg.Length)
 		buf[4] = byte(msg.ID)
-		buf = append(buf, msg.Payload[:]...)
+		copy(buf[5:], msg.Payload[:])
 		return buf
 	}
 }
diff --git a/down/bt/torrent/peer_state.go b/down/bt/torrent/peer_state.go
index fc70e8d8..e2d8a97b 100644
--- a/down/bt/torrent/peer_state.go
+++ b/down/bt/torrent/peer_state.go
@@ -2,6 +2,7 @@ package torrent
 
 import (
 	"bufio"
+	"encoding/binary"
 	"fmt"
 	"github.com/cenkalti/mse"
 	"gopeed/down/bt/peer"
@@ -26,7 +27,7 @@ type peerState struct {
 }
 
 // 使用MSE加密来避免运营商对bt流量的封锁，基本上现在市面上BT客户端都默认开启了，不用MSE的话很多Peer拒绝连接
-// http://wiki.vuze.com/w/Message_Stream_Encryption
+// see http://wiki.vuze.com/w/Message_Stream_Encryption
 func (ps *peerState) dialMse() error {
 	conn, err := net.Dial("tcp", ps.Address())
 	if err != nil {
@@ -43,7 +44,7 @@ func (ps *peerState) dialMse() error {
 }
 
 // Handshake of Peer wire protocol
-// https://wiki.theory.org/index.php/BitTorrentSpecification#Handshake
+// see https://wiki.theory.org/index.php/BitTorrentSpecification#Handshake
 func (ps *peerState) handshake() (*peer.Handshake, error) {
 	handshakeRes, err := func() (*peer.Handshake, error) {
 		handshakeReq := peer.NewHandshake([8]byte{}, ps.torrent.MetaInfo.InfoHash, ps.torrent.PeerID)
@@ -79,7 +80,6 @@ func (ps *peerState) handshake() (*peer.Handshake, error) {
 	return handshakeRes, nil
 }
 
-//
 func (ps *peerState) download() error {
 	scanner := bufio.NewScanner(ps.conn)
 	scanner.Split(peer.SplitMessage)
@@ -124,9 +124,17 @@ func (ps *peerState) handleUnchoke() {
 	if ps.amInterested {
 		have := ps.getHavePieces(ps.bitfield)
 		if len(have) > 0 {
-			/*for _, index := range have {
-				ps.conn.Write((&peer.Message{13, peer.Request,}))
-			}*/
+			for i := range have {
+				buf := make([]byte, 12)
+				binary.BigEndian.PutUint32(buf[:4], uint32(have[i]))
+				binary.BigEndian.PutUint32(buf[4:8], 0)
+				binary.BigEndian.PutUint32(buf[8:], 2<<13)
+				_, err := ps.conn.Write(peer.NewMessage(peer.Request, buf).Encode())
+				if err != nil {
+					ps.conn.Close()
+					return
+				}
+			}
 			return
 		}
 	}