forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 18:32:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

p2p: documentation, rename nodeID to id

Browse source
This commit is contained in:
Kurkó Mihály 2018-10-17 16:52:33 +03:00
parent 67c6281ab2
commit 100c6c9f47
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
p2p/enode/node.go
View file

@ -254,6 +254,7 @@ func RandomID(a ID, n int) (b ID) {
return b return b
} }
// Equal returns a boolean reporting whether a and b contain the same bytes.
func Equal(a, b ID) bool { func Equal(a, b ID) bool {
for i := range a { for i := range a {
if a[i] != b[i] { if a[i] != b[i] {

10
p2p/metrics.go
View file

@ -160,18 +160,18 @@ func (c *meteredConn) Write(b []byte) (n int, err error) {
// handshakeDone is called when a peer handshake is done. Registers the peer to // handshakeDone is called when a peer handshake is done. Registers the peer to
// the ingress and the egress traffic registries using the peer's IP and node ID, // the ingress and the egress traffic registries using the peer's IP and node ID,
// also emits connect event. // also emits connect event.
func (c *meteredConn) handshakeDone(nodeID enode.ID) { func (c *meteredConn) handshakeDone(id enode.ID) {
if atomic.AddInt32(&meteredPeerCount, 1) >= MeteredPeerLimit { if atomic.AddInt32(&meteredPeerCount, 1) >= MeteredPeerLimit {
// Don't register the peer in the traffic registries. // Don't register the peer in the traffic registries.
atomic.AddInt32(&meteredPeerCount, -1) atomic.AddInt32(&meteredPeerCount, -1)
c.lock.Lock() c.lock.Lock()
c.id, c.trafficMetered = nodeID, false c.id, c.trafficMetered = id, false
c.lock.Unlock() c.lock.Unlock()
log.Warn("Metered peer count reached the limit") log.Warn("Metered peer count reached the limit")
} else { } else {
key := fmt.Sprintf("%s/%s", c.ip, nodeID.String()) key := fmt.Sprintf("%s/%s", c.ip, id.String())
c.lock.Lock() c.lock.Lock()
c.id, c.trafficMetered = nodeID, true c.id, c.trafficMetered = id, true
c.ingressMeter = metrics.NewRegisteredMeter(key, PeerIngressRegistry) c.ingressMeter = metrics.NewRegisteredMeter(key, PeerIngressRegistry)
c.egressMeter = metrics.NewRegisteredMeter(key, PeerEgressRegistry) c.egressMeter = metrics.NewRegisteredMeter(key, PeerEgressRegistry)
c.lock.Unlock() c.lock.Unlock()
@ -179,7 +179,7 @@ func (c *meteredConn) handshakeDone(nodeID enode.ID) {
meteredPeerFeed.Send(MeteredPeerEvent{ meteredPeerFeed.Send(MeteredPeerEvent{
Type: PeerConnected, Type: PeerConnected,
IP: c.ip, IP: c.ip,
ID: nodeID, ID: id,
Elapsed: time.Since(c.connected), Elapsed: time.Since(c.connected),
}) })
} }