Commitf5a8a27

authored

fix(healthcheck): prevent infinite loop if DERP message exchange fails (#7112)

1 parent38e5b96 commitf5a8a27Copy full SHA for f5a8a27

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,7 @@ package healthcheck`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`		`-"errors"`
`6`	`5`	`"fmt"`
`7`		`-"io"`
`8`	`6`	`"net"`
`9`	`7`	`"net/netip"`
`10`	`8`	`"net/url"`
`@@ -390,9 +388,7 @@ func (DERPNodeReport) recvData(client derphttp.Client) (derp.ReceivedPacket, e`
`390`	`388`	`for {`
`391`	`389`	`msg,err:=client.Recv()`
`392`	`390`	`iferr!=nil {`
`393`		`-iferrors.Is(err,io.EOF) {`
`394`		`-return derp.ReceivedPacket{},nil`
`395`		`-}`
	`391`	`+return derp.ReceivedPacket{},err`
`396`	`392`	`}`
`397`	`393`
`398`	`394`	`switchmsg:=msg.(type) {`

Comments

(0)