opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-19 18:05:32 +08:00
Code Issues Projects Releases Wiki Activity

p2p/net/filter: Guard with a mutex

Browse Source 
Callers assume this is safe to call whenever, let's make it so.

License: MIT
Signed-off-by: Tommi Virtanen <tv@eagain.net>
This commit is contained in:
Tommi Virtanen
2015-09-01 16:49:38 -07:00
committed by Jeromy
parent 6e126ed79d
commit e49e610b07
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
p2p/net/filter/filter.go
View File

@ -3,12 +3,14 @@ package filter
import ( import (
"net" "net"
"strings" "strings"
"sync"
ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr" ma "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net" manet "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr-net"
) )
type Filters struct { type Filters struct {
mu sync.RWMutex
filters map[string]*net.IPNet filters map[string]*net.IPNet
} }
@ -19,6 +21,8 @@ func NewFilters() *Filters {
} }
func (fs *Filters) AddDialFilter(f *net.IPNet) { func (fs *Filters) AddDialFilter(f *net.IPNet) {
fs.mu.Lock()
defer fs.mu.Unlock()
fs.filters[f.String()] = f fs.filters[f.String()] = f
} }
@ -31,6 +35,8 @@ func (f *Filters) AddrBlocked(a ma.Multiaddr) bool {
ipstr := strings.Split(addr, ":")[0] ipstr := strings.Split(addr, ":")[0]
ip := net.ParseIP(ipstr) ip := net.ParseIP(ipstr)
f.mu.RLock()
defer f.mu.RUnlock()
for _, ft := range f.filters { for _, ft := range f.filters {
if ft.Contains(ip) { if ft.Contains(ip) {
return true return true
@ -41,6 +47,8 @@ func (f *Filters) AddrBlocked(a ma.Multiaddr) bool {
func (f *Filters) Filters() []*net.IPNet { func (f *Filters) Filters() []*net.IPNet {
var out []*net.IPNet var out []*net.IPNet
f.mu.RLock()
defer f.mu.RUnlock()
for _, ff := range f.filters { for _, ff := range f.filters {
out = append(out, ff) out = append(out, ff)
} }
@ -48,5 +56,7 @@ func (f *Filters) Filters() []*net.IPNet {
} }
func (f *Filters) Remove(ff *net.IPNet) { func (f *Filters) Remove(ff *net.IPNet) {
f.mu.Lock()
defer f.mu.Unlock()
delete(f.filters, ff.String()) delete(f.filters, ff.String())
} }