]> Sergey Matveev's repositories - btrtrc.git/commitdiff
If IP blocklists are enabled, block anything that isn't IPv4
authorMatt Joiner <anacrolix@gmail.com>
Wed, 1 Apr 2015 06:36:51 +0000 (17:36 +1100)
committerMatt Joiner <anacrolix@gmail.com>
Wed, 1 Apr 2015 06:36:51 +0000 (17:36 +1100)
I know of no public IPv6 blocklists.

client.go

index f6533a645216cbcb9cce75b3c12a8d14889ee634..9b60a3a82c789f95643eee1b9286c54fe141797b 100644 (file)
--- 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
 }