Make improvements

- Clean up sigaction() code
- Add a port scanner example
- Introduce a ParseCidr() API
- Clean up our futex abstraction code
- Fix a harmless integer overflow in ParseIp()
- Use kernel semaphores on NetBSD to make threads much faster

net/http/http.h

@@ -209,7 +209,6 @@ bool IsAcceptablePath(const char *, size_t);
 bool IsAcceptableHost(const char *, size_t);
 bool IsAcceptablePort(const char *, size_t);
 bool IsReasonablePath(const char *, size_t);
-int64_t ParseIp(const char *, size_t);
 int ParseForwarded(const char *, size_t, uint32_t *, uint16_t *);
 bool IsMimeType(const char *, size_t, const char *);
 ssize_t Unchunk(struct HttpUnchunker *, char *, size_t, size_t *);

net/http/ip.h

@@ -25,6 +25,13 @@
 #if !(__ASSEMBLER__ + __LINKER__ + 0)
 COSMOPOLITAN_C_START_
 
+struct Cidr {
+  int64_t addr;
+  int cidr;
+};
+
+int64_t ParseIp(const char *, size_t);
+struct Cidr ParseCidr(const char *, size_t);
 bool IsDodIp(uint32_t);
 bool IsArinIp(uint32_t);
 bool IsRipeIp(uint32_t);

net/http/parsecidr.c

@@ -0,0 +1,67 @@
+/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
+│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8                                :vi│
+╞══════════════════════════════════════════════════════════════════════════════╡
+│ Copyright 2022 Justine Alexandra Roberts Tunney                              │
+│                                                                              │
+│ Permission to use, copy, modify, and/or distribute this software for         │
+│ any purpose with or without fee is hereby granted, provided that the         │
+│ above copyright notice and this permission notice appear in all copies.      │
+│                                                                              │
+│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
+│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
+│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
+│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
+│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
+│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
+│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
+│ PERFORMANCE OF THIS SOFTWARE.                                                │
+╚─────────────────────────────────────────────────────────────────────────────*/
+#include "libc/str/str.h"
+#include "net/http/ip.h"
+
+/**
+ * Parse IPv4 network address.
+ *
+ * For example, a router address might be `10.10.10.1/24` in which case
+ * the IP address word `0x0a0a0a01` would be returned, whose CIDR would
+ * be 24. That means your IP address is on a network with 24 bits which
+ * converts to a netmask `0xffffff00` by using `1u << (32 - res.cidr)`.
+ * You may specify the IP address portion as an integer. As an example,
+ * the value `168430081/1` would be the same as `10.10.10.1/1`
+ *
+ * @param n if -1 implies strlen
+ * @return ip is uint32 IPv4 address, or -1 on failure
+ * @return cidr is number of bits in network, on interval [1,32]; it
+ *     defaults to 32; if the return ip is -1 then cidr is undefined
+ */
+struct Cidr ParseCidr(const char *s, size_t n) {
+  size_t i;
+  const char *p;
+  struct Cidr c;
+  if (n == -1) n = s ? strlen(s) : 0;
+  if ((p = strchr(s, '/'))) {
+    if ((c.addr = ParseIp(s, (i = p - s))) != -1) {
+      c.cidr = 0;
+      for (++i; i < n; ++i) {
+        if (isdigit(s[i])) {
+          c.cidr *= 10;
+          c.cidr += s[i] - '0';
+          if (c.cidr > 32) {
+            c.cidr = -1;
+            break;
+          }
+        } else {
+          c.cidr = -1;
+          break;
+        }
+      }
+      if (c.cidr <= 0) {
+        c.addr = -1;
+      }
+    }
+  } else {
+    c.addr = ParseIp(s, n);
+    c.cidr = 32;
+  }
+  return c;
+}

net/http/parseip.c

@@ -17,27 +17,33 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/str/str.h"
-#include "net/http/http.h"
+#include "net/http/ip.h"
 
 /**
- * Parse IPv4 address.
+ * Parse IPv4 host address.
  *
  * @param n if -1 implies strlen
  * @return -1 on failure, otherwise 32-bit host-order unsigned integer
+ * @see ParseCidr()
  */
 int64_t ParseIp(const char *s, size_t n) {
+  int c, j;
   size_t i;
-  uint32_t x;
-  int b, c, j;
+  unsigned b, x;
+  bool dotted = false;
   if (n == -1) n = s ? strlen(s) : 0;
   if (!n) return -1;
   for (b = x = j = i = 0; i < n; ++i) {
     c = s[i] & 255;
     if (isdigit(c)) {
-      b *= 10;
-      b += c - '0';
+      if (__builtin_mul_overflow(b, 10, &b) ||       //
+          __builtin_add_overflow(b, c - '0', &b) ||  //
+          (b > 255 && dotted)) {
+        return -1;
+      }
     } else if (c == '.') {
       if (b > 255) return -1;
+      dotted = true;
       x <<= 8;
       x |= b;
       b = 0;

net/turfwar/blackhole.c

@@ -28,6 +28,7 @@
 #include "libc/sysv/consts/ex.h"
 #include "libc/sysv/consts/sock.h"
 #include "net/http/http.h"
+#include "net/http/ip.h"
 
 int main(int argc, char *argv[]) {