diff options
| author | Will Hawkins <[email protected]> | 2022-06-12 17:31:09 -0400 |
|---|---|---|
| committer | Will Hawkins <[email protected]> | 2022-06-12 17:31:09 -0400 |
| commit | c93a4dedc897f84992a6a34200fe954ba2ca435d (patch) | |
| tree | 83643f39a3037599924485dffa7af114ecacea3b /extendedstats/unix.go | |
| parent | bce8d0a53c56816e6b5acd4e0c9b53514981910a (diff) | |
[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.
Diffstat (limited to 'extendedstats/unix.go')
| -rw-r--r-- | extendedstats/unix.go | 12 |
1 files changed, 6 insertions, 6 deletions
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 { |
