curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TUN-6778: Cleanup logs about ICMP

This commit is contained in:
cthuang 2022-09-19 12:36:25 +01:00 committed by Chung-Ting Huang
parent 013bdbd10c
commit de00396669
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ingress/icmp_darwin.go
View File

@ -202,7 +202,7 @@ func (ip *icmpProxy) Serve(ctx context.Context) error {
// In unit test, we found out when the listener listens on 0.0.0.0, the socket reads the full packet after // In unit test, we found out when the listener listens on 0.0.0.0, the socket reads the full packet after
// the second reply // the second reply
if err := ip.handleFullPacket(icmpDecoder, buf[:n]); err != nil { if err := ip.handleFullPacket(icmpDecoder, buf[:n]); err != nil {
ip.logger.Err(err).Str("dst", from.String()).Msg("Failed to parse ICMP reply as full packet") ip.logger.Debug().Err(err).Str("dst", from.String()).Msg("Failed to parse ICMP reply as full packet")
} }
continue continue
} }

7
supervisor/supervisor.go
View File

@ -4,6 +4,7 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"net"
"strings" "strings"
"time" "time"
@ -155,7 +156,11 @@ func (s *Supervisor) Run(
if s.edgeTunnelServer.icmpRouter != nil { if s.edgeTunnelServer.icmpRouter != nil {
go func() { go func() {
if err := s.edgeTunnelServer.icmpRouter.Serve(ctx); err != nil { if err := s.edgeTunnelServer.icmpRouter.Serve(ctx); err != nil {
s.log.Logger().Err(err).Msg("icmp router terminated") if errors.Is(err, net.ErrClosed) {
s.log.Logger().Info().Err(err).Msg("icmp router terminated")
} else {
s.log.Logger().Err(err).Msg("icmp router terminated")
}
} }
}() }()
} }