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

Fix incep,expir date representation in rrsigs

This commit is contained in:
Miek Gieben 2011-12-15 12:41:24 +01:00
parent 82d825e798
commit b73eaf020b
2 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
types.go
View File

@ -802,15 +802,23 @@ func (rr *RR_TSIG) String() string {
// Translate the RRSIG's incep. and expir. time to the correct date.
// Taking into account serial arithmetic (RFC 1982)
func timeToDate(t uint32) string {
//utc := time.Now().Unix()
//mod := (int64(t) - utc) / Year68
// If needed assume wrap around(s)
return ""
/* TODO: new time api
ti := time.Unix(int64(t),0).Unix() + (mod * Year68) // abs()? TODO
utc := time.Now().Unix()
mod := (int64(t) - utc) / Year68
ti := time.Unix(time.Unix(int64(t),0).Unix() + (mod * Year68), 0) // abs()? TODO
return ti.Format("20060102150405")
*/
}
// Translate the RRSIG's incep. and expir. times from
// string values ("20110403154150") to an integer.
// Taking into account serial arithmetic (RFC 1982)
func dateToTime(s string) (uint32, error) {
t, e := time.Parse("20060102150405", s)
if e != nil {
return 0, e
}
mod := t.Unix() / Year68
ti := uint32(t.Unix() - (mod * Year68))
return ti, nil
}
// Translate the TSIG time signed into a date. There is no
@ -824,22 +832,6 @@ func tsigTimeToDate(t uint64) string {
*/
}
// Translate the RRSIG's incep. and expir. times from
// string values ("20110403154150") to an integer.
// Taking into account serial arithmetic (RFC 1982)
func dateToTime(s string) (uint32, error) {
_, e := time.Parse("20060102150405", s)
if e != nil {
return 0, e
}
return 0, nil
/*
mod := t.Seconds() / Year68
ti := uint32(t.Seconds() - (mod * Year68))
return ti, nil
*/
}
// Map of constructors for each RR wire type.
var rr_mk = map[uint16]func() RR{
TypeCNAME: func() RR { return new(RR_CNAME) },

3
zscan_rr.go
View File

@ -6,7 +6,8 @@ import (
"strings"
)
// All data from c is either _STRING or _BLANK
// Parse the rdata of each rrtype.
// All data from the channel c is either _STRING or _BLANK.
// After the rdata there may come 1 _BLANK and then a _NEWLINE
// or immediately a _NEWLINE. If this is not the case we flag
// an error: garbage after rdata.