Return length from scan_ip functions

k0ekk0ek · k0ekk0ek · commit 2b8df918de9f · 2024-03-22T14:36:03.000+01:00
diff --git a/src/generic/apl.h b/src/generic/apl.h
@@ -14,7 +14,7 @@ static really_inline int32_t scan_apl(
 {
   uint8_t negate = text[0] == '!';
   uint8_t digits[3];
-  size_t count;
+  int32_t count;
   uint32_t prefix;
   const uint8_t af_inet[2] = { 0x00, 0x01 }, af_inet6[2] = { 0x00, 0x02 };
 
@@ -27,7 +27,7 @@ static really_inline int32_t scan_apl(
       if (size < 8)
         return -1;
       memcpy(octets, af_inet, sizeof(af_inet));
-      if (scan_ip4(&text[negate+2], &octets[4], &count) == -1)
+      if (!(count = scan_ip4(&text[negate+2], &octets[4])))
         return -1;
       count += negate + 2;
       digits[0] = (uint8_t)text[count+1] - '0';
@@ -47,7 +47,7 @@ static really_inline int32_t scan_apl(
       if (size < 20)
         return -1;
       memcpy(octets, af_inet6, sizeof(af_inet6));
-      if (scan_ip6(&text[negate+2], &octets[4], &count) == -1)
+      if (!(count = scan_ip6(&text[negate+2], &octets[4])))
         return -1;
       count += negate + 2;
       digits[0] = (uint8_t)text[count+1] - '0';
diff --git a/src/generic/ip4.h b/src/generic/ip4.h
@@ -10,8 +10,7 @@
 #define IP4_H
 
 nonnull_all
-static really_inline int32_t scan_ip4(
-  const char *text, uint8_t *wire, size_t *length)
+static really_inline int32_t scan_ip4(const char *text, uint8_t *wire)
 {
   const char *start = text;
   uint32_t round = 0;
@@ -22,7 +21,7 @@ static really_inline int32_t scan_ip4(
     digits[1] = (uint8_t)text[1] - '0';
     digits[2] = (uint8_t)text[2] - '0';
     if (digits[0] > 9)
-      return -1;
+      return 0;
     else if (digits[1] > 9)
       (void)(text += 1), octet = digits[0];
     else if (digits[2] > 9)
@@ -31,17 +30,16 @@ static really_inline int32_t scan_ip4(
       (void)(text += 3), octet = digits[0] * 100 + digits[1] * 10 + digits[2];
 
     if (octet > 255)
-      return -1;
+      return 0;
     wire[round++] = (uint8_t)octet;
     if (text[0] != '.' || round == 4)
       break;
     text += 1;
   }
 
   if (round != 4)
-    return -1;
-  *length = (uintptr_t)text - (uintptr_t)start;
-  return 4;
+    return 0;
+  return (int32_t)(text - start);
 }
 
 nonnull_all
@@ -52,31 +50,8 @@ static really_inline int32_t parse_ip4(
   rdata_t *rdata,
   const token_t *token)
 {
-  uint8_t *o = rdata->octets;
-  const uint8_t *os = o;
-  uint64_t n = 0;
-  const char *p = token->data;
-  static const uint8_t m[] = { 0, 0, 10, 100 };
-
-  *o = 0;
-  for (const char *ps = p;; p++) {
-    const uint64_t d = (uint8_t)*p - '0';
-    if (d <= 9) {
-      n = n * 10 + (uint8_t)d;
-    } else {
-      if (!(p - ps) || p - ps > 3 || n < m[(p - ps)] || n > 255 || o - os > 3)
-        SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(item), NAME(type));
-      ps = p + 1;
-      *o++ = (uint8_t)n;
-      if (*p != '.')
-        break;
-      n = 0;
-    }
-  }
-
-  if (p != token->data + token->length || o - os != 4)
+  if ((size_t)scan_ip4(token->data, rdata->octets) != token->length)
     SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(item), NAME(type));
-
   rdata->octets += 4;
   return 0;
 }
diff --git a/src/generic/ip6.h b/src/generic/ip6.h
@@ -35,9 +35,9 @@
  * inet_pton4(src, dst)
  *  like inet_aton() but without all the hexadecimal and shorthand.
  * return:
- *  1 if `src' is a valid dotted quad, else 0.
+ *  length if `src' is a valid dotted quad, else 0.
  * notice:
- *  does not touch `dst' unless it's returning 1.
+ *  does not touch `dst' unless it's returning !0.
  * author:
  *  Paul Vixie, 1996.
  */
@@ -59,11 +59,11 @@ inet_pton4(const char *src, uint8_t *dst)
       uint32_t new = *tp * 10 + (uint32_t)(pch - digits);
 
       if (new > 255)
-        return -1;
+        return (0);
       *tp = (uint8_t)new;
       if (! saw_digit) {
         if (++octets > 4)
-          return -1;
+          return (0);
         saw_digit = 1;
       }
     } else if (ch == '.' && saw_digit) {
@@ -75,7 +75,7 @@ inet_pton4(const char *src, uint8_t *dst)
       break;
   }
   if (octets < 4)
-    return -1;
+    return (0);
 
   memcpy(dst, tmp, NS_INADDRSZ);
   return (int)(src - start);
@@ -85,9 +85,9 @@ inet_pton4(const char *src, uint8_t *dst)
  * inet_pton6(src, dst)
  *  convert presentation level address to network order binary form.
  * return:
- *  1 if `src' is a valid [RFC1884 2.2] address, else 0.
+ *  length if `src' is a valid [RFC1884 2.2] address, else 0.
  * notice:
- *  (1) does not touch `dst' unless it's returning 1.
+ *  (1) does not touch `dst' unless it's returning !0.
  *  (2) :: in a full address is silently ignored.
  * credit:
  *  inspired by Mark Andrews.
@@ -112,7 +112,7 @@ inet_pton6(const char *src, uint8_t *dst)
   /* Leading :: requires some special handling. */
   if (*src == ':')
     if (*++src != ':')
-      return -1;
+      return (0);
   curtok = src;
   saw_xdigit = 0;
   val = 0;
@@ -125,7 +125,7 @@ inet_pton6(const char *src, uint8_t *dst)
       val <<= 4;
       val |= (pch - xdigits);
       if (val > 0xffff)
-        return -1;
+        return (0);
       saw_xdigit = 1;
       continue;
     }
@@ -156,7 +156,7 @@ inet_pton6(const char *src, uint8_t *dst)
   }
   if (saw_xdigit) {
     if (tp + NS_INT16SZ > endp)
-      return -1;
+      return (0);
     *tp++ = (uint8_t) (val >> 8) & 0xff;
     *tp++ = (uint8_t) val & 0xff;
   }
