From cf4c9a358e6b0b50c045fc6a875bd9835cd1987f Mon Sep 17 00:00:00 2001 From: StalkR Date: Thu, 15 Jan 2015 11:39:47 +0100 Subject: [PATCH] xfr: make Transfer.Out synchronous --- xfr.go | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/xfr.go b/xfr.go index 57bfb167..13a883b4 100644 --- a/xfr.go +++ b/xfr.go @@ -165,17 +165,15 @@ func (t *Transfer) Out(w ResponseWriter, q *Msg, ch chan *Envelope) error { r.SetReply(q) r.Authoritative = true - go func() { - for x := range ch { - // assume it fits TODO(miek): fix - r.Answer = append(r.Answer, x.RR...) - if err := w.WriteMsg(r); err != nil { - return - } + for x := range ch { + // assume it fits TODO(miek): fix + r.Answer = append(r.Answer, x.RR...) + if err := w.WriteMsg(r); err != nil { + return err } - w.TsigTimersOnly(true) - r.Answer = nil - }() + } + w.TsigTimersOnly(true) + r.Answer = nil return nil }