THRIFT-4144: Listen before forking in the c_glib socket tests

Client: c_glib

The tests bound fixed ports 51198 and 51199, inside the Linux ephemeral
range, in a forked child while the parent slept a second. Any socket
already holding the port made the child's unchecked listen fail and the
parent's connect be refused. The parent now listens on a port the kernel
picks before forking, and the child inherits the socket; do not bring
back the fixed ports or the sleeps.

Without the sleep, the plain server in testtransportsslsocket could
reset the connection before the client wrote its handshake, killing the
client with SIGPIPE. That server now reads the first byte before closing.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: slachiewicz

lib/c_glib/test/Makefile.am

@@ -492,5 +492,6 @@ distdir:
 EXTRA_DIST = \
              CMakeLists.txt \
              ContainerTest.thrift \
-             RecursionLimitTest.thrift
+             RecursionLimitTest.thrift \
+             testserversocket.h
 

lib/c_glib/test/testbinaryprotocol.c

@@ -46,7 +46,6 @@
 #define TEST_I64 G_GINT64_CONSTANT (123456789012345)
 #define TEST_DOUBLE 1234567890.123
 #define TEST_STRING "this is a test string 1234567890!@#$%^&*()"
-#define TEST_PORT 51199
 
 static int transport_read_count = 0;
 static int transport_read_error = 0;
