Add support for epoch timestamps

Fixes NLnetLabs#110.

Author: k0ekk0ek

src/generic/time.h

@@ -32,21 +32,21 @@ nonnull_all
 static really_inline int32_t parse_time(
   parser_t *parser,
   const type_info_t *type,
-  const rdata_info_t *item,
+  const rdata_info_t *field,
   rdata_t *rdata,
   const token_t *token)
 {
+  if (token->length != 14)
+    return parse_int32(parser, type, field, rdata, token);
+
   uint64_t d[14]; // YYYYmmddHHMMSS
   const char *p = token->data;
   for (int i = 0; i < 14; i++) {
     d[i] = (uint8_t)p[i] - '0';
     if (d[i] > 9)
-      SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(item), NAME(type));
+      SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), NAME(type));
   }
 
-  if (token->length != 14)
-    SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(item), NAME(type));
-
   // code adapted from Python 2.4.1 sources (Lib/calendar.py)
   const uint64_t year = (d[0] * 1000) + (d[1] * 100) + (d[2] * 10) + d[3];
   const uint64_t mon = (d[4] * 10) + d[5];
@@ -56,17 +56,17 @@ static really_inline int32_t parse_time(
   const uint64_t sec = (d[12] * 10) + d[13];
 
   if (year < 1970 || year > 2106)
-    SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(item), NAME(type));
+    SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), NAME(type));
 
   uint64_t leap_year = is_leap_year(year);
   uint64_t days = 365 * (year - 1970) + leap_days(1970, year);
 
   if (!mon || mon > 12)
-    SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(item), NAME(type));
+    SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), NAME(type));
   if (!mday || mday > days_in_month[mon] + (leap_year & (mon == 2)))
-    SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(item), NAME(type));
+    SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), NAME(type));
   if (hour > 23 || min > 59 || sec > 59)
-    SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(item), NAME(type));
+    SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), NAME(type));
 
   days += days_to_month[mon];
   days += (mon > 2) & leap_year;

src/westmere/time.h

@@ -125,9 +125,9 @@ static really_inline int32_t parse_time(
 {
   uint32_t time;
 
-  // FIXME: once support for specifying as an unsigned number of seconds is
-  //        implemented, update this check too
-  if (token->length != 14 || !sse_parse_time(token->data, &time))
+  if (unlikely(token->length != 14))
+    return parse_int32(parser, type, field, rdata, token);
+  if (!sse_parse_time(token->data, &time))
     SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), NAME(type));
 
   time = htobe32(time);

tests/time.c

@@ -46,6 +46,13 @@ void time_stamp_syntax(void **state)
     uint32_t seconds;
     int32_t result;
   } tests[] = {
+    // Time specified in seconds since epoch
+    { "4294967295", 4294967295, ZONE_SUCCESS },
+    // one second over maximum value
+    { "4294967296", 0, ZONE_SYNTAX_ERROR },
+    // starts with zero
+    { "01", 0, ZONE_SYNTAX_ERROR },
+    // Time specified as YYYYMMDDHHmmSS
     // bad number of digits
     { "202301010101", 0, ZONE_SYNTAX_ERROR },
     { "202301010101010", 0, ZONE_SYNTAX_ERROR },
@@ -91,6 +98,7 @@ void time_stamp_syntax(void **state)
     char *rr = malloc((size_t)size + 1);
     (void)snprintf(rr, size, FORMAT, tests[i].timestamp);
 
+    fprintf(stderr, "INPUT: %s\n", rr);
     options.accept.callback = add_rr;
     options.origin.octets = origin;
     options.origin.length = sizeof(origin);