add filters from config to addr filter in swarm

whyrusleeping · whyrusleeping · commit e7fd57f69a90 · 2015-06-30T15:03:56.000-07:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
diff --git a/core/core.go b/core/core.go
@@ -533,6 +533,10 @@ func constructPeerHost(ctx context.Context, id peer.ID, ps peer.Peerstore, bwr m
 		return nil, err
 	}
 
+	for _, f := range fs {
+		network.Swarm().Filters.AddDialFilter(f)
+	}
+
 	host := p2pbhost.New(network, p2pbhost.NATPortMap, bwr)
 
 	return host, nil
diff --git a/p2p/net/swarm/swarm.go b/p2p/net/swarm/swarm.go
@@ -20,6 +20,7 @@ import (
 	pst "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream/transport"
 	psy "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-peerstream/transport/yamux"
 	prom "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus"
+	mafilter "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/whyrusleeping/multiaddr-filter"
 	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
@@ -101,6 +102,16 @@ func (s *Swarm) teardown() error {
 	return s.swarm.Close()
 }
 
+func (s *Swarm) AddAddrFilter(f string) error {
+	m, err := mafilter.NewMask(f)
+	if err != nil {
+		return err
+	}
+
+	s.Filters.AddDialFilter(m)
+	return nil
+}
+
 // CtxGroup returns the Context Group of the swarm
 func filterAddrs(listenAddrs []ma.Multiaddr) ([]ma.Multiaddr, error) {
 	if len(listenAddrs) > 0 {

Original file line number	Diff line number	Diff line change
`@@ -533,6 +533,10 @@ func constructPeerHost(ctx context.Context, id peer.ID, ps peer.Peerstore, bwr m`
`533`	`533`	`return nil, err`
`534`	`534`	`}`
`535`	`535`
	`536`	`+ for _, f := range fs {`
	`537`	`+ network.Swarm().Filters.AddDialFilter(f)`
	`538`	`+ }`
	`539`	`+`
`536`	`540`	`host := p2pbhost.New(network, p2pbhost.NATPortMap, bwr)`
`537`	`541`
`538`	`542`	`return host, nil`