From b622c60ed0693d1cbb22ebfa875330f494986bea Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Sun, 1 Aug 2021 19:14:08 -0700 Subject: [PATCH] derp,wgengine/magicsock: don't assume stringer is in $PATH for go:generate Signed-off-by: Brad Fitzpatrick --- derp/derp_server.go | 2 +- wgengine/magicsock/magicsock.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/derp/derp_server.go b/derp/derp_server.go index 42855e0b3..3bc40f123 100644 --- a/derp/derp_server.go +++ b/derp/derp_server.go @@ -737,7 +737,7 @@ func (c *sclient) handleFrameSendPacket(ft frameType, fl uint32) error { // dropReason is why we dropped a DERP frame. type dropReason int -//go:generate go run tailscale.com/cmd/addlicense -year 2021 -file dropreason_string.go stringer -type=dropReason -trimprefix=dropReason +//go:generate go run tailscale.com/cmd/addlicense -year 2021 -file dropreason_string.go go run golang.org/x/tools/cmd/stringer -type=dropReason -trimprefix=dropReason const ( dropReasonUnknownDest dropReason = iota // unknown destination pubkey diff --git a/wgengine/magicsock/magicsock.go b/wgengine/magicsock/magicsock.go index 62a0e0d6d..145eea7b7 100644 --- a/wgengine/magicsock/magicsock.go +++ b/wgengine/magicsock/magicsock.go @@ -3490,7 +3490,7 @@ func (de *discoEndpoint) sendDiscoPing(ep netaddr.IPPort, txid stun.TxID, logLev // discoPingPurpose is the reason why a discovery ping message was sent. type discoPingPurpose int -//go:generate go run tailscale.com/cmd/addlicense -year 2020 -file discopingpurpose_string.go stringer -type=discoPingPurpose -trimprefix=ping +//go:generate go run tailscale.com/cmd/addlicense -year 2020 -file discopingpurpose_string.go go run golang.org/x/tools/cmd/stringer -type=discoPingPurpose -trimprefix=ping const ( // pingDiscovery means that purpose of a ping was to see if a // path was valid.