mirrors
/
tailscale
mirror of https://github.com/tailscale/tailscale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

derp, net/dns/recursive: use Go 1.21 min 

Updates #8419

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2023-08-08 21:22:26 -07:00 committed by Brad Fitzpatrick
parent 66f27c4beb
commit be4eb6a39e
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
derp/derp.go
View File

@ -199,7 +199,7 @@ func readFrame(br *bufio.Reader, maxSize uint32, b []byte) (t frameType, frameLe
return 0, 0, fmt.Errorf("frame header size %d exceeds reader limit of %d", frameLen, maxSize) return 0, 0, fmt.Errorf("frame header size %d exceeds reader limit of %d", frameLen, maxSize)
} }
n, err := io.ReadFull(br, b[:minUint32(frameLen, uint32(len(b)))]) n, err := io.ReadFull(br, b[:min(frameLen, uint32(len(b)))])
if err != nil { if err != nil {
return 0, 0, err return 0, 0, err
} }
@ -233,10 +233,3 @@ func writeFrame(bw *bufio.Writer, t frameType, b []byte) error {
} }
return bw.Flush() return bw.Flush()
} }
func minUint32(a, b uint32) uint32 {
if a < b {
return a
}
return b
}

8
net/dns/recursive/recursive.go
View File

@ -14,7 +14,6 @@ import (
"time" "time"
"github.com/miekg/dns" "github.com/miekg/dns"
"golang.org/x/exp/constraints"
"golang.org/x/exp/slices" "golang.org/x/exp/slices"
"tailscale.com/envknob" "tailscale.com/envknob"
"tailscale.com/net/netns" "tailscale.com/net/netns"
@ -484,13 +483,6 @@ func (r *Resolver) resolveRecursive(
return nil, 0, ErrNoResponses return nil, 0, ErrNoResponses
} }
func min[T constraints.Ordered](a, b T) T {
if a < b {
return a
}
return b
}
// queryNameserver sends a query for "name" to the nameserver "nameserver" for // queryNameserver sends a query for "name" to the nameserver "nameserver" for
// records of type "qtype", trying both UDP and TCP connections as // records of type "qtype", trying both UDP and TCP connections as
// appropriate. // appropriate.