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

Make sprintDomain public as NameToString

This commit is contained in:
Miek Gieben 2014-04-23 20:58:55 +01:00
parent 2dc3e40828
commit 6295f64c1c
2 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dns.go
View File

@ -168,7 +168,7 @@ func (h *RR_Header) String() string {
// and maybe other things
}
s += sprintDomain(h.Name) + "\t"
s += NameToString(h.Name) + "\t"
s += strconv.FormatInt(int64(h.Ttl), 10) + "\t"
s += Class(h.Class).String() + "\t"
s += Type(h.Rrtype).String() + "\t"

52
types.go
View File

@ -174,7 +174,7 @@ type Question struct {
func (q *Question) String() (s string) {
// prefix with ; (as in dig)
s = ";" + sprintDomain(q.Name) + "\t"
s = ";" + NameToString(q.Name) + "\t"
s += Class(q.Qclass).String() + "\t"
s += " " + Type(q.Qtype).String()
return s
@ -201,7 +201,7 @@ type CNAME struct {
}
func (rr *CNAME) Header() *RR_Header { return &rr.Hdr }
func (rr *CNAME) copy() RR { return &CNAME{*rr.Hdr.copyHeader(), sprintDomain(rr.Target)} }
func (rr *CNAME) copy() RR { return &CNAME{*rr.Hdr.copyHeader(), NameToString(rr.Target)} }
func (rr *CNAME) String() string { return rr.Hdr.String() + rr.Target }
func (rr *CNAME) len() int { return rr.Hdr.len() + len(rr.Target) + 1 }
@ -222,7 +222,7 @@ type MB struct {
}
func (rr *MB) Header() *RR_Header { return &rr.Hdr }
func (rr *MB) copy() RR { return &MB{*rr.Hdr.copyHeader(), sprintDomain(rr.Mb)} }
func (rr *MB) copy() RR { return &MB{*rr.Hdr.copyHeader(), NameToString(rr.Mb)} }
func (rr *MB) String() string { return rr.Hdr.String() + rr.Mb }
func (rr *MB) len() int { return rr.Hdr.len() + len(rr.Mb) + 1 }
@ -235,7 +235,7 @@ type MG struct {
func (rr *MG) Header() *RR_Header { return &rr.Hdr }
func (rr *MG) copy() RR { return &MG{*rr.Hdr.copyHeader(), rr.Mg} }
func (rr *MG) len() int { l := len(rr.Mg) + 1; return rr.Hdr.len() + l }
func (rr *MG) String() string { return rr.Hdr.String() + sprintDomain(rr.Mg) }
func (rr *MG) String() string { return rr.Hdr.String() + NameToString(rr.Mg) }
type MINFO struct {
Hdr RR_Header
@ -247,7 +247,7 @@ func (rr *MINFO) Header() *RR_Header { return &rr.Hdr }
func (rr *MINFO) copy() RR { return &MINFO{*rr.Hdr.copyHeader(), rr.Rmail, rr.Email} }
func (rr *MINFO) String() string {
return rr.Hdr.String() + sprintDomain(rr.Rmail) + " " + sprintDomain(rr.Email)
return rr.Hdr.String() + NameToString(rr.Rmail) + " " + NameToString(rr.Email)
}
func (rr *MINFO) len() int {
@ -266,7 +266,7 @@ func (rr *MR) copy() RR { return &MR{*rr.Hdr.copyHeader(), rr.Mr} }
func (rr *MR) len() int { l := len(rr.Mr) + 1; return rr.Hdr.len() + l }
func (rr *MR) String() string {
return rr.Hdr.String() + sprintDomain(rr.Mr)
return rr.Hdr.String() + NameToString(rr.Mr)
}
type MF struct {
@ -279,7 +279,7 @@ func (rr *MF) copy() RR { return &MF{*rr.Hdr.copyHeader(), rr.Mf} }
func (rr *MF) len() int { return rr.Hdr.len() + len(rr.Mf) + 1 }
func (rr *MF) String() string {
return rr.Hdr.String() + " " + sprintDomain(rr.Mf)
return rr.Hdr.String() + " " + NameToString(rr.Mf)
}
type MD struct {
@ -292,7 +292,7 @@ func (rr *MD) copy() RR { return &MD{*rr.Hdr.copyHeader(), rr.Md} }
func (rr *MD) len() int { return rr.Hdr.len() + len(rr.Md) + 1 }
func (rr *MD) String() string {
return rr.Hdr.String() + " " + sprintDomain(rr.Md)
return rr.Hdr.String() + " " + NameToString(rr.Md)
}
type MX struct {
@ -306,7 +306,7 @@ func (rr *MX) copy() RR { return &MX{*rr.Hdr.copyHeader(), rr.Preferen
func (rr *MX) len() int { l := len(rr.Mx) + 1; return rr.Hdr.len() + l + 2 }
func (rr *MX) String() string {
return rr.Hdr.String() + strconv.Itoa(int(rr.Preference)) + " " + sprintDomain(rr.Mx)
return rr.Hdr.String() + strconv.Itoa(int(rr.Preference)) + " " + NameToString(rr.Mx)
}
type AFSDB struct {
@ -320,7 +320,7 @@ func (rr *AFSDB) copy() RR { return &AFSDB{*rr.Hdr.copyHeader(), rr.Su
func (rr *AFSDB) len() int { l := len(rr.Hostname) + 1; return rr.Hdr.len() + l + 2 }
func (rr *AFSDB) String() string {
return rr.Hdr.String() + strconv.Itoa(int(rr.Subtype)) + " " + sprintDomain(rr.Hostname)
return rr.Hdr.String() + strconv.Itoa(int(rr.Subtype)) + " " + NameToString(rr.Hostname)
}
type X25 struct {
@ -347,7 +347,7 @@ func (rr *RT) copy() RR { return &RT{*rr.Hdr.copyHeader(), rr.Preferen
func (rr *RT) len() int { l := len(rr.Host) + 1; return rr.Hdr.len() + l + 2 }
func (rr *RT) String() string {
return rr.Hdr.String() + strconv.Itoa(int(rr.Preference)) + " " + sprintDomain(rr.Host)
return rr.Hdr.String() + strconv.Itoa(int(rr.Preference)) + " " + NameToString(rr.Host)
}
type NS struct {
@ -360,7 +360,7 @@ func (rr *NS) len() int { l := len(rr.Ns) + 1; return rr.Hdr.len() + l
func (rr *NS) copy() RR { return &NS{*rr.Hdr.copyHeader(), rr.Ns} }
func (rr *NS) String() string {
return rr.Hdr.String() + sprintDomain(rr.Ns)
return rr.Hdr.String() + NameToString(rr.Ns)
}
type PTR struct {
@ -373,7 +373,7 @@ func (rr *PTR) copy() RR { return &PTR{*rr.Hdr.copyHeader(), rr.Ptr} }
func (rr *PTR) len() int { l := len(rr.Ptr) + 1; return rr.Hdr.len() + l }
func (rr *PTR) String() string {
return rr.Hdr.String() + sprintDomain(rr.Ptr)
return rr.Hdr.String() + NameToString(rr.Ptr)
}
type RP struct {
@ -407,7 +407,7 @@ func (rr *SOA) copy() RR {
}
func (rr *SOA) String() string {
return rr.Hdr.String() + sprintDomain(rr.Ns) + " " + sprintDomain(rr.Mbox) +
return rr.Hdr.String() + NameToString(rr.Ns) + " " + NameToString(rr.Mbox) +
" " + strconv.FormatInt(int64(rr.Serial), 10) +
" " + strconv.FormatInt(int64(rr.Refresh), 10) +
" " + strconv.FormatInt(int64(rr.Retry), 10) +
@ -435,9 +435,7 @@ func (rr *TXT) copy() RR {
func (rr *TXT) String() string { return rr.Hdr.String() + sprintTxt(rr.Txt) }
// TODO(miek): this needs to be public I think, but with another name
// DomainNameToString ?
func sprintDomain(s string) string {
func NameToString(s string) string {
src := []byte(s)
dst := make([]byte, 0, len(src))
for i := 0; i < len(src); {
@ -583,7 +581,7 @@ func (rr *SRV) String() string {
return rr.Hdr.String() +
strconv.Itoa(int(rr.Priority)) + " " +
strconv.Itoa(int(rr.Weight)) + " " +
strconv.Itoa(int(rr.Port)) + " " + sprintDomain(rr.Target)
strconv.Itoa(int(rr.Port)) + " " + NameToString(rr.Target)
}
type NAPTR struct {
@ -653,7 +651,7 @@ func (rr *DNAME) copy() RR { return &DNAME{*rr.Hdr.copyHeader(), rr.Ta
func (rr *DNAME) len() int { l := len(rr.Target) + 1; return rr.Hdr.len() + l }
func (rr *DNAME) String() string {
return rr.Hdr.String() + sprintDomain(rr.Target)
return rr.Hdr.String() + NameToString(rr.Target)
}
type A struct {
@ -698,7 +696,7 @@ type PX struct {
func (rr *PX) Header() *RR_Header { return &rr.Hdr }
func (rr *PX) copy() RR { return &PX{*rr.Hdr.copyHeader(), rr.Preference, rr.Map822, rr.Mapx400} }
func (rr *PX) String() string {
return rr.Hdr.String() + strconv.Itoa(int(rr.Preference)) + " " + sprintDomain(rr.Map822) + " " + sprintDomain(rr.Mapx400)
return rr.Hdr.String() + strconv.Itoa(int(rr.Preference)) + " " + NameToString(rr.Map822) + " " + NameToString(rr.Mapx400)
}
func (rr *PX) len() int { return rr.Hdr.len() + 2 + len(rr.Map822) + 1 + len(rr.Mapx400) + 1 }
@ -807,7 +805,7 @@ func (rr *RRSIG) String() string {
" " + TimeToString(rr.Expiration) +
" " + TimeToString(rr.Inception) +
" " + strconv.Itoa(int(rr.KeyTag)) +
" " + sprintDomain(rr.SignerName) +
" " + NameToString(rr.SignerName) +
" " + rr.Signature
return s
}
@ -831,7 +829,7 @@ func (rr *NSEC) copy() RR {
}
func (rr *NSEC) String() string {
s := rr.Hdr.String() + sprintDomain(rr.NextDomain)
s := rr.Hdr.String() + NameToString(rr.NextDomain)
for i := 0; i < len(rr.TypeBitMap); i++ {
s += " " + Type(rr.TypeBitMap[i]).String()
}
@ -926,7 +924,7 @@ func (rr *KX) copy() RR { return &KX{*rr.Hdr.copyHeader(), rr.Preferen
func (rr *KX) String() string {
return rr.Hdr.String() + strconv.Itoa(int(rr.Preference)) +
" " + sprintDomain(rr.Exchanger)
" " + NameToString(rr.Exchanger)
}
type TA struct {
@ -962,7 +960,7 @@ func (rr *TALINK) len() int { return rr.Hdr.len() + len(rr.PreviousNam
func (rr *TALINK) String() string {
return rr.Hdr.String() +
" " + sprintDomain(rr.PreviousName) + " " + sprintDomain(rr.NextName)
" " + NameToString(rr.PreviousName) + " " + NameToString(rr.NextName)
}
type SSHFP struct {
@ -1073,7 +1071,7 @@ type NSAPPTR struct {
func (rr *NSAPPTR) Header() *RR_Header { return &rr.Hdr }
func (rr *NSAPPTR) copy() RR { return &NSAPPTR{*rr.Hdr.copyHeader(), rr.Ptr} }
func (rr *NSAPPTR) String() string { return rr.Hdr.String() + sprintDomain(rr.Ptr) }
func (rr *NSAPPTR) String() string { return rr.Hdr.String() + NameToString(rr.Ptr) }
func (rr *NSAPPTR) len() int { return rr.Hdr.len() + len(rr.Ptr) }
type NSEC3 struct {
@ -1272,7 +1270,7 @@ func (rr *HIP) String() string {
" " + rr.Hit +
" " + rr.PublicKey
for _, d := range rr.RendezvousServers {
s += " " + sprintDomain(d)
s += " " + NameToString(d)
}
return s
}
@ -1400,7 +1398,7 @@ func (rr *LP) copy() RR { return &LP{*rr.Hdr.copyHeader(), rr.Preferen
func (rr *LP) len() int { return rr.Hdr.len() + 2 + len(rr.Fqdn) + 1 }
func (rr *LP) String() string {
return rr.Hdr.String() + strconv.Itoa(int(rr.Preference)) + " " + sprintDomain(rr.Fqdn)
return rr.Hdr.String() + strconv.Itoa(int(rr.Preference)) + " " + NameToString(rr.Fqdn)
}
type EUI48 struct {