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

Not needed

This commit is contained in:
Miek Gieben 2012-08-23 10:33:33 +02:00
parent 6f7aad15d8
commit 15f03a72fb
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client.go
View File

@ -69,7 +69,7 @@ func (c *Client) exchangeBuffer(inbuf []byte, a string, outbuf []byte) (n int, w
if err = w.dial(); err != nil {
return 0, w, err
}
defer w.close()
defer w.conn.Close()
w.t = time.Now()
if n, err = w.writeClient(inbuf); err != nil {
return 0, w, err
@ -120,9 +120,6 @@ func (c *Client) ExchangeRtt(m *Msg, a string) (r *Msg, rtt time.Duration, err e
in = make([]byte, size)
}
if n, w, err = c.exchangeBuffer(out, a, in); err != nil {
if w.conn != nil {
return nil, 0, err
}
return nil, 0, err
}
r = new(Msg)
@ -355,5 +352,3 @@ func setTimeouts(w *reply) {
w.conn.SetWriteDeadline(time.Now().Add(w.client.WriteTimeout))
}
}
func (w *reply) close() (err error) { return w.conn.Close() }

4
xfr.go
View File

@ -55,7 +55,7 @@ func (c *Client) XfrReceive(q *Msg, a string) (chan *XfrMsg, error) {
func (w *reply) axfrReceive(c chan *XfrMsg) {
first := true
defer w.close()
defer w.conn.Close()
defer close(c)
for {
in, err := w.receive()
@ -90,7 +90,7 @@ func (w *reply) axfrReceive(c chan *XfrMsg) {
func (w *reply) ixfrReceive(c chan *XfrMsg) {
var serial uint32 // The first serial seen is the current server serial
first := true
defer w.close()
defer w.conn.Close()
defer close(c)
for {
in, err := w.receive()