From 7f88c92f0fb5bb91c44d42d29f49b25a47e32a9c Mon Sep 17 00:00:00 2001
From: Miek Gieben <miek@miek.nl>
Date: Mon, 27 Dec 2010 14:31:31 +0100
Subject: [PATCH] Fix EDNS0 (OPT_RR) printing

---
 TODO                 |  3 +-
 ds_test.go           |  8 +++--
 edns.go              | 76 +++++++++++++++++++++++++-------------------
 resolverEdns_test.go |  2 ++
 strconv.go           |  2 +-
 5 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/TODO b/TODO
index c3f302bc..ca54ffe3 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,5 @@
 Todo:
-* parse RRs from strings
+* parse RRs from strings AToRR()
 * DNSSEC validation
 * Unknown RRs
 * fix os.Erros usage 
@@ -11,3 +11,4 @@ Tesing:
 Issues:
 * shortened ipv6 addresses are not parsed correctly
 * quoted quotes in txt records
+* divide the code in multiple packages? dns, dnssec
diff --git a/ds_test.go b/ds_test.go
index 75f3102d..572e4369 100644
--- a/ds_test.go
+++ b/ds_test.go
@@ -2,7 +2,7 @@ package dns
 
 import (
 	"testing"
-        "fmt" //togo
+        "strings"
 )
 
 func TestKeyToDS(t *testing.T) {
@@ -17,6 +17,8 @@ func TestKeyToDS(t *testing.T) {
 	key.PubKey = "AwEAAcNEU67LJI5GEgF9QLNqLO1SMq1EdoQ6E9f85ha0k0ewQGCblyW2836GiVsm6k8Kr5ECIoMJ6fZWf3CQSQ9ycWfTyOHfmI3eQ/1Covhb2y4bAmL/07PhrL7ozWBW3wBfM335Ft9xjtXHPy7ztCbV9qZ4TVDTW/Iyg0PiwgoXVesz"
 
         ds := key.ToDS(HashSHA1)
-
-        fmt.Printf("%v\n%v\n", key, ds)
+        if strings.ToUpper(ds.Digest) != "B5121BDB5B8D86D0CC5FFAFBAAABE26C3E20BAC1" {
+                t.Logf("Wrong DS digest for Sha1\n%v\n", ds)
+                t.Fail()
+        }
 }
diff --git a/edns.go b/edns.go
index 29020782..9dc6353a 100644
--- a/edns.go
+++ b/edns.go
@@ -2,13 +2,17 @@
 // convience functions to operate on it.
 package dns
 
+import (
+	"strconv"
+)
+
 // EDNS0 option codes
 const (
-	OptionCodeLLQ  = 1      // Not used
-	OptionCodeUL   = 2      // Not used
-	OptionCodeNSID = 3      // NSID, RFC5001
+	OptionCodeLLQ  = 1 // Not used
+	OptionCodeUL   = 2 // Not used
+	OptionCodeNSID = 3 // NSID, RFC5001
 	// EDNS flag bits (put in Z section)
-	_DO = 1 << 7           // dnssec ok
+	_DO = 1 << 7 // dnssec ok
 )
 
 // An ENDS0 option rdata element.
@@ -30,12 +34,7 @@ This is the EDNS0 Header
 
 type RR_OPT struct {
 	Hdr    RR_Header
-	Option []Option  "OPT" // Tag is used in pack and unpack
-}
-
-// A ENDS packet must show differently. TODO
-func (h *RR_Header) ednsString() string {
-        return h.String()
+	Option []Option "OPT" // Tag is used in pack and unpack
 }
 
 func (rr *RR_OPT) Header() *RR_Header {
@@ -43,44 +42,55 @@ func (rr *RR_OPT) Header() *RR_Header {
 }
 
 func (rr *RR_OPT) String() string {
-	s := rr.Hdr.ednsString() // Hier misschien andere representatie
+	s := ";; EDNS: version " + strconv.Itoa(int(rr.Version(0, false))) + "; "
+	if rr.DoBit(false, false) {
+		s += "flags: do; "
+	} else {
+		s += "flags: ; "
+	}
+	s += "udp: " + strconv.Itoa(int(rr.UDPSize(0, false))) + ";"
+
 	for _, o := range rr.Option {
 		switch o.Code {
 		case OptionCodeNSID:
-			s += "NSID: " + o.Data
+			s += " nsid: " + o.Data + ";"
 		}
 	}
 	return s
 }
 
+// Set the version of edns, currently only 0 is there
+func (rr *RR_OPT) Version(v uint8, set bool) uint8 {
+	return 0
+}
+
 // when set is true, set the size otherwise get it
-func (rr *RR_OPT) UDPSize(size int, set bool) int {
-        // fiddle in rr.Hdr.Class should be set
-        if set {
-                rr.Hdr.Class = uint16(size)
-        }
-        return int(rr.Hdr.Class)
+func (rr *RR_OPT) UDPSize(size uint16, set bool) uint16 {
+	if set {
+		rr.Hdr.Class = size
+	}
+	return rr.Hdr.Class
 }
 
 // when set is true, set the Do bit, otherwise get it
 func (rr *RR_OPT) DoBit(do, set bool) bool {
-        // rr.TTL last 2 bytes, left most bit
-        // See line 239 in msg.go for TTL encoding
-        if set {
-                leftbyte := byte(rr.Hdr.Ttl >> 24)
-                leftbyte = leftbyte | _DO
-                rr.Hdr.Ttl = uint32(leftbyte<<24)
-                return true
-        } else {
-                // jaja TODO(MG)
-                leftbyte := byte(rr.Hdr.Ttl >> 24)
-                return leftbyte & _DO == 1
-        }
-        return true // dead code, bug in Go
+	// rr.TTL last 2 bytes, left most bit
+	// See line 239 in msg.go for TTL encoding
+	if set {
+		leftbyte := byte(rr.Hdr.Ttl >> 24)
+		leftbyte = leftbyte | _DO
+		rr.Hdr.Ttl = uint32(leftbyte << 24)
+		return true
+	} else {
+		// jaja?? TODO(MG)
+		leftbyte := byte(rr.Hdr.Ttl >> 24)
+		return leftbyte&_DO == 1
+	}
+	return true // dead code, bug in Go
 }
 
 // when set is true, set the nsid, otherwise get it
 func (rr *RR_OPT) Nsid(nsid string, set bool) string {
-        // RR.Option[0] to be set
-        return ""
+	// RR.Option[0] to be set
+	return ""
 }
diff --git a/resolverEdns_test.go b/resolverEdns_test.go
index 6878b3c8..741303b2 100644
--- a/resolverEdns_test.go
+++ b/resolverEdns_test.go
@@ -39,6 +39,8 @@ func TestResolverEdns(t *testing.T) {
 
 	ch <- DnsMsg{m, nil}
 	in := <-ch
+        t.Fail()
+        t.Log("%v\n", in.Dns)
 
 	if in.Dns.Rcode != RcodeSuccess {
 		t.Log("Failed to get an valid answer")
diff --git a/strconv.go b/strconv.go
index 1dce9523..d1001122 100644
--- a/strconv.go
+++ b/strconv.go
@@ -8,7 +8,7 @@ package dns
 // miek.nl. A 192.168.1.1         // ok, ttl and class omitted
 // miek.nl. 3600 A 192.168.1.1    // ok, class omitted
 //          IN A 192.168.1.1      // not ok
-func AtoRR(s string) *RR {
+func ParseString(s string) *RR {
 	// up to first whitespace is domainname
 	// next word is:
 	// <number> -> TTL