From: Matt Joiner <anacrolix@gmail.com>
Date: Tue, 7 Feb 2017 04:01:02 +0000 (+1100)
Subject: dht.Server.Announce now takes [20]byte
X-Git-Tag: v1.0.0~486
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=b868a6b9e2cf372cbaec8e84cfd4682401b1ea46;p=btrtrc.git

dht.Server.Announce now takes [20]byte
---

diff --git a/cmd/dht-get-peers/main.go b/cmd/dht-get-peers/main.go
index 1c0a2776..d72c34e5 100644
--- a/cmd/dht-get-peers/main.go
+++ b/cmd/dht-get-peers/main.go
@@ -9,10 +9,9 @@ import (
 	"os"
 	"os/signal"
 
-	_ "github.com/anacrolix/envpprof"
-
 	"github.com/anacrolix/dht"
 	"github.com/anacrolix/dht/krpc"
+	_ "github.com/anacrolix/envpprof"
 )
 
 var (
@@ -128,7 +127,9 @@ func main() {
 	seen := make(map[string]struct{})
 getPeers:
 	for {
-		ps, err := s.Announce(*infoHash, 0, false)
+		var ih [20]byte
+		copy(ih[:], *infoHash)
+		ps, err := s.Announce(ih, 0, false)
 		if err != nil {
 			log.Fatal(err)
 		}
diff --git a/torrent.go b/torrent.go
index beff7d21..929e0bc6 100644
--- a/torrent.go
+++ b/torrent.go
@@ -1223,7 +1223,7 @@ func (t *Torrent) consumeDHTAnnounce(pvs <-chan dht.PeersValues) {
 
 func (t *Torrent) announceDHT(impliedPort bool) (err error) {
 	cl := t.cl
-	ps, err := cl.dHT.Announce(string(t.infoHash[:]), cl.incomingPeerPort(), impliedPort)
+	ps, err := cl.dHT.Announce(t.infoHash, cl.incomingPeerPort(), impliedPort)
 	if err != nil {
 		return
 	}