make lookup LookupName

This commit is contained in:
Miek Gieben 2011-07-29 13:44:35 +02:00
parent be10e40045
commit a5bec02e96

10
zone.go
View File

@ -140,22 +140,22 @@ func (z Zone) Push(s *ZRRset) {
// Return NXDomain, Name error, wildcard? // Return NXDomain, Name error, wildcard?
// Casing! // Casing!
func (z Zone) LookupRR(r RR) (*ZRRset, os.Error) { func (z Zone) LookupRR(r RR) (*ZRRset, os.Error) {
return z.lookup(r.Header().Name, r.Header().Class, r.Header().Rrtype) return z.LookupName(r.Header().Name, r.Header().Class, r.Header().Rrtype)
} }
func (z Zone) LookupQuestion(q Question) (*ZRRset, os.Error) { func (z Zone) LookupQuestion(q Question) (*ZRRset, os.Error) {
return z.lookup(q.Name, q.Qclass, q.Qtype) return z.LookupName(q.Name, q.Qclass, q.Qtype)
} }
func (z Zone) lookup(qname string, qclass, qtype uint16) (*ZRRset, os.Error) { func (z Zone) LookupName(qname string, qclass, qtype uint16) (*ZRRset, os.Error) {
i := intval(qclass, qtype) i := intval(qclass, qtype)
if im, ok := z[qname]; ok { if im, ok := z[qname]; ok {
// Have an im, intmap // Have an im, intmap
if s, ok := im[i]; ok { if s, ok := im[i]; ok {
return s, nil return s, nil
} }
// Name found, class/type not found // Wildcard 'n stuff
return nil, nil return nil, ErrName
} }
return nil, nil return nil, nil
} }