@@ -175,20 +175,15 @@ inet_pton6(const char *src, uint8_t *dst)
     tp = endp;
   }
   if (tp != endp)
-    return -1;
+    return (0);
   memcpy(dst, tmp, NS_IN6ADDRSZ);
   return (int)(src - start);
 }
 
 nonnull_all
-static really_inline int32_t scan_ip6(
-  const char *text, uint8_t *wire, size_t *length)
+static really_inline int32_t scan_ip6(const char *text, uint8_t *wire)
 {
-  int len = inet_pton6(text, wire);
-  if (len == -1)
-    return -1;
-  *length = (size_t)len;
-  return 16;
+  return inet_pton6(text, wire);
 }
 
 nonnull_all
@@ -199,12 +194,10 @@ static really_inline int32_t parse_ip6(
   rdata_t *rdata,
   const token_t *token)
 {
-  if (inet_pton6(token->data, rdata->octets) != -1) {
-    rdata->octets += 16;
-    return 0;
-  }
-
-  SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(item), NAME(type));
+  if ((size_t)inet_pton6(token->data, rdata->octets) != token->length)
+    SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(item), NAME(type));
+  rdata->octets += 16;
+  return 0;
 }
 
 #endif // IP6_H
diff --git a/src/generic/svcb.h b/src/generic/svcb.h
@@ -203,15 +203,15 @@ static int32_t parse_ipv4hint(
   (void)key;
   (void)param;
 
-  if (scan_ip4(t, rdata->octets, &n) == -1)
+  if ((n = (size_t)scan_ip4(t, rdata->octets)) == 0)
     SYNTAX_ERROR(parser, "Invalid ipv4hint in %s", NAME(type));
   rdata->octets += 4;
   t += n;
 
   while (*t == ',') {
     if (rdata->octets > rdata->limit)
       SYNTAX_ERROR(parser, "Invalid ipv4hint in %s", NAME(type));
-    if (scan_ip4(t + 1, rdata->octets, &n) == -1)
+    if ((n = (size_t)scan_ip4(t + 1, rdata->octets)) == 0)
       SYNTAX_ERROR(parser, "Invalid ipv4hint in %s", NAME(type));
     rdata->octets += 4;
     t += n + 1;
@@ -271,15 +271,15 @@ static int32_t parse_ipv6hint(
   (void)key;
   (void)param;
 
-  if (scan_ip6(t, rdata->octets, &n) == -1)
+  if ((n = (size_t)scan_ip6(t, rdata->octets)) == 0)
     SYNTAX_ERROR(parser, "Invalid ipv6hint in %s", NAME(type));
   rdata->octets += 16;
   t += n;
 
   while (*t == ',') {
     if (rdata->octets >= rdata->limit)
       SYNTAX_ERROR(parser, "Invalid ipv6hint in %s", NAME(type));
-    if (scan_ip6(t + 1, rdata->octets, &n) == -1)
+    if ((n = (size_t)scan_ip6(t + 1, rdata->octets)) == 0)
       SYNTAX_ERROR(parser, "Invalid ipv6hint in %s", NAME(type));
     rdata->octets += 16;
     t += n + 1;
diff --git a/src/westmere/ip4.h b/src/westmere/ip4.h
@@ -151,9 +151,8 @@ static inline int sse_inet_aton(const char* ipv4_string, uint8_t* destination, s
 
   uint32_t hash_key = (partition_mask * 0x00CF7800) >> 24;
   uint8_t hash_id = patterns_id[hash_key];
-  if (hash_id >= 81) {
+  if (hash_id >= 81)
       return 0;
-  }
   const uint8_t* const pattern_ptr = &patterns[hash_id][0];
 
   __m128i shuf = _mm_loadu_si128((const __m128i *)pattern_ptr);
@@ -181,14 +180,12 @@ static inline int sse_inet_aton(const char* ipv4_string, uint8_t* destination, s
 }
 
 nonnull_all
-static really_inline int32_t scan_ip4(
-  const char *text, uint8_t *wire, size_t *length)
+static really_inline int32_t scan_ip4(const char *text, uint8_t *wire)
 {
   size_t len;
   if (sse_inet_aton(text, wire, &len) != 1)
-    return -1;
-  *length = len;
-  return 4;
+    return 0;
+  return (int32_t)len;
 }
 
 nonnull_all
@@ -199,10 +196,8 @@ static really_inline int32_t parse_ip4(
   rdata_t *rdata,
   const token_t *token)
 {
-  size_t length;
-
   // Note that this assumes that reading up to token->data + 16 is safe (i.e., we do not cross a page).
-  if (sse_inet_aton(token->data, rdata->octets, &length) != 1 || length != token->length)
+  if ((size_t)scan_ip4(token->data, rdata->octets) != token->length)
     SYNTAX_ERROR(parser, "Invalid %s in %s", NAME(field), NAME(type));
   rdata->octets += 4;
   return 0;
