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

Return a set of RRs

This commit is contained in:
Miek Gieben 2012-08-27 19:59:55 +02:00
parent d942401931
commit 2c6eb05cf8
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
xfr.go
View File

@ -7,8 +7,7 @@ import (
// XfrMsg is used when doing [IA]xfr with a remote server. // XfrMsg is used when doing [IA]xfr with a remote server.
type XfrMsg struct { type XfrMsg struct {
Request *Msg // the question sent Reply []RR // the set of RRs in the answer section form the message of the server
Reply *Msg // the answer to the question that was sent
Rtt time.Duration // round trip time Rtt time.Duration // round trip time
RemoteAddr net.Addr // address of the server RemoteAddr net.Addr // address of the server
Error error // if something went wrong, this contains the error Error error // if something went wrong, this contains the error
@ -60,16 +59,16 @@ func (w *reply) axfrReceive(c chan *XfrMsg) {
for { for {
in, err := w.receive() in, err := w.receive()
if err != nil { if err != nil {
c <- &XfrMsg{Request: w.req, Reply: in, Rtt: w.rtt, RemoteAddr: w.conn.RemoteAddr(), Error: err} c <- &XfrMsg{Reply: in.Answer, Rtt: w.rtt, Error: err}
return return
} }
if w.req.Id != in.Id { if w.req.Id != in.Id {
c <- &XfrMsg{Request: w.req, Reply: in, Rtt: w.rtt, RemoteAddr: w.conn.RemoteAddr(), Error: ErrId} c <- &XfrMsg{Reply: in.Answer, Rtt: w.rtt, Error: ErrId}
return return
} }
if first { if first {
if !checkXfrSOA(in, true) { if !checkXfrSOA(in, true) {
c <- &XfrMsg{Request: w.req, Reply: in, Rtt: w.rtt, RemoteAddr: w.conn.RemoteAddr(), Error: ErrXfrSoa} c <- &XfrMsg{Reply: in.Answer, Rtt: w.rtt, Error: ErrXfrSoa}
return return
} }
first = !first first = !first
@ -78,10 +77,10 @@ func (w *reply) axfrReceive(c chan *XfrMsg) {
if !first { if !first {
w.tsigTimersOnly = true // Subsequent envelopes use this. w.tsigTimersOnly = true // Subsequent envelopes use this.
if checkXfrSOA(in, false) { if checkXfrSOA(in, false) {
c <- &XfrMsg{Request: w.req, Reply: in, Rtt: w.rtt, RemoteAddr: w.conn.RemoteAddr(), Error: nil} c <- &XfrMsg{Reply: in.Answer, Rtt: w.rtt, Error: nil}
return return
} }
c <- &XfrMsg{Request: w.req, Reply: in, Rtt: w.rtt, RemoteAddr: w.conn.RemoteAddr(), Error: nil} c <- &XfrMsg{Reply: in.Answer, Rtt: w.rtt, Error: nil}
} }
} }
panic("not reached") panic("not reached")
@ -95,23 +94,23 @@ func (w *reply) ixfrReceive(c chan *XfrMsg) {
for { for {
in, err := w.receive() in, err := w.receive()
if err != nil { if err != nil {
c <- &XfrMsg{Request: w.req, Reply: in, Rtt: w.rtt, RemoteAddr: w.conn.RemoteAddr(), Error: err} c <- &XfrMsg{Reply: in.Answer, Rtt: w.rtt, Error: err}
return return
} }
if w.req.Id != in.Id { if w.req.Id != in.Id {
c <- &XfrMsg{Request: w.req, Reply: in, Rtt: w.rtt, RemoteAddr: w.conn.RemoteAddr(), Error: ErrId} c <- &XfrMsg{Reply: in.Answer, Rtt: w.rtt, Error: ErrId}
return return
} }
if first { if first {
// A single SOA RR signals "no changes" // A single SOA RR signals "no changes"
if len(in.Answer) == 1 && checkXfrSOA(in, true) { if len(in.Answer) == 1 && checkXfrSOA(in, true) {
c <- &XfrMsg{Request: w.req, Reply: in, Rtt: w.rtt, RemoteAddr: w.conn.RemoteAddr(), Error: nil} c <- &XfrMsg{Reply: in.Answer, Rtt: w.rtt, Error: nil}
return return
} }
// Check if the returned answer is ok // Check if the returned answer is ok
if !checkXfrSOA(in, true) { if !checkXfrSOA(in, true) {
c <- &XfrMsg{Request: w.req, Reply: in, Rtt: w.rtt, RemoteAddr: w.conn.RemoteAddr(), Error: ErrXfrSoa} c <- &XfrMsg{Reply: in.Answer, Rtt: w.rtt, Error: ErrXfrSoa}
return return
} }
// This serial is important // This serial is important
@ -125,11 +124,11 @@ func (w *reply) ixfrReceive(c chan *XfrMsg) {
// If the last record in the IXFR contains the servers' SOA, we should quit // If the last record in the IXFR contains the servers' SOA, we should quit
if v, ok := in.Answer[len(in.Answer)-1].(*RR_SOA); ok { if v, ok := in.Answer[len(in.Answer)-1].(*RR_SOA); ok {
if v.Serial == serial { if v.Serial == serial {
c <- &XfrMsg{Request: w.req, Reply: in, Rtt: w.rtt, RemoteAddr: w.conn.RemoteAddr(), Error: nil} c <- &XfrMsg{Reply: in.Answer, Rtt: w.rtt, Error: nil}
return return
} }
} }
c <- &XfrMsg{Request: w.req, Reply: in, Rtt: w.rtt, RemoteAddr: w.conn.RemoteAddr()} c <- &XfrMsg{Reply: in.Answer, Rtt: w.rtt}
} }
} }
panic("not reached") panic("not reached")