mirror of
https://github.com/tailscale/tailscale.git
synced 2025-02-18 10:58:39 +00:00
a12aad6b47
perl -i -npe 's,netaddr.IPPrefixFrom,netip.PrefixFrom,' $(git grep -l -F netaddr.)
perl -i -npe 's,netaddr.IPPortFrom,netip.AddrPortFrom,' $(git grep -l -F netaddr. )
perl -i -npe 's,netaddr.IPPrefix,netip.Prefix,g' $(git grep -l -F netaddr. )
perl -i -npe 's,netaddr.IPPort,netip.AddrPort,g' $(git grep -l -F netaddr. )
perl -i -npe 's,netaddr.IP\b,netip.Addr,g' $(git grep -l -F netaddr. )
perl -i -npe 's,netaddr.IPv6Raw\b,netip.AddrFrom16,g' $(git grep -l -F netaddr. )
goimports -w .
Then delete some stuff from the net/netaddr shim package which is no
longer neeed.
Updates #5162
Change-Id: Ia7a86893fe21c7e3ee1ec823e8aba288d4566cd8
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
50 lines
1.7 KiB
Go
50 lines
1.7 KiB
Go
// Copyright (c) 2021 Tailscale Inc & AUTHORS All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
// Package dnstype defines types for working with DNS.
|
|
package dnstype
|
|
|
|
//go:generate go run tailscale.com/cmd/cloner --type=Resolver --clonefunc=true
|
|
|
|
import (
|
|
"net/netip"
|
|
)
|
|
|
|
// Resolver is the configuration for one DNS resolver.
|
|
type Resolver struct {
|
|
// Addr is the address of the DNS resolver, one of:
|
|
// - A plain IP address for a "classic" UDP+TCP DNS resolver.
|
|
// This is the common format as sent by the control plane.
|
|
// - An IP:port, for tests.
|
|
// - [TODO] "tls://resolver.com" for DNS over TCP+TLS
|
|
// - [TODO] "https://resolver.com/query-tmpl" for DNS over HTTPS
|
|
Addr string `json:",omitempty"`
|
|
|
|
// BootstrapResolution is an optional suggested resolution for the
|
|
// DoT/DoH resolver, if the resolver URL does not reference an IP
|
|
// address directly.
|
|
// BootstrapResolution may be empty, in which case clients should
|
|
// look up the DoT/DoH server using their local "classic" DNS
|
|
// resolver.
|
|
BootstrapResolution []netip.Addr `json:",omitempty"`
|
|
}
|
|
|
|
// IPPort returns r.Addr as an IP address and port if either
|
|
// r.Addr is an IP address (the common case) or if r.Addr
|
|
// is an IP:port (as done in tests).
|
|
func (r *Resolver) IPPort() (ipp netip.AddrPort, ok bool) {
|
|
if r.Addr == "" || r.Addr[0] == 'h' || r.Addr[0] == 't' {
|
|
// Fast path to avoid ParseIP error allocation for obviously not IP
|
|
// cases.
|
|
return
|
|
}
|
|
if ip, err := netip.ParseAddr(r.Addr); err == nil {
|
|
return netip.AddrPortFrom(ip, 53), true
|
|
}
|
|
if ipp, err := netip.ParseAddrPort(r.Addr); err == nil {
|
|
return ipp, true
|
|
}
|
|
return
|
|
}
|