94a8b296e4
Here we clean up internal uses of type discover.node, converting most code to use enode.Node instead. The discover.node type used to be the canonical representation of network hosts before ENR was introduced. Most code worked with *node to avoid conversions when interacting with Table methods. Since *node also contains internal state of Table and is a mutable type, using *node outside of Table code is prone to data races. It's also cleaner not having to wrap/unwrap *enode.Node all the time. discover.node has been renamed to tableNode to clarify its purpose. While here, we also change most uses of net.UDPAddr into netip.AddrPort. While this is technically a separate refactoring from the *node -> *enode.Node change, it is more convenient because *enode.Node handles IP addresses as netip.Addr. The switch to package netip in discovery would've happened very soon anyway. The change to netip.AddrPort stops at certain interface points. For example, since package p2p/netutil has not been converted to use netip.Addr yet, we still have to convert to net.IP/net.UDPAddr in a few places.
74 lines
2.4 KiB
Go
74 lines
2.4 KiB
Go
// Copyright 2023 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package discover
|
|
|
|
import (
|
|
"fmt"
|
|
"net/netip"
|
|
|
|
"github.com/ethereum/go-ethereum/metrics"
|
|
)
|
|
|
|
const (
|
|
moduleName = "discover"
|
|
// ingressMeterName is the prefix of the per-packet inbound metrics.
|
|
ingressMeterName = moduleName + "/ingress"
|
|
|
|
// egressMeterName is the prefix of the per-packet outbound metrics.
|
|
egressMeterName = moduleName + "/egress"
|
|
)
|
|
|
|
var (
|
|
bucketsCounter []metrics.Counter
|
|
ingressTrafficMeter = metrics.NewRegisteredMeter(ingressMeterName, nil)
|
|
egressTrafficMeter = metrics.NewRegisteredMeter(egressMeterName, nil)
|
|
)
|
|
|
|
func init() {
|
|
for i := 0; i < nBuckets; i++ {
|
|
bucketsCounter = append(bucketsCounter, metrics.NewRegisteredCounter(fmt.Sprintf("%s/bucket/%d/count", moduleName, i), nil))
|
|
}
|
|
}
|
|
|
|
// meteredUdpConn is a wrapper around a net.UDPConn that meters both the
|
|
// inbound and outbound network traffic.
|
|
type meteredUdpConn struct {
|
|
UDPConn
|
|
}
|
|
|
|
func newMeteredConn(conn UDPConn) UDPConn {
|
|
// Short circuit if metrics are disabled
|
|
if !metrics.Enabled {
|
|
return conn
|
|
}
|
|
return &meteredUdpConn{UDPConn: conn}
|
|
}
|
|
|
|
// ReadFromUDPAddrPort delegates a network read to the underlying connection, bumping the udp ingress traffic meter along the way.
|
|
func (c *meteredUdpConn) ReadFromUDPAddrPort(b []byte) (n int, addr netip.AddrPort, err error) {
|
|
n, addr, err = c.UDPConn.ReadFromUDPAddrPort(b)
|
|
ingressTrafficMeter.Mark(int64(n))
|
|
return n, addr, err
|
|
}
|
|
|
|
// WriteToUDP delegates a network write to the underlying connection, bumping the udp egress traffic meter along the way.
|
|
func (c *meteredUdpConn) WriteToUDP(b []byte, addr netip.AddrPort) (n int, err error) {
|
|
n, err = c.UDPConn.WriteToUDPAddrPort(b, addr)
|
|
egressTrafficMeter.Mark(int64(n))
|
|
return n, err
|
|
}
|