Support banning webseeds

client.go

@@ -1493,6 +1493,7 @@ func (cl *Client) banPeerIP(ip net.IP) {
 		t.iterPeers(func(p *Peer) {
 			if p.remoteIp().Equal(ip) {
 				t.logger.Levelf(log.Warning, "dropping peer %v with banned ip %v", p, ip)
+				// Should this be a close?
 				p.drop()
 			}
 		})

peer-impl.go

@@ -20,7 +20,10 @@ type peerImpl interface {
 	connectionFlags() string
 	onClose()
 	onGotInfo(*metainfo.Info)
+	// Drop connection. This may be a no-op if there is no connection.
 	drop()
+	// Rebuke the peer
+	ban()
 	String() string
 	connStatusString() string
 

peerconn.go

@@ -1590,6 +1590,10 @@ func (cn *PeerConn) drop() {
 	cn.t.dropConnection(cn)
 }
 
+func (cn *PeerConn) ban() {
+	cn.t.cl.banPeerIP(cn.remoteIp())
+}
+
 func (cn *Peer) netGoodPiecesDirtied() int64 {
 	return cn._stats.PiecesDirtiedGood.Int64() - cn._stats.PiecesDirtiedBad.Int64()
 }

torrent.go

@@ -2020,8 +2020,7 @@ func (t *Torrent) pieceHashed(piece pieceIndex, passed bool, hashIoErr error) {
 
 			if len(bannableTouchers) >= 1 {
 				c := bannableTouchers[0]
-				t.cl.banPeerIP(c.remoteIp())
-				c.drop()
+				c.ban()
 			}
 		}
 		t.onIncompletePiece(piece)

webseed-peer.go

@@ -114,10 +114,13 @@ func (ws *webseedPeer) connectionFlags() string {
 	return "WS"
 }
 
-// TODO: This is called when banning peers. Perhaps we want to be able to ban webseeds too. We could
-// return bool if this is even possible, and if it isn't, skip to the next drop candidate.
+// Maybe this should drop all existing connections, or something like that.
 func (ws *webseedPeer) drop() {}
 
+func (cn *webseedPeer) ban() {
+	cn.peer.close()
+}
+
 func (ws *webseedPeer) handleUpdateRequests() {
 	// Because this is synchronous, webseed peers seem to get first dibs on newly prioritized
 	// pieces.