feat(p5-socket): --address, -4/-6, --sockopts, server bind options

tests/test_transport_tcp.c

@@ -2,14 +2,126 @@
 #include "protocol.h"
 #include "test_utils.h"
 #include "transport_tcp.h"
+#include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/socket.h>
+
+/* -4/-6 map to a getaddrinfo ai_family hint: -4 -> AF_INET, -6 -> AF_INET6,
+ * and neither -> AF_UNSPEC.  Both flags together are rejected earlier (in
+ * validate_config), so this helper never needs to prefer one over the other. */
+static void test_tcp_connect_family_hints() {
+  EXPECT_EQ_INT(tcp_connect_family(false, false), AF_UNSPEC);
+  EXPECT_EQ_INT(tcp_connect_family(true, false), AF_INET);
+  EXPECT_EQ_INT(tcp_connect_family(false, true), AF_INET6);
+}
+
+/* --sockopts parsing+validation: every allowlisted KEY works, OPT=VAL values
+ * are captured, and an unknown option or a bad value is rejected (never
+ * silently ignored). */
+static void test_sockopts_parse_valid() {
+  SockOptEntry* out = NULL;
+  int count = 0;
+  EXPECT_EQ_INT(config_sockopts_parse("TCP_NODELAY=1,SO_KEEPALIVE=0", &out, &count), 0);
+  EXPECT_EQ_INT(count, 2);
+  EXPECT_EQ_INT(out[0].id, SOCKOPT_TCP_NODELAY);
+  EXPECT_EQ_INT(out[0].value, 1);
+  EXPECT_EQ_INT(out[1].id, SOCKOPT_SO_KEEPALIVE);
+  EXPECT_EQ_INT(out[1].value, 0);
+  free(out);
+
+  out = NULL;
+  count = 0;
+  EXPECT_EQ_INT(config_sockopts_parse("SO_RCVBUF=65536,SO_SNDBUF=131072,SO_REUSEADDR=1", &out,
+                                      &count),
+                0);
+  EXPECT_EQ_INT(count, 3);
+  EXPECT_EQ_INT(out[0].id, SOCKOPT_SO_RCVBUF);
+  EXPECT_EQ_INT(out[0].value, 65536);
+  EXPECT_EQ_INT(out[1].id, SOCKOPT_SO_SNDBUF);
+  EXPECT_EQ_INT(out[1].value, 131072);
+  EXPECT_EQ_INT(out[2].id, SOCKOPT_SO_REUSEADDR);
+  EXPECT_EQ_INT(out[2].value, 1);
+  free(out);
+}
+
+static void test_sockopts_parse_rejects() {
+  static const char* const bad[] = {
+      "IP_TTL=1",          /* unknown option name */
+      "SO_KEEPALIVE",      /* missing '=' */
+      "=1",                /* missing option name */
+      "TCP_NODELAY=",      /* missing value */
+      "TCP_NODELAY=2",     /* boolean must be 0/1 */
+      "TCP_NODELAY=on",    /* non-numeric boolean */
+      "SO_RCVBUF=-1",      /* negative buffer */
+      "SO_SNDBUF=abc",     /* non-numeric buffer */
+      ""};                 /* empty spec */
+  for (size_t i = 0; i < sizeof(bad) / sizeof(bad[0]); i++) {
+    SockOptEntry* out = NULL;
+    int count = 0;
+    EXPECT_EQ_INT(config_sockopts_parse(bad[i], &out, &count), -1);
+    EXPECT_NULL(out);
+  }
+}
+
+/* Applying a validated allowlist entry must actually set the socket option (a
+ * real setsockopt on a fresh TCP socket) so the config->wire path is proven. */
+static void test_sockopts_apply_sets_option() {
+  SockOptEntry* entries = NULL;
+  int count = 0;
+  EXPECT_EQ_INT(config_sockopts_parse("TCP_NODELAY=1,SO_REUSEADDR=1", &entries, &count), 0);
+
+  int fd = socket(AF_INET, SOCK_STREAM, 0);
+  EXPECT_TRUE(fd >= 0);
+  if (fd >= 0) {
+    for (int i = 0; i < count; i++) {
+      int value = entries[i].value;
+      int level = entries[i].id == SOCKOPT_TCP_NODELAY ? IPPROTO_TCP : SOL_SOCKET;
+      int name = entries[i].id == SOCKOPT_TCP_NODELAY ? TCP_NODELAY : SO_REUSEADDR;
+      EXPECT_EQ_INT(setsockopt(fd, level, name, &value, sizeof(value)), 0);
+    }
+    int got = 0;
+    socklen_t len = sizeof(got);
+    EXPECT_EQ_INT(getsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &got, &len), 0);
+    EXPECT_EQ_INT(got, 1);
+    close(fd);
+  }
+  free(entries);
+}
+
+/* server_create_ex with an explicit --address and family binds to that local
+ * address; the resulting socket's address family must match. */
+static void test_server_create_bind_address() {
+  ServerBindOptions opts;
+  opts.bind_address = "127.0.0.1";
+  opts.family = AF_INET;
+  Server* s = server_create_ex(0, &opts);
+  EXPECT_NOT_NULL(s);
+  if (s) {
+    EXPECT_EQ_INT(s->address.ss_family, AF_INET);
+    server_delete(&s);
+  }
+}
+
+/* An IPv6 bind is honored when the host supports it; on a host with no IPv6 a
+ * NULL return is acceptable (the feature degrades to unavailable, not wrong). */
+static void test_server_create_bind_ipv6() {
+  ServerBindOptions opts;
+  opts.bind_address = "::1";
+  opts.family = AF_INET6;
+  Server* s = server_create_ex(0, &opts);
+  if (s) {
+    EXPECT_EQ_INT(s->address.ss_family, AF_INET6);
+    server_delete(&s);
+  }
+}
 
 static void test_server_create_ephemeral() {
   Server* s = server_create(0);
   EXPECT_NOT_NULL(s);
   EXPECT_TRUE(s->file_descriptor >= 0);
-  EXPECT_EQ_INT(s->address.sin_family, AF_INET);
+  EXPECT_EQ_INT(s->address.ss_family, AF_INET);
   server_delete(&s);
   EXPECT_NULL(s);
 }
@@ -99,4 +211,10 @@ void test_transport_tcp() {
   test_server_create_specific_port();
   test_server_delete_double();
   test_client_disconnect_delete();
+  test_tcp_connect_family_hints();
+  test_sockopts_parse_valid();
+  test_sockopts_parse_rejects();
+  test_sockopts_apply_sets_option();
+  test_server_create_bind_address();
+  test_server_create_bind_ipv6();
 }