From f0b75bd985490aba701f76173579d3c94c34793e Mon Sep 17 00:00:00 2001
From: Miek Gieben <miek@miek.nl>
Date: Mon, 7 May 2012 15:52:50 +0200
Subject: [PATCH] Use exchange again

---
 ex/chaos/chaos.go   | 4 ++--
 ex/fp/fp.go         | 2 +-
 ex/key2ds/key2ds.go | 2 +-
 ex/mx/mx.go         | 2 +-
 ex/q/q.go           | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ex/chaos/chaos.go b/ex/chaos/chaos.go
index 5a310717..39627d6c 100644
--- a/ex/chaos/chaos.go
+++ b/ex/chaos/chaos.go
@@ -27,12 +27,12 @@ func main() {
 	}
 	for _, a := range addr {
 		m.Question[0] = dns.Question{"version.bind.", dns.TypeTXT, dns.ClassCHAOS}
-		in, rtt, _, _ := c.Exchange(m, a)
+		in, rtt, _, _ := c.ExchangeFull(m, a)
 		if in != nil && len(in.Answer) > 0  {
 			fmt.Printf("(time %.3d µs) %v\n", rtt/1e3, in.Answer[0])
 		}
 		m.Question[0] = dns.Question{"hostname.bind.", dns.TypeTXT, dns.ClassCHAOS}
-		in, rtt, _, _ = c.Exchange(m, a)
+		in, rtt, _, _ = c.ExchangeFull(m, a)
 		if in != nil && len(in.Answer) > 0 {
 			fmt.Printf("(time %.3d µs) %v\n", rtt/1e3, in.Answer[0])
 		}
diff --git a/ex/fp/fp.go b/ex/fp/fp.go
index 1ed3e439..14327711 100644
--- a/ex/fp/fp.go
+++ b/ex/fp/fp.go
@@ -13,7 +13,7 @@ import (
 // returns a fingerprint.
 func probe(c *dns.Client, addr string, f *fingerprint) *fingerprint {
 	m := f.msg()
-	r, _, _, err := c.Exchange(m, addr)
+	r, err := c.Exchange(m, addr)
 	if err != nil {
 		return errorToFingerprint(err)
 	}
diff --git a/ex/key2ds/key2ds.go b/ex/key2ds/key2ds.go
index a8789a07..bffeb2d0 100644
--- a/ex/key2ds/key2ds.go
+++ b/ex/key2ds/key2ds.go
@@ -21,7 +21,7 @@ func main() {
         m.SetEdns0(2048, true)
 
 	c := dns.NewClient()
-        r, _, _, _ := c.Exchange(m, conf.Servers[0] + ":" + conf.Port)
+        r, _ := c.Exchange(m, conf.Servers[0] + ":" + conf.Port)
 	if r == nil {
 		fmt.Printf("*** no answer received for %s\n", os.Args[1])
 		os.Exit(1)
diff --git a/ex/mx/mx.go b/ex/mx/mx.go
index 3e926121..e6c1e83a 100644
--- a/ex/mx/mx.go
+++ b/ex/mx/mx.go
@@ -23,7 +23,7 @@ func main() {
 	m.MsgHdr.RecursionDesired = true
 
 	// Simple sync query, nothing fancy
-	r, _, _, err := c.Exchange(m, config.Servers[0]+":"+config.Port)
+	r, err := c.Exchange(m, config.Servers[0]+":"+config.Port)
 	if err != nil {
 		fmt.Printf("%s\n", err.Error())
 		os.Exit(1)
diff --git a/ex/q/q.go b/ex/q/q.go
index de445e18..32745987 100644
--- a/ex/q/q.go
+++ b/ex/q/q.go
@@ -341,7 +341,7 @@ func getKey(name string, keytag uint16, server string, tcp bool) *dns.RR_DNSKEY
 	m := new(dns.Msg)
 	m.SetQuestion(name, dns.TypeDNSKEY)
 	m.SetEdns0(4096, true)
-	r, _, _, err := c.Exchange(m, server)
+	r, err := c.Exchange(m, server)
 	if err != nil {
 		return nil
 	}