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

in case of error do get the exact tag

This commit is contained in:
Miek Gieben 2012-10-11 12:58:43 +02:00
parent 6e43b3b666
commit c5f0ecbdd8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
msg.go
View File

@ -377,7 +377,7 @@ func packStructValue(val reflect.Value, msg []byte, off int, compression map[str
case reflect.Slice:
switch val.Type().Field(i).Tag {
default:
return lenmsg, &Error{Name: val.Type().Field(i).Tag, Err: "bad tag packing slice"}
return lenmsg, &Error{Name: val.Type().Field(i).Tag.Get("dns"), Err: "bad tag packing slice"}
case `dns:"domain-name"`:
for j := 0; j < val.Field(i).Len(); j++ {
element := val.Field(i).Index(j).String()
@ -550,7 +550,7 @@ func packStructValue(val reflect.Value, msg []byte, off int, compression map[str
s := fv.String()
switch val.Type().Field(i).Tag {
default:
return lenmsg, &Error{Name: val.Type().Field(i).Tag, Err: "bad tag packing string"}
return lenmsg, &Error{Name: val.Type().Field(i).Tag.Get("dns"), Err: "bad tag packing string"}
case `dns:"base64"`:
b64, err := packBase64([]byte(s))
if err != nil {
@ -642,7 +642,7 @@ func unpackStructValue(val reflect.Value, msg []byte, off int) (off1 int, err er
case reflect.Slice:
switch val.Type().Field(i).Tag {
default:
return lenmsg, &Error{Name: val.Type().Field(i).Tag("dns"), Err: "bad tag unpacking slice"}
return lenmsg, &Error{Name: val.Type().Field(i).Tag.Get("dns"), Err: "bad tag unpacking slice"}
case `dns:"domain-name"`:
// HIP record slice of name (or none)
servers := make([]string, 0)
@ -849,7 +849,7 @@ func unpackStructValue(val reflect.Value, msg []byte, off int) (off1 int, err er
var s string
switch val.Type().Field(i).Tag {
default:
return lenmsg, &Error{Name: val.Type().Field(i).Tag, Err: "bad tag unpacking string"}
return lenmsg, &Error{Name: val.Type().Field(i).Tag.Get("dns"), Err: "bad tag unpacking string"}
case `dns:"hex"`:
// Rest of the RR is hex encoded, network order an issue here?
rdlength := int(val.FieldByName("Hdr").FieldByName("Rdlength").Uint())