Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Basic support for responding to HashRequest #969

Merged
merged 2 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions peer_protocol/msg.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,19 @@ type MessageWriter interface {
io.Writer
}

func (msg *Message) writePayloadTo(buf MessageWriter) (err error) {
mustWrite := func(data any) {
err := binary.Write(buf, binary.BigEndian, data)
if err != nil {
panic(err)
}
func (msg *Message) writeHashCommon(buf MessageWriter) (err error) {
if _, err = buf.Write(msg.PiecesRoot[:]); err != nil {
return
}
writeConsecutive := func(data ...any) {
for _, d := range data {
mustWrite(d)
for _, d := range []Integer{msg.BaseLayer, msg.Index, msg.Length, msg.ProofLayers} {
if err = binary.Write(buf, binary.BigEndian, d); err != nil {
return
}
}
return nil
}

func (msg *Message) writePayloadTo(buf MessageWriter) (err error) {
if !msg.Keepalive {
err = buf.WriteByte(byte(msg.Type))
if err != nil {
Expand Down Expand Up @@ -119,9 +120,18 @@ func (msg *Message) writePayloadTo(buf MessageWriter) (err error) {
_, err = buf.Write(msg.ExtendedPayload)
case Port:
err = binary.Write(buf, binary.BigEndian, msg.Port)
case HashRequest:
buf.Write(msg.PiecesRoot[:])
writeConsecutive(msg.BaseLayer, msg.Index, msg.Length, msg.ProofLayers)
case HashRequest, HashReject:
err = msg.writeHashCommon(buf)
case Hashes:
err = msg.writeHashCommon(buf)
if err != nil {
return
}
for _, h := range msg.Hashes {
if _, err = buf.Write(h[:]); err != nil {
return
}
}
default:
err = fmt.Errorf("unknown message type: %v", msg.Type)
}
Expand Down
67 changes: 66 additions & 1 deletion peerconn.go
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,9 @@ func (c *PeerConn) mainReadLoop() (err error) {
err = c.onReadExtendedMsg(msg.ExtendedID, msg.ExtendedPayload)
case pp.Hashes:
err = c.onReadHashes(&msg)
case pp.HashRequest, pp.HashReject:
case pp.HashRequest:
err = c.onHashRequest(&msg)
case pp.HashReject:
c.protocolLogger.Levelf(log.Info, "received unimplemented BitTorrent v2 message: %v", msg.Type)
default:
err = fmt.Errorf("received unknown message type: %#v", msg.Type)
Expand Down Expand Up @@ -1356,6 +1358,69 @@ func (pc *PeerConn) onReadHashes(msg *pp.Message) (err error) {
return nil
}

func (pc *PeerConn) getHashes(msg *pp.Message) ([][32]byte, error) {
if msg.ProofLayers != 0 {
return nil, errors.New("proof layers not supported")
}
if msg.Length > 8192 {
return nil, fmt.Errorf("requested too many hashes: %d", msg.Length)
}
file := pc.t.getFileByPiecesRoot(msg.PiecesRoot)
if file == nil {
return nil, fmt.Errorf("no file for pieces root %x", msg.PiecesRoot)
}
beginPieceIndex := file.BeginPieceIndex()
endPieceIndex := file.EndPieceIndex()
length := merkle.RoundUpToPowerOfTwo(uint(endPieceIndex - beginPieceIndex))
if uint(msg.Index+msg.Length) > length {
return nil, errors.New("invalid hash range")
}

hashes := make([][32]byte, msg.Length)
padHash := metainfo.HashForPiecePad(int64(pc.t.usualPieceSize()))
for i := range hashes {
torrentPieceIndex := beginPieceIndex + int(msg.Index) + i
if torrentPieceIndex >= endPieceIndex {
hashes[i] = padHash
continue
}
piece := pc.t.piece(torrentPieceIndex)
hash, err := piece.obtainHashV2()
if err != nil {
return nil, fmt.Errorf("can't get hash for piece %d: %w", torrentPieceIndex, err)
}
hashes[i] = hash
}
return hashes, nil
}

func (pc *PeerConn) onHashRequest(msg *pp.Message) error {
if !pc.t.info.HasV2() {
return errors.New("torrent has no v2 metadata")
}

resp := pp.Message{
PiecesRoot: msg.PiecesRoot,
BaseLayer: msg.BaseLayer,
Index: msg.Index,
Length: msg.Length,
ProofLayers: msg.ProofLayers,
}

hashes, err := pc.getHashes(msg)
if err != nil {
pc.protocolLogger.WithNames(v2HashesLogName).Levelf(log.Debug, "error getting hashes: %v", err)
resp.Type = pp.HashReject
pc.write(resp)
return nil
}

resp.Type = pp.Hashes
resp.Hashes = hashes
pc.write(resp)
return nil
}

type hashRequest struct {
piecesRoot [32]byte
baseLayer, index, length, proofLayers pp.Integer
Expand Down
27 changes: 26 additions & 1 deletion piece.go
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package torrent

import (
"errors"
"fmt"
"sync"

"github.com/anacrolix/chansync"
g "github.com/anacrolix/generics"
"github.com/anacrolix/missinggo/v2/bitmap"

"github.com/anacrolix/torrent/merkle"
"github.com/anacrolix/torrent/metainfo"
pp "github.com/anacrolix/torrent/peer_protocol"
"github.com/anacrolix/torrent/storage"
Expand Down Expand Up @@ -307,5 +309,28 @@ func (p *Piece) haveHash() bool {
}

func (p *Piece) hasPieceLayer() bool {
return int64(p.length()) > p.t.info.PieceLength
return len(p.files) == 1 && p.files[0].length > p.t.info.PieceLength
}

func (p *Piece) obtainHashV2() (hash [32]byte, err error) {
if p.hashV2.Ok {
hash = p.hashV2.Value
return
}
if !p.hasPieceLayer() {
hash = p.mustGetOnlyFile().piecesRoot.Unwrap()
return
}
storage := p.Storage()
if !storage.Completion().Complete {
err = errors.New("piece incomplete")
return
}

h := merkle.NewHash()
if _, err = storage.WriteTo(h); err != nil {
return
}
h.SumMinLength(hash[:0], int(p.t.info.PieceLength))
return
}
Loading