From: Matt Joiner <anacrolix@gmail.com>
Date: Mon, 19 Feb 2018 05:20:31 +0000 (+1100)
Subject: cmd/torrent: Add packed-blocklist flag
X-Git-Tag: v1.0.0~159
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=5a7c4fc135eda0996079a46b43bc0ee8116d7093;p=btrtrc.git

cmd/torrent: Add packed-blocklist flag
---

diff --git a/cmd/torrent/main.go b/cmd/torrent/main.go
index 30490132..d4dba223 100644
--- a/cmd/torrent/main.go
+++ b/cmd/torrent/main.go
@@ -11,6 +11,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/anacrolix/torrent/iplist"
+
 	"github.com/anacrolix/dht"
 	"github.com/anacrolix/envpprof"
 	"github.com/anacrolix/tagflag"
@@ -121,13 +123,14 @@ func addTorrents(client *torrent.Client) {
 }
 
 var flags = struct {
-	Mmap         bool           `help:"memory-map torrent data"`
-	TestPeer     []*net.TCPAddr `help:"addresses of some starting peers"`
-	Seed         bool           `help:"seed after download is complete"`
-	Addr         *net.TCPAddr   `help:"network listen addr"`
-	UploadRate   tagflag.Bytes  `help:"max piece bytes to send per second"`
-	DownloadRate tagflag.Bytes  `help:"max bytes per second down from peers"`
-	Debug        bool
+	Mmap            bool           `help:"memory-map torrent data"`
+	TestPeer        []*net.TCPAddr `help:"addresses of some starting peers"`
+	Seed            bool           `help:"seed after download is complete"`
+	Addr            *net.TCPAddr   `help:"network listen addr"`
+	UploadRate      tagflag.Bytes  `help:"max piece bytes to send per second"`
+	DownloadRate    tagflag.Bytes  `help:"max bytes per second down from peers"`
+	Debug           bool
+	PackedBlocklist string
 	tagflag.StartPos
 	Torrent []string `arity:"+" help:"torrent file path or magnet uri"`
 }{
@@ -151,6 +154,14 @@ func main() {
 		Debug: flags.Debug,
 		Seed:  flags.Seed,
 	}
+	if flags.PackedBlocklist != "" {
+		blocklist, err := iplist.MMapPackedFile(flags.PackedBlocklist)
+		if err != nil {
+			log.Fatalf("error loading blocklist: %s", err)
+		}
+		defer blocklist.Close()
+		clientConfig.IPBlocklist = blocklist
+	}
 	if flags.Mmap {
 		clientConfig.DefaultStorage = storage.NewMMap("")
 	}