@@ -85,10 +84,11 @@ my_thrift_transport_write (ThriftTransport *transport, const gpointer buf,
 #include "../src/thrift/c_glib/protocol/thrift_binary_protocol.c"
 #undef thrift_transport_read_all
 #undef thrift_transport_write
+#include "testserversocket.h"
 
-static void thrift_server_primitives (const int port);
-static void thrift_server_complex_types (const int port);
-static void thrift_server_many_frames (const int port);
+static void thrift_server_primitives (ThriftServerSocket *tsocket);
+static void thrift_server_complex_types (ThriftServerSocket *tsocket);
+static void thrift_server_many_frames (ThriftServerSocket *tsocket);
 
 static void
 test_create_and_destroy(void)
@@ -136,20 +136,23 @@ test_read_and_write_primitives(void)
   ThriftProtocol *protocol = NULL;
   gpointer binary = (gpointer *) TEST_STRING;
   guint32 len = strlen (TEST_STRING);
-  int port = TEST_PORT;
+  ThriftServerSocket *server = NULL;
+  guint port = 0;
+
+  server = server_socket_new_on_free_port (NULL, &port);
 
   /* fork a server from the client */
   pid = fork ();
   g_assert (pid >= 0);
 
   if (pid == 0)
   {
-    /* child listens */
-    thrift_server_primitives (port);
+    /* child accepts */
+    thrift_server_primitives (server);
     exit (0);
   } else {
-    /* parent.  wait a bit for the socket to be created. */
-    sleep (1);
+    /* parent connects; the child owns the listening socket now */
+    g_object_unref (server);
 
     /* create a ThriftSocket */
     tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
@@ -219,20 +222,23 @@ test_read_and_write_complex_types (void)
   ThriftTransport *transport = NULL;
   ThriftBinaryProtocol *tb = NULL;
   ThriftProtocol *protocol = NULL;
-  int port = TEST_PORT;
+  ThriftServerSocket *server = NULL;
+  guint port = 0;
+
+  server = server_socket_new_on_free_port (NULL, &port);
 
   /* fork a server from the client */
   pid = fork ();
   g_assert (pid >= 0);
 
   if (pid == 0)
   {
-    /* child listens */
-    thrift_server_complex_types (port);
+    /* child accepts */
+    thrift_server_complex_types (server);
     exit (0);
   } else {
-    /* parent.  wait a bit for the socket to be created. */
-    sleep (1);
+    /* parent connects; the child owns the listening socket now */
+    g_object_unref (server);
 
     /* create a ThriftSocket */
     tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
@@ -408,20 +414,23 @@ test_read_and_write_many_frames (void)
   ThriftProtocol *protocol = NULL;
   gpointer binary = (gpointer *) TEST_STRING;
   const guint32 len = strlen (TEST_STRING);
-  int port = TEST_PORT;
+  ThriftServerSocket *server = NULL;
+  guint port = 0;
+
+  server = server_socket_new_on_free_port (NULL, &port);
 
   /* fork a server from the client */
   pid = fork ();
   g_assert (pid >= 0);
 
   if (pid == 0)
   {
-    /* child listens */
-    thrift_server_many_frames (port);
+    /* child accepts */
+    thrift_server_many_frames (server);
     exit (0);
   } else {
-    /* parent.  wait a bit for the socket to be created. */
-    sleep (1);
+    /* parent connects; the child owns the listening socket now */
+    g_object_unref (server);
 
     /* create a ThriftSocket */
     tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
@@ -485,7 +494,7 @@ test_read_and_write_many_frames (void)
 
 
 static void
-thrift_server_primitives (const int port)
+thrift_server_primitives (ThriftServerSocket *tsocket)
 {
   ThriftServerTransport *transport = NULL;
   ThriftTransport *client = NULL;
@@ -503,10 +512,7 @@ thrift_server_primitives (const int port)
   guint32 len = 0;
   void *comparator = (void *) TEST_STRING;
 
-  ThriftServerSocket *tsocket = g_object_new (THRIFT_TYPE_SERVER_SOCKET,
-                                              "port", port, NULL);
   transport = THRIFT_SERVER_TRANSPORT (tsocket);
-  thrift_server_transport_listen (transport, NULL);
   client = thrift_server_transport_accept (transport, NULL);
   g_assert (client != NULL);
 
@@ -585,7 +591,7 @@ thrift_server_primitives (const int port)
 }
 
 static void
-thrift_server_complex_types (const int port)
+thrift_server_complex_types (ThriftServerSocket *tsocket)
 {
   ThriftServerTransport *transport = NULL;
   ThriftTransport *client = NULL;
@@ -602,10 +608,7 @@ thrift_server_complex_types (const int port)
   gint32 seqid = 0;
   gint32 version = 0;
 
-  ThriftServerSocket *tsocket = g_object_new (THRIFT_TYPE_SERVER_SOCKET,
-                                              "port", port, NULL);
   transport = THRIFT_SERVER_TRANSPORT (tsocket);
-  thrift_server_transport_listen (transport, NULL);
   client = thrift_server_transport_accept (transport, NULL);
   g_assert (client != NULL);
 
@@ -773,13 +776,12 @@ thrift_server_complex_types (const int port)
 }
 
 static void
-thrift_server_many_frames (const int port)
+thrift_server_many_frames (ThriftServerSocket *tsocket)
 {
   ThriftServerTransport *transport = NULL;
   ThriftTransport *client = NULL;
   ThriftBinaryProtocol *tbp = NULL;
   ThriftProtocol *protocol = NULL;
-  ThriftServerSocket *tsocket = NULL;
   gboolean value_boolean = FALSE;
   gint8 value_byte = 0;
   gint16 value_16 = 0;
@@ -792,9 +794,7 @@ thrift_server_many_frames (const int port)
   guint32 len = 0;
   void *comparator = (void *) TEST_STRING;
 
-  tsocket = g_object_new (THRIFT_TYPE_SERVER_SOCKET, "port", port, NULL);
   transport = THRIFT_SERVER_TRANSPORT (tsocket);
-  thrift_server_transport_listen (transport, NULL);
 
   /* wrap the client in a framed transport */
   client = g_object_new (THRIFT_TYPE_FRAMED_TRANSPORT, "transport",

lib/c_glib/test/testbufferedtransport.c

@@ -30,9 +30,10 @@
 #define TEST_DATA { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j' }
 
 #include "../src/thrift/c_glib/transport/thrift_buffered_transport.c"
+#include "testserversocket.h"
 
-static void thrift_server (const int port);
-static void thrift_socket_server_open (const int port, int times);
+static void thrift_server (ThriftServerSocket *tsocket);
+static void thrift_socket_server_open (ThriftServerSocket *tsocket, int times);
 
 /* test object creation and destruction */
 static void
@@ -58,20 +59,23 @@ test_open_and_close(void)
   ThriftTransport *transport = NULL;
   GError *err = NULL;
   pid_t pid;
-  int port = 51199;
+  ThriftServerSocket *server = NULL;
+  guint port = 0;
   int status;
 
+  server = server_socket_new_on_free_port (NULL, &port);
+
   pid = fork ();
   g_assert ( pid >= 0 );
 
   if ( pid == 0 )
     {
-      /* child listens */
-      thrift_socket_server_open (port,1);
+      /* child accepts */
+      thrift_socket_server_open (server,1);
       exit (0);
     } else {
-	/* parent connects, wait a bit for the socket to be created */
-	sleep (1);
+	/* parent connects; the child owns the listening socket now */
+	g_object_unref (server);
 	/* create a ThriftSocket */
 	tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
 				"port", port, NULL);
@@ -112,20 +116,23 @@ test_read_and_write(void)
   pid_t pid;
   ThriftSocket *tsocket = NULL;
   ThriftTransport *transport = NULL;
-  int port = 51199;
+  ThriftServerSocket *server = NULL;
+  guint port = 0;
   guchar buf[10] = TEST_DATA; /* a buffer */
 
+  server = server_socket_new_on_free_port (NULL, &port);
+
   pid = fork ();
   g_assert ( pid >= 0 );
 
   if ( pid == 0 )
     {
-      /* child listens */
-      thrift_server (port);
+      /* child accepts */
+      thrift_server (server);
       exit (0);
     } else {
-	/* parent connects, wait a bit for the socket to be created */
-	sleep (1);
+	/* parent connects; the child owns the listening socket now */
+	g_object_unref (server);
 
 	tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
 				"port", port, NULL);
@@ -174,16 +181,12 @@ test_read_and_write(void)
 
 
 static void
-thrift_socket_server_open (const int port, int times)
+thrift_socket_server_open (ThriftServerSocket *tsocket, int times)
 {
-  ThriftServerTransport *transport = NULL;
+  ThriftServerTransport *transport = THRIFT_SERVER_TRANSPORT (tsocket);
   ThriftTransport *client = NULL;
   int i;
-  ThriftServerSocket *tsocket = g_object_new (THRIFT_TYPE_SERVER_SOCKET,
-					      "port", port, NULL);
 
-  transport = THRIFT_SERVER_TRANSPORT (tsocket);
-  thrift_server_transport_listen (transport, NULL);
   for(i=0;i<times;i++){
       client = thrift_server_transport_accept (transport, NULL);
       g_assert (client != NULL);
@@ -194,20 +197,14 @@ thrift_socket_server_open (const int port, int times)
 }
 
 static void
-thrift_server (const int port)
+thrift_server (ThriftServerSocket *tsocket)
 {
   int bytes = 0;
-  ThriftServerTransport *transport = NULL;
+  ThriftServerTransport *transport = THRIFT_SERVER_TRANSPORT (tsocket);
   ThriftTransport *client = NULL;
   guchar buf[10]; /* a buffer */
   guchar match[10] = TEST_DATA;
 
-  ThriftServerSocket *tsocket = g_object_new (THRIFT_TYPE_SERVER_SOCKET,
-					      "port", port, NULL);
-
-  transport = THRIFT_SERVER_TRANSPORT (tsocket);
-  thrift_server_transport_listen (transport, NULL);
-
   /* wrap the client in a BufferedTransport */
   client = g_object_new (THRIFT_TYPE_BUFFERED_TRANSPORT, "transport",
 			 thrift_server_transport_accept (transport, NULL),
@@ -239,27 +236,24 @@ test_write_fail(void)
   pid_t pid;
   ThriftSocket *tsocket = NULL;
   ThriftTransport *transport = NULL;
-  int port = 51198;
+  ThriftServerSocket *server = NULL;
+  guint port = 0;
   guchar buf[10] = TEST_DATA; /* a buffer */
 
   /* SIGPIPE when send to disconnected socket */
   signal(SIGPIPE, SIG_IGN);
 
+  server = server_socket_new_on_free_port (NULL, &port);
+
   pid = fork ();
   g_assert ( pid >= 0 );
 
   if ( pid == 0 )
     {
-      /* child listens */
-      ThriftServerTransport *transport = NULL;
+      /* child accepts */
+      ThriftServerTransport *transport = THRIFT_SERVER_TRANSPORT (server);
       ThriftTransport *client = NULL;
 
-      ThriftServerSocket *tsocket = g_object_new (THRIFT_TYPE_SERVER_SOCKET,
-						  "port", port, NULL);
-
-      transport = THRIFT_SERVER_TRANSPORT (tsocket);
-      thrift_server_transport_listen (transport, NULL);
-
       /* wrap the client in a BufferedTransport */
       client = g_object_new (THRIFT_TYPE_BUFFERED_TRANSPORT, "transport",
 			     thrift_server_transport_accept (transport, NULL),
@@ -269,11 +263,11 @@ test_write_fail(void)
       /* just close socket */
       thrift_buffered_transport_close (client, NULL);
       g_object_unref (client);
-      g_object_unref (tsocket);
+      g_object_unref (server);
       exit (0);
     } else {
-	/* parent connects, wait a bit for the socket to be created */
-	sleep (1);
+	/* parent connects; the child owns the listening socket now */
+	g_object_unref (server);
 
 	tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
 				"port", port, NULL);