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: change close when the peer is not metered

Browse source
This commit is contained in:
Kurkó Mihály 2018-09-19 12:14:33 +03:00
parent c0af8b14af
commit 269e16945c
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
p2p/metrics.go
View file

@ -153,7 +153,7 @@ 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 NodeID, // 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(id enode.ID) { func (c *meteredConn) handshakeDone(id enode.ID) {
if atomic.LoadInt32(&meteredPeerCount) >= MeteredPeerLimit { if atomic.LoadInt32(&meteredPeerCount) >= MeteredPeerLimit {
@ -180,11 +180,14 @@ func (c *meteredConn) handshakeDone(id enode.ID) {
// Close delegates a close operation to the underlying connection, unregisters // Close delegates a close operation to the underlying connection, unregisters
// the peer from the traffic registries and emits close event. // the peer from the traffic registries and emits close event.
func (c *meteredConn) Close() error { func (c *meteredConn) Close() error {
err := c.Conn.Close()
c.lock.RLock() c.lock.RLock()
if c.metered { if !c.metered {
c.lock.RUnlock()
return err
}
// Decrement the metered peer count // Decrement the metered peer count
atomic.AddInt32(&meteredPeerCount, -1) atomic.AddInt32(&meteredPeerCount, -1)
}
if c.id == "" { if c.id == "" {
// If the peer disconnects before the handshake // If the peer disconnects before the handshake
c.lock.RUnlock() c.lock.RUnlock()
@ -193,7 +196,7 @@ func (c *meteredConn) Close() error {
IP: c.ip, IP: c.ip,
Elapsed: time.Since(c.connected), Elapsed: time.Since(c.connected),
}) })
return c.Conn.Close() return err
} }
id, ingress, egress := c.id, uint64(c.ingressMeter.Count()), uint64(c.egressMeter.Count()) id, ingress, egress := c.id, uint64(c.ingressMeter.Count()), uint64(c.egressMeter.Count())
c.lock.RUnlock() c.lock.RUnlock()
@ -210,5 +213,5 @@ func (c *meteredConn) Close() error {
Ingress: ingress, Ingress: ingress,
Egress: egress, Egress: egress,
}) })
return c.Conn.Close() return err
} }