changed signature of DHT filter options to be more general

dht_filters.go

@@ -3,12 +3,12 @@ package dht
 import (
 	"bytes"
 	"github.com/libp2p/go-libp2p-core/host"
+	"github.com/libp2p/go-libp2p-core/network"
 	dhtcfg "github.com/libp2p/go-libp2p-kad-dht/internal/config"
 	"net"
 	"sync"
 	"time"
 
-	"github.com/libp2p/go-libp2p-core/network"
 	"github.com/libp2p/go-libp2p-core/peer"
 
 	"github.com/google/gopacket/routing"
@@ -83,13 +83,14 @@ var _ QueryFilterFunc = PublicQueryFilter
 
 // PublicRoutingTableFilter allows a peer to be added to the routing table if the connections to that peer indicate
 // that it is on a public network
-func PublicRoutingTableFilter(dht interface{}, conns []network.Conn) bool {
+func PublicRoutingTableFilter(dht interface{}, p peer.ID) bool {
+	d := dht.(hasHost)
+
+	conns := d.Host().Network().ConnsToPeer(p)
 	if len(conns) == 0 {
 		return false
 	}
 
-	d := dht.(hasHost)
-
 	// Do we have a public address for this peer?
 	id := conns[0].RemotePeer()
 	known := d.Host().Peerstore().PeerInfo(id)
@@ -145,12 +146,19 @@ func getCachedRouter() routing.Router {
 
 // PrivateRoutingTableFilter allows a peer to be added to the routing table if the connections to that peer indicate
 // that it is on a private network
-func PrivateRoutingTableFilter(dht interface{}, conns []network.Conn) bool {
+func PrivateRoutingTableFilter(dht interface{}, p peer.ID) bool {
+	d := dht.(hasHost)
+	conns := d.Host().Network().ConnsToPeer(p)
+	return privRTFilter(d, conns)
+}
+
+func privRTFilter(dht interface{}, conns []network.Conn) bool {
 	d := dht.(hasHost)
+	h := d.Host()
 
 	router := getCachedRouter()
 	myAdvertisedIPs := make([]net.IP, 0)
-	for _, a := range d.Host().Addrs() {
+	for _, a := range h.Addrs() {
 		if isPublicAddr(a) && !isRelayAddr(a) {
 			ip, err := manet.ToIP(a)
 			if err != nil {

dht_filters_test.go

@@ -53,7 +53,7 @@ func TestFilterCaching(t *testing.T) {
 	d := setupDHT(ctx, t, true)
 
 	remote, _ := manet.FromIP(net.IPv4(8, 8, 8, 8))
-	if PrivateRoutingTableFilter(d, []network.Conn{&mockConn{
+	if privRTFilter(d, []network.Conn{&mockConn{
 		local:  d.Host().Peerstore().PeerInfo(d.Host().ID()),
 		remote: peer.AddrInfo{ID: "", Addrs: []ma.Multiaddr{remote}},
 	}}) {

dual/dual_test.go

@@ -2,12 +2,12 @@ package dual
 
 import (
 	"context"
+	"github.com/libp2p/go-libp2p-core/host"
 	"testing"
 	"time"
 
 	"github.com/ipfs/go-cid"
 	u "github.com/ipfs/go-ipfs-util"
-	"github.com/libp2p/go-libp2p-core/network"
 	"github.com/libp2p/go-libp2p-core/peer"
 	peerstore "github.com/libp2p/go-libp2p-core/peerstore"
 	dht "github.com/libp2p/go-libp2p-kad-dht"
@@ -34,9 +34,17 @@ type customRtHelper struct {
 	allow peer.ID
 }
 
-func MkFilterForPeer() (func(_ interface{}, conns []network.Conn) bool, *customRtHelper) {
+func MkFilterForPeer() (func(_ interface{}, p peer.ID) bool, *customRtHelper) {
 	helper := customRtHelper{}
-	f := func(_ interface{}, conns []network.Conn) bool {
+
+	type hasHost interface {
+		Host() host.Host
+	}
+
+	f := func(dht interface{}, p peer.ID) bool {
+		d := dht.(hasHost)
+		conns := d.Host().Network().ConnsToPeer(p)
+
 		for _, c := range conns {
 			if c.RemotePeer() == helper.allow {
 				return true

internal/config/config.go

@@ -8,7 +8,6 @@ import (
 	dssync "github.com/ipfs/go-datastore/sync"
 	"github.com/ipfs/go-ipns"
 	"github.com/libp2p/go-libp2p-core/host"
-	"github.com/libp2p/go-libp2p-core/network"
 	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/libp2p/go-libp2p-core/protocol"
 	"github.com/libp2p/go-libp2p-kad-dht/providers"
@@ -29,7 +28,7 @@ type QueryFilterFunc func(dht interface{}, ai peer.AddrInfo) bool
 
 // RouteTableFilterFunc is a filter applied when considering connections to keep in
 // the local route table.
-type RouteTableFilterFunc func(dht interface{}, conns []network.Conn) bool
+type RouteTableFilterFunc func(dht interface{}, p peer.ID) bool
 
 // Config is a structure containing all the options that can be used when constructing a DHT.
 type Config struct {
@@ -65,8 +64,8 @@ type Config struct {
 	TestAddressUpdateProcessing bool
 }
 
-func EmptyQueryFilter(_ interface{}, ai peer.AddrInfo) bool  { return true }
-func EmptyRTFilter(_ interface{}, conns []network.Conn) bool { return true }
+func EmptyQueryFilter(_ interface{}, ai peer.AddrInfo) bool { return true }
+func EmptyRTFilter(_ interface{}, p peer.ID) bool           { return true }
 
 // Apply applies the given options to this Option
 func (c *Config) Apply(opts ...Option) error {

subscriber_notifee.go

@@ -152,7 +152,7 @@ func (dht *IpfsDHT) validRTPeer(p peer.ID) (bool, error) {
 		return false, err
 	}
 
-	return dht.routingTablePeerFilter == nil || dht.routingTablePeerFilter(dht, dht.Host().Network().ConnsToPeer(p)), nil
+	return dht.routingTablePeerFilter == nil || dht.routingTablePeerFilter(dht, p), nil
 }
 
 type disconnector interface {