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

Acutally use the CERT parsing 

Also fix some bugs in the errors it sends back
This commit is contained in:
Miek Gieben 2013-06-05 22:28:13 +01:00
parent fd17416ab0
commit 6f0ce553cf
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zscan_rr.go
View File

@ -163,6 +163,8 @@ func setRR(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
return setIPSECKEY(h, c, o, f) return setIPSECKEY(h, c, o, f)
case TypeUINFO: case TypeUINFO:
return setUINFO(h, c, f) return setUINFO(h, c, f)
case TypeCERT:
return setCERT(h, c, f)
default: default:
// RFC3957 RR (Unknown RR handling) // RFC3957 RR (Unknown RR handling)
return setRFC3597(h, c, f) return setRFC3597(h, c, f)
@ -1053,7 +1055,7 @@ func setHIP(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
return rr, nil, l.comment return rr, nil, l.comment
} }
func setCERT(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) { func setCERT(h RR_Header, c chan lex, f string) (RR, *ParseError, string) {
rr := new(CERT) rr := new(CERT)
rr.Hdr = h rr.Hdr = h
@ -1066,18 +1068,18 @@ func setCERT(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
<-c // _BLANK <-c // _BLANK
l = <-c // _STRING l = <-c // _STRING
if i, e := strconv.Atoi(l.token); e != nil { if i, e := strconv.Atoi(l.token); e != nil {
return nil, &ParseError{f, "bad NAPTR KeyTag", l}, "" return nil, &ParseError{f, "bad CERT KeyTag", l}, ""
} else { } else {
rr.KeyTag = uint16(i) rr.KeyTag = uint16(i)
} }
<-c // _BLANK <-c // _BLANK
l = <-c // _STRING l = <-c // _STRING
if i, e := strconv.Atoi(l.token); e != nil { if i, e := strconv.Atoi(l.token); e != nil {
return nil, &ParseError{f, "bad NAPTR Algorithm", l}, "" return nil, &ParseError{f, "bad CERT Algorithm", l}, ""
} else { } else {
rr.Algorithm = uint8(i) rr.Algorithm = uint8(i)
} }
s, e, c1 := endingToString(c, "bad NAPTR Certificate", f) s, e, c1 := endingToString(c, "bad CERT Certificate", f)
if e != nil { if e != nil {
return nil, e, c1 return nil, e, c1
} }