mirror of
https://github.com/tailscale/tailscale.git
synced 2025-12-08 14:09:41 +00:00
util/dnsname: add FQDN type, use throughout codebase.
Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
committed by
Dave Anderson
parent
7a1813fd24
commit
1a371b93be
@@ -102,7 +102,7 @@ func getTxID(packet []byte) txid {
|
||||
}
|
||||
|
||||
type route struct {
|
||||
suffix string
|
||||
suffix dnsname.FQDN
|
||||
resolvers []netaddr.IPPort
|
||||
}
|
||||
|
||||
@@ -272,7 +272,7 @@ func (f *forwarder) forward(query packet) error {
|
||||
|
||||
var resolvers []netaddr.IPPort
|
||||
for _, route := range routes {
|
||||
if route.suffix != "." && !dnsname.HasSuffix(domain, route.suffix) {
|
||||
if route.suffix != "." && !route.suffix.Contains(domain) {
|
||||
continue
|
||||
}
|
||||
resolvers = route.resolvers
|
||||
@@ -489,7 +489,7 @@ func (c *fwdConn) close() {
|
||||
}
|
||||
|
||||
// nameFromQuery extracts the normalized query name from bs.
|
||||
func nameFromQuery(bs []byte) (string, error) {
|
||||
func nameFromQuery(bs []byte) (dnsname.FQDN, error) {
|
||||
var parser dns.Parser
|
||||
|
||||
hdr, err := parser.Start(bs)
|
||||
@@ -506,5 +506,5 @@ func nameFromQuery(bs []byte) (string, error) {
|
||||
}
|
||||
|
||||
n := q.Name.Data[:q.Name.Length]
|
||||
return rawNameToLower(n), nil
|
||||
return dnsname.ToFQDN(rawNameToLower(n))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user