From c93a4dedc897f84992a6a34200fe954ba2ca435d Mon Sep 17 00:00:00 2001 From: Will Hawkins Date: Sun, 12 Jun 2022 17:31:09 -0400 Subject: [Bugfix] Dereference nil when type assertions failed in IncorporateConnectionStats Errors as a result of failed type assertions in IncorporateConnectionStats were caught/logged but there was no function-termination control flow associated with these error conditions. As a result, control would continue and cause problems. This patch fixes that. --- extendedstats/other.go | 4 +++- extendedstats/unix.go | 12 ++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'extendedstats') diff --git a/extendedstats/other.go b/extendedstats/other.go index 825ea95..369c8f6 100644 --- a/extendedstats/other.go +++ b/extendedstats/other.go @@ -9,7 +9,9 @@ import ( type ExtendedStats struct{} -func (es *ExtendedStats) IncorporateConnectionStats(conn net.Conn) {} +func (es *ExtendedStats) IncorporateConnectionStats(conn net.Conn) error { + return fmt.Errorf("OOPS: IncorporateConnectionStats is not supported on this platform.") +} func (es *ExtendedStats) Repr() string { return "" diff --git a/extendedstats/unix.go b/extendedstats/unix.go index c4dc065..fb4a2c8 100644 --- a/extendedstats/unix.go +++ b/extendedstats/unix.go @@ -1,5 +1,5 @@ //go:build dragonfly || freebsd || linux || netbsd || openbsd -// +build dragonfly freebsd linux netbsd openbsd +// +build dragonfly freebsd linux netbsd openbsd package extendedstats @@ -24,17 +24,17 @@ func ExtendedStatsAvailable() bool { return true } -func (es *ExtendedStats) IncorporateConnectionStats(rawConn net.Conn) { +func (es *ExtendedStats) IncorporateConnectionStats(rawConn net.Conn) error { tlsConn, ok := rawConn.(*tls.Conn) if !ok { - fmt.Printf("OOPS: Could not get the TCP info for the connection (not a TLS connection)!\n") + return fmt.Errorf("OOPS: Could not get the TCP info for the connection (not a TLS connection)!\n") } tcpConn, ok := tlsConn.NetConn().(*net.TCPConn) if !ok { - fmt.Printf("OOPS: Could not get the TCP info for the connection (not a TCP connection)!\n") + return fmt.Errorf("OOPS: Could not get the TCP info for the connection (not a TCP connection)!\n") } if info, err := getTCPInfo(tcpConn); err != nil { - fmt.Printf("OOPS: Could not get the TCP info for the connection: %v!\n", err) + return fmt.Errorf("OOPS: Could not get the TCP info for the connection: %v!\n", err) } else { es.MaxPathMtu = utilities.Max(es.MaxPathMtu, uint64(info.Pmtu)) // https://lkml.iu.edu/hypermail/linux/kernel/1705.0/01790.html @@ -42,8 +42,8 @@ func (es *ExtendedStats) IncorporateConnectionStats(rawConn net.Conn) { es.total_rtt += float64(info.Rtt) es.rtt_measurements += 1 es.AverageRtt = es.total_rtt / float64(es.rtt_measurements) - } + return nil } func (es *ExtendedStats) Repr() string { -- cgit v1.2.3