From: Matt Joiner <anacrolix@gmail.com>
Date: Wed, 1 Apr 2015 06:36:51 +0000 (+1100)
Subject: If IP blocklists are enabled, block anything that isn't IPv4
X-Git-Tag: v1.0.0~1214
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=97c235440cef9243feebbff404ca9ffac57d3dac;p=btrtrc.git

If IP blocklists are enabled, block anything that isn't IPv4

I know of no public IPv6 blocklists.
---

diff --git a/client.go b/client.go
index f6533a64..9b60a3a8 100644
--- a/client.go
+++ b/client.go
@@ -623,13 +623,13 @@ func (cl *Client) ipBlockRange(ip net.IP) (r *iplist.Range) {
 	if cl.ipBlockList == nil {
 		return
 	}
-	ip = ip.To4()
-	if ip == nil {
-		log.Printf("saw non-IPv4 address")
+	ip4 := ip.To4()
+	if ip4 == nil {
+		log.Printf("blocking non-IPv4 address: %s", ip)
 		r = &ipv6BlockRange
 		return
 	}
-	r = cl.ipBlockList.Lookup(ip)
+	r = cl.ipBlockList.Lookup(ip4)
 	return
 }