community
/
dns
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move zoneMatch to dns.go

This commit is contained in:
Miek Gieben 2011-07-31 09:53:54 +02:00
parent 770f580540
commit 4925a831aa
2 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dns.go
View File

@ -116,9 +116,9 @@ func (s *RRset) Push(r RR) bool {
}
// For RRSIGs this is not true (RFC???)
// Don't make it a failure if this happens
// if (*s)[0].Header().Ttl != r.Header().Ttl {
// return false
// }
// if (*s)[0].Header().Ttl != r.Header().Ttl {
// return false
// }
if (*s)[0].Header().Name != r.Header().Name {
return false
}
@ -191,3 +191,29 @@ func (h *RR_Header) String() string {
}
return s
}
func zoneMatch(pattern, zone string) (ok bool) {
if len(pattern) == 0 {
return
}
if pattern[len(pattern)-1] != '.' {
pattern += "."
}
if zone[len(zone)-1] != '.' {
zone += "."
}
i := 0
for {
ok = pattern[len(pattern)-1-i] == zone[len(zone)-1-i]
i++
if !ok {
break
}
if len(pattern)-1-i < 0 || len(zone)-1-i < 0 {
break
}
}
return
}

26
server.go
View File

@ -84,32 +84,6 @@ func ListenAndServe(addr string, network string, handler Handler) os.Error {
return server.ListenAndServe()
}
func zoneMatch(pattern, zone string) (ok bool) {
if len(pattern) == 0 {
return
}
if pattern[len(pattern)-1] != '.' {
pattern += "."
}
if zone[len(zone)-1] != '.' {
zone += "."
}
i := 0
for {
ok = pattern[len(pattern)-1-i] == zone[len(zone)-1-i]
i++
if !ok {
break
}
if len(pattern)-1-i < 0 || len(zone)-1-i < 0 {
break
}
}
return
}
func (mux *ServeMux) match(zone string) Handler {
var h Handler
var n = 0