zishuo/go-libp2p
1
0
Fork 0
mirror of https://github.com/libp2p/go-libp2p.git synced 2025-09-26 20:21:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

make the {F=>f}iltersConnectionGater private. (#946)

Browse Source
This commit is contained in:
Raúl Kripalani
2020-05-20 16:27:31 +01:00
committed by GitHub
parent 79ead33e32
commit d4d6adff6e
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
options.go
View File

@@ -333,20 +333,20 @@ func AutoNATServiceRateLimit(global, perPeer int, interval time.Duration) Option
// Deprecated: Please use ConnectionGater() instead.
func FilterAddresses(addrs ...*net.IPNet) Option {
return func(cfg *Config) error {
var f *FiltersConnectionGater
var f *filtersConnectionGater
// preserve backwards compatibility.
// if we have a connection gater, try to cast it to a *FiltersConnectionGater.
// if we have a connection gater, try to cast it to a *filtersConnectionGater.
if cfg.ConnectionGater != nil {
var ok bool
if f, ok = cfg.ConnectionGater.(*FiltersConnectionGater); !ok {
if f, ok = cfg.ConnectionGater.(*filtersConnectionGater); !ok {
return errors.New("cannot configure both Filters and Connection Gater. " +
"\n Please consider configuring just a ConnectionGater instead.")
}
}
if f == nil {
f = (*FiltersConnectionGater)(ma.NewFilters())
f = (*filtersConnectionGater)(ma.NewFilters())
cfg.ConnectionGater = f
}
@@ -374,7 +374,7 @@ func Filters(filters *ma.Filters) Option {
"\n Please consider configuring just a ConnectionGater instead.")
}
cfg.ConnectionGater = (*FiltersConnectionGater)(filters)
cfg.ConnectionGater = (*filtersConnectionGater)(filters)
return nil
}
}

19
options_filter.go
View File

@@ -9,29 +9,28 @@ import (
ma "github.com/multiformats/go-multiaddr"
)
// FiltersConnectionGater is an adapter that turns multiaddr.Filter into a
// connmgr.ConnectionGater. It's not intended to be used directly by the user,
// but it can.
type FiltersConnectionGater ma.Filters
// filtersConnectionGater is an adapter that turns multiaddr.Filter into a
// connmgr.ConnectionGater.
type filtersConnectionGater ma.Filters
var _ connmgr.ConnectionGater = (*FiltersConnectionGater)(nil)
var _ connmgr.ConnectionGater = (*filtersConnectionGater)(nil)
func (f *FiltersConnectionGater) InterceptAddrDial(_ peer.ID, addr ma.Multiaddr) (allow bool) {
func (f *filtersConnectionGater) InterceptAddrDial(_ peer.ID, addr ma.Multiaddr) (allow bool) {
return !(*ma.Filters)(f).AddrBlocked(addr)
}
func (f *FiltersConnectionGater) InterceptPeerDial(p peer.ID) (allow bool) {
func (f *filtersConnectionGater) InterceptPeerDial(p peer.ID) (allow bool) {
return true
}
func (f *FiltersConnectionGater) InterceptAccept(_ network.ConnMultiaddrs) (allow bool) {
func (f *filtersConnectionGater) InterceptAccept(_ network.ConnMultiaddrs) (allow bool) {
return true
}
func (f *FiltersConnectionGater) InterceptSecured(_ network.Direction, _ peer.ID, _ network.ConnMultiaddrs) (allow bool) {
func (f *filtersConnectionGater) InterceptSecured(_ network.Direction, _ peer.ID, _ network.ConnMultiaddrs) (allow bool) {
return true
}
func (f *FiltersConnectionGater) InterceptUpgraded(_ network.Conn) (allow bool, reason control.DisconnectReason) {
func (f *filtersConnectionGater) InterceptUpgraded(_ network.Conn) (allow bool, reason control.DisconnectReason) {
return true, 0
}