From 860184d54285738322ca697b1666040183e05e76 Mon Sep 17 00:00:00 2001
From: baptiste-b-pegasys
<85155432+baptiste-b-pegasys@users.noreply.github.com>
Date: Thu, 29 Jul 2021 17:50:18 +0200
Subject: [PATCH] p2p: remove term "whitelist" (#23295)
Co-authored-by: Felix Lange <fjl@twurst.com>
---
p2p/dial.go | 6 +++---
p2p/discover/common.go | 2 +-
p2p/discover/v4_udp.go | 2 +-
p2p/server.go | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/p2p/dial.go b/p2p/dial.go
index d36d66550..83ced3cb3 100644
--- a/p2p/dial.go
+++ b/p2p/dial.go
@@ -77,7 +77,7 @@ var (
errAlreadyDialing = errors.New("already dialing")
errAlreadyConnected = errors.New("already connected")
errRecentlyDialed = errors.New("recently dialed")
- errNotWhitelisted = errors.New("not contained in netrestrict whitelist")
+ errNetRestrict = errors.New("not contained in netrestrict list")
errNoPort = errors.New("node does not provide TCP port")
)
@@ -133,7 +133,7 @@ type dialConfig struct {
self enode.ID // our own ID
maxDialPeers int // maximum number of dialed peers
maxActiveDials int // maximum number of active dials
- netRestrict *netutil.Netlist // IP whitelist, disabled if nil
+ netRestrict *netutil.Netlist // IP netrestrict list, disabled if nil
resolver nodeResolver
dialer NodeDialer
log log.Logger
@@ -402,7 +402,7 @@ func (d *dialScheduler) checkDial(n *enode.Node) error {
return errAlreadyConnected
}
if d.netRestrict != nil && !d.netRestrict.Contains(n.IP()) {
- return errNotWhitelisted
+ return errNetRestrict
}
if d.history.contains(string(n.ID().Bytes())) {
return errRecentlyDialed
diff --git a/p2p/discover/common.go b/p2p/discover/common.go
index 3708bfb72..e389821fd 100644
--- a/p2p/discover/common.go
+++ b/p2p/discover/common.go
@@ -41,7 +41,7 @@ type Config struct {
PrivateKey *ecdsa.PrivateKey
// These settings are optional:
- NetRestrict *netutil.Netlist // network whitelist
+ NetRestrict *netutil.Netlist // list of allowed IP networks
Bootnodes []*enode.Node // list of bootstrap nodes
Unhandled chan<- ReadPacket // unhandled packets are sent on this channel
Log log.Logger // if set, log messages go here
diff --git a/p2p/discover/v4_udp.go b/p2p/discover/v4_udp.go
index 2b3eb4839..334716aeb 100644
--- a/p2p/discover/v4_udp.go
+++ b/p2p/discover/v4_udp.go
@@ -583,7 +583,7 @@ func (t *UDPv4) nodeFromRPC(sender *net.UDPAddr, rn v4wire.Node) (*node, error)
return nil, err
}
if t.netrestrict != nil && !t.netrestrict.Contains(rn.IP) {
- return nil, errors.New("not contained in netrestrict whitelist")
+ return nil, errors.New("not contained in netrestrict list")
}
key, err := v4wire.DecodePubkey(crypto.S256(), rn.ID)
if err != nil {
diff --git a/p2p/server.go b/p2p/server.go
index 04fdecaec..bcfc1bd10 100644
--- a/p2p/server.go
+++ b/p2p/server.go
@@ -353,7 +353,7 @@ func (srv *Server) RemovePeer(node *enode.Node) {
}
}
-// AddTrustedPeer adds the given node to a reserved whitelist which allows the
+// AddTrustedPeer adds the given node to a reserved trusted list which allows the
// node to always connect, even if the slot are full.
func (srv *Server) AddTrustedPeer(node *enode.Node) {
select {
@@ -903,7 +903,7 @@ func (srv *Server) checkInboundConn(remoteIP net.IP) error {
}
// Reject connections that do not match NetRestrict.
if srv.NetRestrict != nil && !srv.NetRestrict.Contains(remoteIP) {
- return fmt.Errorf("not whitelisted in NetRestrict")
+ return fmt.Errorf("not in netrestrict list")
}
// Reject Internet peers that try too often.
now := srv.clock.Now()
--
GitLab