From 7a7f468d9d16d794119d98245228bf661e210d73 Mon Sep 17 00:00:00 2001
From: Matt Joiner <anacrolix@gmail.com>
Date: Mon, 19 Feb 2018 16:20:08 +1100
Subject: [PATCH] cmd/tracker-announce: Rework to be faster and support UDP
 IPv6

---
 cmd/tracker-announce/main.go | 66 ++++++++++++++++++++++++++++++------
 1 file changed, 55 insertions(+), 11 deletions(-)

diff --git a/cmd/tracker-announce/main.go b/cmd/tracker-announce/main.go
index 4622a181..3cdffa29 100644
--- a/cmd/tracker-announce/main.go
+++ b/cmd/tracker-announce/main.go
@@ -1,16 +1,17 @@
 package main
 
 import (
-	"flag"
 	"log"
 	"math"
+	"net/url"
 	"strings"
+	"sync"
 
-	"github.com/davecgh/go-spew/spew"
-
+	"github.com/anacrolix/tagflag"
 	"github.com/anacrolix/torrent"
 	"github.com/anacrolix/torrent/metainfo"
 	"github.com/anacrolix/torrent/tracker"
+	"github.com/davecgh/go-spew/spew"
 )
 
 func argSpec(arg string) (ts *torrent.TorrentSpec, err error) {
@@ -26,12 +27,17 @@ func argSpec(arg string) (ts *torrent.TorrentSpec, err error) {
 }
 
 func main() {
-	flag.Parse()
+	flags := struct {
+		tagflag.StartPos
+		Torrents []string `arity:"+"`
+	}{}
+	tagflag.Parse(&flags)
 	ar := tracker.AnnounceRequest{
 		NumWant: -1,
 		Left:    math.MaxUint64,
 	}
-	for _, arg := range flag.Args() {
+	var wg sync.WaitGroup
+	for _, arg := range flags.Torrents {
 		ts, err := argSpec(arg)
 		if err != nil {
 			log.Fatal(err)
@@ -39,13 +45,51 @@ func main() {
 		ar.InfoHash = ts.InfoHash
 		for _, tier := range ts.Trackers {
 			for _, tURI := range tier {
-				resp, err := tracker.Announce(torrent.DefaultHTTPClient, torrent.DefaultHTTPUserAgent, tURI, &ar)
-				if err != nil {
-					log.Print(err)
-					continue
-				}
-				log.Printf("%q: %s", tURI, spew.Sdump(resp))
+				wg.Add(1)
+				go doTracker(tURI, wg.Done)
 			}
 		}
 	}
+	wg.Wait()
+}
+
+func doTracker(tURI string, done func()) {
+	defer done()
+	for _, res := range announces(tURI) {
+		err := res.error
+		resp := res.AnnounceResponse
+		if err != nil {
+			log.Printf("error announcing to %q: %s", tURI, err)
+			continue
+		}
+		log.Printf("tracker response from %q: %s", tURI, spew.Sdump(resp))
+	}
+}
+
+type announceResult struct {
+	tracker.AnnounceResponse
+	error
+}
+
+func announces(uri string) (ret []announceResult) {
+	u, err := url.Parse(uri)
+	if err != nil {
+		return []announceResult{{error: err}}
+	}
+	a := tracker.Announce{
+		TrackerUrl: uri,
+	}
+	if u.Scheme == "udp" {
+		a.UdpNetwork = "udp4"
+		ret = append(ret, announce(a))
+		a.UdpNetwork = "udp6"
+		ret = append(ret, announce(a))
+		return
+	}
+	return []announceResult{announce(a)}
+}
+
+func announce(a tracker.Announce) announceResult {
+	resp, err := a.Do()
+	return announceResult{resp, err}
 }
-- 
2.50.0