status-im
/
go-libp2p
mirror of https://github.com/status-im/go-libp2p.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use a RWMutex

This commit is contained in:
vyzo 2020-11-10 15:53:30 +02:00
parent 122cdf31a6
commit fd44d15e8d
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
p2p/net/conngater/conngater.go
View File

@ -19,7 +19,7 @@ import (
)
type BasicConnectionGater struct {
sync.Mutex
sync.RWMutex
blockedPeers map[peer.ID]struct{}
blockedAddrs map[string]struct{}
@ -143,8 +143,8 @@ func (cg *BasicConnectionGater) UnblockPeer(p peer.ID) {
// ListBlockedPeers return a list of blocked peers
func (cg *BasicConnectionGater) ListBlockedPeers() []peer.ID {
cg.Lock()
defer cg.Unlock()
cg.RLock()
defer cg.RUnlock()
result := make([]peer.ID, 0, len(cg.blockedPeers))
for p := range cg.blockedPeers {
@ -186,8 +186,8 @@ func (cg *BasicConnectionGater) UnblockAddr(ip net.IP) {
// ListBlockedAddrs return a list of blocked IP addresses
func (cg *BasicConnectionGater) ListBlockedAddrs() []net.IP {
cg.Lock()
defer cg.Unlock()
cg.RLock()
defer cg.RUnlock()
result := make([]net.IP, 0, len(cg.blockedAddrs))
for ipStr := range cg.blockedAddrs {
@ -230,8 +230,8 @@ func (cg *BasicConnectionGater) UnblockSubnet(ipnet *net.IPNet) {
// ListBlockedSubnets return a list of blocked IP subnets
func (cg *BasicConnectionGater) ListBlockedSubnets() []*net.IPNet {
cg.Lock()
defer cg.Unlock()
cg.RLock()
defer cg.RUnlock()
result := make([]*net.IPNet, 0, len(cg.blockedSubnets))
for _, ipnet := range cg.blockedSubnets {
@ -245,8 +245,8 @@ func (cg *BasicConnectionGater) ListBlockedSubnets() []*net.IPNet {
var _ connmgr.ConnectionGater = (*BasicConnectionGater)(nil)
func (cg *BasicConnectionGater) InterceptPeerDial(p peer.ID) (allow bool) {
cg.Lock()
defer cg.Unlock()
cg.RLock()
defer cg.RUnlock()
_, block := cg.blockedPeers[p]
return !block
@ -254,8 +254,8 @@ func (cg *BasicConnectionGater) InterceptPeerDial(p peer.ID) (allow bool) {
func (cg *BasicConnectionGater) InterceptAddrDial(p peer.ID, a ma.Multiaddr) (allow bool) {
// we have already filrted blocked peersin InterceptPeerDial, so we just check the IP
cg.Lock()
defer cg.Unlock()
cg.RLock()
defer cg.RUnlock()
ip, err := manet.ToIP(a)
if err != nil {
@ -278,8 +278,8 @@ func (cg *BasicConnectionGater) InterceptAddrDial(p peer.ID, a ma.Multiaddr) (al
}
func (cg *BasicConnectionGater) InterceptAccept(cma network.ConnMultiaddrs) (allow bool) {
cg.Lock()
defer cg.Unlock()
cg.RLock()
defer cg.RUnlock()
a := cma.RemoteMultiaddr()
@ -310,8 +310,8 @@ func (cg *BasicConnectionGater) InterceptSecured(dir network.Direction, p peer.I
}
// we have already filtered addrs in InterceptAccept, so we just check the peer ID
cg.Lock()
defer cg.Unlock()
cg.RLock()
defer cg.RUnlock()
_, block := cg.blockedPeers[p]
return !block