Improve throughput for parsing domain names

Fixes NLnetLabs#66.

Author: k0ekk0ek

src/fallback/name.h

@@ -12,23 +12,24 @@
 zone_nonnull_all
 static zone_really_inline int32_t scan_name(
   zone_parser_t *parser,
-  const zone_type_info_t *type,
-  const zone_field_info_t *field,
-  const uint8_t delimiters[256],
   const token_t *token,
   uint8_t octets[255 + ZONE_BLOCK_SIZE],
-  size_t *length)
+  size_t *lengthp)
 {
   uint8_t *l = octets, *b = octets + 1;
   const uint8_t *bs = octets + 255;
-  const char *s = token->data;
+  const char *s = token->data, *se = token->data + token->length;
+
+  (void)parser;
 
   l[0] = 0;
 
   if (s[0] == '.') {
-    if (delimiters[(uint8_t)s[1]] == token->code)
-      SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), TNAME(type));
-    *length = 1;
+    if (token->length > 1)
+      return -1;
+    //if (delimiters[(uint8_t)s[1]] == token->code)
+    //  SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), TNAME(type));
+    *lengthp = 1;
     return 0;
   }
 
@@ -46,20 +47,23 @@ static zone_really_inline int32_t scan_name(
         d[1] = (uint8_t)s[2] - '0';
         d[2] = (uint8_t)s[3] - '0';
         if (d[1] > m || d[2] > m)
-          SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), TNAME(type));
+          return -1;
+          //SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), TNAME(type));
         b[0] = d[0] * 100 + d[1] * 10 + d[0];
         b += 1; s += 4;
       }
     } else if (c == '.') {
       if ((b - 1) - l > 63 || (b - 1) - l == 0)
-        SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), TNAME(type));
+        return -1;//SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), TNAME(type));
       l[0] = (uint8_t)((b - 1) - l);
       l = b;
       l[0] = 0;
       b += 1; s += 1;
-    } else if (delimiters[c] != token->code) {
+    } else if (s == se) {
+      //if (delimiters[c] != token->code) {
       if ((b - 1) - l > 63)
-        SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), TNAME(type));
+        return -1;
+        //SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), TNAME(type));
       l[0] = (uint8_t)((b - 1) - l);
       break;
     } else {
@@ -68,35 +72,11 @@ static zone_really_inline int32_t scan_name(
     }
   }
 
-  if (delimiters[(uint8_t)*s] == token->code)
-    SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), TNAME(type));
-
-  *length = (size_t)(b - octets);
-  return l[0] == 0 ? 0 : ZONE_NAME;
-}
-
-zone_nonnull_all
-static zone_really_inline int32_t scan_contiguous_name(
-  zone_parser_t *parser,
-  const zone_type_info_t *type,
-  const zone_field_info_t *field,
-  const token_t *token,
-  uint8_t octets[255 + ZONE_BLOCK_SIZE],
-  size_t *length)
-{
-  return scan_name(parser, type, field, contiguous, token, octets, length);
-}
+  if (s != se || b > bs)//delimiters[(uint8_t)*s] == token->code)
+    return -1;//SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), TNAME(type));
 
-zone_nonnull_all
-static zone_really_inline int32_t scan_quoted_name(
-  zone_parser_t *parser,
-  const zone_type_info_t *type,
-  const zone_field_info_t *field,
-  const token_t *token,
-  uint8_t octets[255 + ZONE_BLOCK_SIZE],
-  size_t *length)
-{
-  return scan_name(parser, type, field, quoted, token, octets, length);
+  *lengthp = (size_t)(b - octets);
+  return l[0] != 0;// ? 0 : ZONE_NAME;
 }
 
 zone_nonnull_all
@@ -112,32 +92,34 @@ static zone_really_inline int32_t parse_name(
 
   if (zone_likely(token->code == CONTIGUOUS)) {
     // a freestanding "@" denotes the current origin
-    if (token->data[0] == '@' && !is_contiguous((uint8_t)token->data[1]))
+    if (token->data[0] == '@' && token->length > 1)
       goto relative;
-    r = scan_contiguous_name(parser, type, field, token, o, &n);
+    r = scan_name(parser, token, o, &n);
     if (r == 0)
-      goto absolute;
-    if (r < 0)
-      return r;
+      return (void)(parser->rdata->length += n), ZONE_NAME;
+    if (r > 0)
+      goto relative;
   } else if (token->code == QUOTED) {
-    r = scan_quoted_name(parser, type, field, token, o, &n);
+    if (token->length == 0)
+      goto invalid;
+    r = scan_name(parser, token, o, &n);
     if (r == 0)
-      goto absolute;
-    if (r < 0)
-      return r;
+      return (void)(parser->rdata->length += n), ZONE_NAME;
+    if (r > 0)
+      goto relative;
   } else {
     return have_string(parser, type, field, token);
   }
 
+invalid:
+  SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), TNAME(type));
+
 relative:
   if (n > 255 - parser->file->origin.length)
     SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), TNAME(type));
   memcpy(o+n, parser->file->origin.octets, parser->file->origin.length);
   parser->rdata->length += n + parser->file->origin.length;
   return ZONE_NAME;
-absolute:
-  parser->rdata->length += n;
-  return ZONE_NAME;
 }
 
 #endif // NAME_H