go/torrent-client
1
0
Fork 0
mirror of https://github.com/veggiedefender/torrent-client.git synced 2025-11-06 09:29:16 +02:00
Code Issues Releases Activity

Move handshake into its own package

Browse Source
This commit is contained in:
Jesse Li
2019-12-24 10:39:22 -05:00
parent aa8ef0ed76
commit c20965ebf5
5 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
p2p/p2p.go
View File

@@ -8,6 +8,7 @@ import (
"net"
"strconv"
"github.com/veggiedefender/torrent-client/handshake"
"github.com/veggiedefender/torrent-client/message"
)
@@ -44,7 +45,7 @@ func (d *Downloader) Download() error {
buf := make([]byte, pieceSize)
i := 0
for i < pieceSize {
msg, err := message.ReadMessage(conn)
msg, err := message.Read(conn)
if err != nil {
return err
}
@@ -98,8 +99,8 @@ func (p *Peer) connect(peerID [20]byte, infoHash [20]byte) (net.Conn, error) {
return conn, nil
}
func (d *Downloader) handshake(conn net.Conn) (*message.Handshake, error) {
req := message.Handshake{
func (d *Downloader) handshake(conn net.Conn) (*handshake.Handshake, error) {
req := handshake.Handshake{
Pstr: "BitTorrent protocol",
InfoHash: d.InfoHash,
PeerID: d.PeerID,
@@ -109,7 +110,7 @@ func (d *Downloader) handshake(conn net.Conn) (*message.Handshake, error) {
return nil, err
}
res, err := message.ReadHandshake(conn)
res, err := handshake.Read(conn)
if err != nil {
return nil, err
}