From 1dd1798bfa9a88adc8800208eddf309b307490eb Mon Sep 17 00:00:00 2001 From: Jordan Whited Date: Wed, 4 Sep 2024 09:28:03 -0700 Subject: [PATCH] cmd/stunstamp: use measureFn more consistently in naming/signatures (#13360) Updates #cleanup Signed-off-by: Jordan Whited --- cmd/stunstamp/stunstamp.go | 2 +- cmd/stunstamp/stunstamp_default.go | 2 +- cmd/stunstamp/stunstamp_linux.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/stunstamp/stunstamp.go b/cmd/stunstamp/stunstamp.go index 32f4e7ff0..f66fb7c05 100644 --- a/cmd/stunstamp/stunstamp.go +++ b/cmd/stunstamp/stunstamp.go @@ -499,7 +499,7 @@ func newConnAndMeasureFn(forDst netip.Addr, source timestampSource, protocol pro } return &connAndMeasureFn{ conn: conn, - fn: mkICMPRTTFn(source), + fn: mkICMPMeasureFn(source), }, nil case protocolHTTPS: localPort := 0 diff --git a/cmd/stunstamp/stunstamp_default.go b/cmd/stunstamp/stunstamp_default.go index 5eb765134..a244d9aea 100644 --- a/cmd/stunstamp/stunstamp_default.go +++ b/cmd/stunstamp/stunstamp_default.go @@ -54,7 +54,7 @@ func getICMPConn(forDst netip.Addr, source timestampSource) (io.ReadWriteCloser, return nil, errors.New("platform unsupported") } -func mkICMPRTTFn(source timestampSource) func(conn io.ReadWriteCloser, hostname string, dst netip.AddrPort) (rtt time.Duration, err error) { +func mkICMPMeasureFn(source timestampSource) measureFn { return func(conn io.ReadWriteCloser, hostname string, dst netip.AddrPort) (rtt time.Duration, err error) { return 0, errors.New("platform unsupported") } diff --git a/cmd/stunstamp/stunstamp_linux.go b/cmd/stunstamp/stunstamp_linux.go index 038c01ffa..886f8909a 100644 --- a/cmd/stunstamp/stunstamp_linux.go +++ b/cmd/stunstamp/stunstamp_linux.go @@ -62,7 +62,7 @@ func parseTimestampFromCmsgs(oob []byte) (time.Time, error) { return time.Time{}, errors.New("failed to parse timestamp from cmsgs") } -func mkICMPRTTFn(source timestampSource) func(conn io.ReadWriteCloser, hostname string, dst netip.AddrPort) (rtt time.Duration, err error) { +func mkICMPMeasureFn(source timestampSource) measureFn { return func(conn io.ReadWriteCloser, hostname string, dst netip.AddrPort) (rtt time.Duration, err error) { return measureICMPRTT(source, conn, hostname, dst) }