Use socketpair() rather than TCP connections.

Besides simplifying the code, this also makes it possible to run "make check"
in parallel -- previously this didn't work because several tests were trying to
bind the same port.

Signed-off-by: Adam Sampson <ats@offog.org>

1 files changed, 16 insertions, 76 deletions

diff --git a/tests/anonself.c b/tests/anonself.c
index ef69d52595..c76e8ba3f9 100644
--- a/tests/anonself.c
+++ b/tests/anonself.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2004-2012 Free Software Foundation, Inc.
+ * Copyright (C) 2013 Adam Sampson <ats@offog.org>
  *
  * Author: Simon Josefsson
  *
@@ -34,13 +35,10 @@
 #include <sys/socket.h>
 #if !defined(_WIN32)
 #include <sys/wait.h>
-#include <arpa/inet.h>
 #endif
 #include <unistd.h>
 #include <gnutls/gnutls.h>
 
-#include "tcp.c"
-
 #include "utils.h"
 
 static void
@@ -56,9 +54,9 @@ tls_log_func (int level, const char *str)
 #define MSG "Hello TLS"
 
 static void
-client (void)
+client (int sd)
 {
-  int ret, sd, ii;
+  int ret, ii;
   gnutls_session_t session;
   char buffer[MAX_BUF + 1];
   gnutls_anon_client_credentials_t anoncred;
@@ -83,10 +81,6 @@ client (void)
    */
   gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
 
-  /* connect to the peer
-   */
-  sd = tcp_connect ();
-
   gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) sd);
 
   /* Perform the TLS handshake
@@ -139,7 +133,7 @@ client (void)
 
 end:
 
-  tcp_close (sd);
+  close (sd);
 
   gnutls_deinit (session);
 
@@ -151,9 +145,7 @@ end:
 /* This is a sample TLS 1.0 echo server, for anonymous authentication only.
  */
 
-#define SA struct sockaddr
 #define MAX_BUF 1024
-#define PORT 5556               /* listen to 5556 port */
 #define DH_BITS 1024
 
 /* These are global */
@@ -193,59 +185,14 @@ generate_dh_params (void)
   return gnutls_dh_params_import_pkcs3 (dh_params, &p3, GNUTLS_X509_FMT_PEM);
 }
 
-int err, listen_sd, i;
-int sd, ret;
-struct sockaddr_in sa_serv;
-struct sockaddr_in sa_cli;
-socklen_t client_len;
+int err, ret;
 char topbuf[512];
 gnutls_session_t session;
 char buffer[MAX_BUF + 1];
 int optval = 1;
 
 static void
-server_start (void)
-{
-  /* Socket operations
-   */
-  listen_sd = socket (AF_INET, SOCK_STREAM, 0);
-  if (listen_sd == -1)
-    {
-      perror ("socket");
-      fail ("server: socket failed\n");
-      return;
-    }
-
-  memset (&sa_serv, '\0', sizeof (sa_serv));
-  sa_serv.sin_family = AF_INET;
-  sa_serv.sin_addr.s_addr = INADDR_ANY;
-  sa_serv.sin_port = htons (PORT);      /* Server Port number */
-
-  setsockopt (listen_sd, SOL_SOCKET, SO_REUSEADDR, (void *) &optval,
-              sizeof (int));
-
-  err = bind (listen_sd, (SA *) & sa_serv, sizeof (sa_serv));
-  if (err == -1)
-    {
-      perror ("bind");
-      fail ("server: bind failed\n");
-      return;
-    }
-
-  err = listen (listen_sd, 1024);
-  if (err == -1)
-    {
-      perror ("listen");
-      fail ("server: listen failed\n");
-      return;
-    }
-
-  if (debug)
-    success ("server: ready. Listening to port '%d'.\n", PORT);
-}
-
-static void
-server (void)
+server (int sd)
 {
   /* this must be called once in the program
    */
@@ -264,17 +211,8 @@ server (void)
 
   gnutls_anon_set_server_dh_params (anoncred, dh_params);
 
-  client_len = sizeof (sa_cli);
-
   session = initialize_tls_session ();
 
-  sd = accept (listen_sd, (SA *) & sa_cli, &client_len);
-
-  if (debug)
-    success ("server: connection from %s, port %d\n",
-             inet_ntop (AF_INET, &sa_cli.sin_addr, topbuf,
-                        sizeof (topbuf)), ntohs (sa_cli.sin_port));
-
   gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) sd);
   ret = gnutls_handshake (session);
   if (ret < 0)
@@ -295,7 +233,6 @@ server (void)
   /* see the Getting peer's information example */
   /* print_info(session); */
 
-  i = 0;
   for (;;)
     {
       memset (buffer, 0, MAX_BUF + 1);
@@ -326,8 +263,6 @@ server (void)
   close (sd);
   gnutls_deinit (session);
 
-  close (listen_sd);
-
   gnutls_anon_free_server_credentials (anoncred);
 
   gnutls_dh_params_deinit (dh_params);
@@ -342,10 +277,15 @@ void
 doit (void)
 {
   pid_t child;
+  int sockets[2];
 
-  server_start ();
-  if (error_count)
-    return;
+  err = socketpair (AF_UNIX, SOCK_STREAM, 0, sockets);
+  if (err == -1)
+    {
+      perror ("socketpair");
+      fail ("socketpair failed\n");
+      return;
+    }
 
   child = fork ();
   if (child < 0)
@@ -359,9 +299,9 @@ doit (void)
     {
       int status;
       /* parent */
-      server ();
+      server (sockets[0]);
       wait (&status);
     }
   else
-    client ();
+    client (sockets[1]);
 }