mirrors/dns
1
0
Fork 0
mirror of https://github.com/miekg/dns.git synced 2025-10-11 09:51:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add Copy to all RRs

Browse Source
This commit is contained in:
Miek Gieben 2012-06-20 11:56:25 +02:00
parent eb94be22bb
commit f48dba4ad1
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dns.go
View File

@ -133,7 +133,7 @@ func (h *RR_Header) Header() *RR_Header {
return h return h
} }
func (h *RR_Header) copy() *RR_Header { func (h *RR_Header) Copy() *RR_Header {
r := new(RR_Header) r := new(RR_Header)
r.Name = h.Name r.Name = h.Name
r.Rrtype = h.Rrtype r.Rrtype = h.Rrtype

5
dnssec.go
View File

@ -637,7 +637,8 @@ func (p wireSlice) Swap(i, j int) { p[i], p[j] = p[j], p[i] }
func rawSignatureData(rrset []RR, s *RR_RRSIG) (buf []byte) { func rawSignatureData(rrset []RR, s *RR_RRSIG) (buf []byte) {
wires := make(wireSlice, len(rrset)) wires := make(wireSlice, len(rrset))
for i, r := range rrset { for i, r := range rrset {
h := r.Header().copy() h := r.Header().Copy()
h.Ttl = s.OrigTtl
labels := SplitLabels(h.Name) labels := SplitLabels(h.Name)
// 6.2. Canonical RR Form. (4) - wildcards // 6.2. Canonical RR Form. (4) - wildcards
if len(labels) > int(s.Labels) { if len(labels) > int(s.Labels) {
@ -661,6 +662,7 @@ func rawSignatureData(rrset []RR, s *RR_RRSIG) (buf []byte) {
defer func() { x.Target = p }() defer func() { x.Target = p }()
x.Target = strings.ToLower(x.Target) x.Target = strings.ToLower(x.Target)
case *RR_SOA: case *RR_SOA:
x.Hdr = *h // NO NO NO need to copy each RR
p := x.Ns p := x.Ns
q := x.Mbox q := x.Mbox
defer func() { x.Ns = p }() defer func() { x.Ns = p }()
@ -713,7 +715,6 @@ func rawSignatureData(rrset []RR, s *RR_RRSIG) (buf []byte) {
} }
// 6.2. Canonical RR Form. (5) - origTTL // 6.2. Canonical RR Form. (5) - origTTL
wire := make([]byte, r.Len()*2) wire := make([]byte, r.Len()*2)
h.Ttl = s.OrigTtl
off, ok1 := packRR(r, wire, 0, nil, false) off, ok1 := packRR(r, wire, 0, nil, false)
if !ok1 { if !ok1 {
return nil return nil

4
types.go
View File

@ -200,6 +200,10 @@ func (rr *RR_CNAME) Len() int {
return rr.Hdr.Len() + l return rr.Hdr.Len() + l
} }
func (rr *RR_CNAME) Copy() *RR_CNAME {
return &RR_CNAME{Hdr: *rr.Hdr.Copy(), Target: rr.Target}
}
type RR_HINFO struct { type RR_HINFO struct {
Hdr RR_Header Hdr RR_Header
Cpu string Cpu string