reindented code

1 files changed, 259 insertions, 289 deletions

diff --git a/tests/mini-dtls-heartbeat.c b/tests/mini-dtls-heartbeat.c
index 5b4d995aeb..1fea6b65df 100644
--- a/tests/mini-dtls-heartbeat.c
+++ b/tests/mini-dtls-heartbeat.c
@@ -29,10 +29,9 @@
 
 #if defined(_WIN32) || !defined(ENABLE_HEARTBEAT)
 
-int
-main ()
+int main()
 {
-    exit (77);
+	exit(77);
 }
 
 #else
@@ -49,21 +48,19 @@ main ()
 
 #include "utils.h"
 
-static void terminate (void);
+static void terminate(void);
 
 /* This program tests the rehandshake in DTLS
  */
 
-static void
-server_log_func (int level, const char *str)
+static void server_log_func(int level, const char *str)
 {
-    fprintf (stderr, "server|<%d>| %s", level, str);
+	fprintf(stderr, "server|<%d>| %s", level, str);
 }
 
-static void
-client_log_func (int level, const char *str)
+static void client_log_func(int level, const char *str)
 {
-    fprintf (stderr, "client|<%d>| %s", level, str);
+	fprintf(stderr, "client|<%d>| %s", level, str);
 }
 
 /* These are global */
@@ -75,306 +72,279 @@ static pid_t child;
 #define MAX_BUF 1024
 
 
-static void
-client (int fd, int server_init)
+static void client(int fd, int server_init)
 {
-    gnutls_session_t session;
-    int ret, ret2;
-    char buffer[MAX_BUF + 1];
-    gnutls_anon_client_credentials_t anoncred;
-    /* Need to enable anonymous KX specifically. */
-
-    global_init ();
-
-    if (debug)
-      {
-          gnutls_global_set_log_function (client_log_func);
-          gnutls_global_set_log_level (4711);
-      }
-
-    gnutls_anon_allocate_client_credentials (&anoncred);
-
-    /* Initialize TLS session
-     */
-    gnutls_init (&session, GNUTLS_CLIENT | GNUTLS_DATAGRAM);
-    gnutls_heartbeat_enable (session, GNUTLS_HB_PEER_ALLOWED_TO_SEND);
-    gnutls_dtls_set_mtu (session, 1500);
-
-    /* Use default priorities */
-    gnutls_priority_set_direct (session,
-                                "NONE:+VERS-DTLS1.0:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-ECDH:+CURVE-ALL",
-                                NULL);
-
-    /* put the anonymous credentials to the current session
-     */
-    gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
-
-    gnutls_transport_set_int (session, fd);
-
-    /* Perform the TLS handshake
-     */
-    do
-      {
-          ret = gnutls_handshake (session);
-      }
-    while (ret < 0 && gnutls_error_is_fatal (ret) == 0);
-
-    if (ret < 0)
-      {
-          fail ("client: Handshake failed\n");
-          gnutls_perror (ret);
-          exit (1);
-      }
-    else
-      {
-          if (debug)
-              success ("client: Handshake was completed\n");
-      }
-
-    if (debug)
-        success ("client: DTLS version is: %s\n",
-                 gnutls_protocol_get_name (gnutls_protocol_get_version
-                                           (session)));
-
-    if (!server_init)
-      {
-          do
-            {
-                ret =
-                    gnutls_record_recv (session, buffer, sizeof (buffer));
-
-                if (ret == GNUTLS_E_HEARTBEAT_PING_RECEIVED)
-                  {
-                      if (debug)
-                          success ("Ping received. Replying with pong.\n");
-                      ret2 = gnutls_heartbeat_pong (session, 0);
-                      if (ret2 < 0)
-                        {
-                            fail ("pong: %s\n", gnutls_strerror (ret));
-                            terminate ();
-                        }
-                  }
-            }
-          while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED
-                 || ret == GNUTLS_E_HEARTBEAT_PING_RECEIVED);
-
-          if (ret < 0)
-            {
-                fail ("recv: %s\n", gnutls_strerror (ret));
-                terminate();
-            }
-      }
-    else
-      {
-          do
-            {
-                ret =
-                    gnutls_heartbeat_ping (session, 256, 5,
-                                           GNUTLS_HEARTBEAT_WAIT);
-
-                if (debug)
-                  success ("Ping sent.\n");
-            }
-          while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED);
-
-          if (ret < 0)
-            {
-                fail ("ping: %s\n", gnutls_strerror (ret));
-                terminate ();
-            }
-      }
-
-    gnutls_bye (session, GNUTLS_SHUT_WR);
-
-    close (fd);
-
-    gnutls_deinit (session);
-
-    gnutls_anon_free_client_credentials (anoncred);
-
-    gnutls_global_deinit ();
+	gnutls_session_t session;
+	int ret, ret2;
+	char buffer[MAX_BUF + 1];
+	gnutls_anon_client_credentials_t anoncred;
+	/* Need to enable anonymous KX specifically. */
+
+	global_init();
+
+	if (debug) {
+		gnutls_global_set_log_function(client_log_func);
+		gnutls_global_set_log_level(4711);
+	}
+
+	gnutls_anon_allocate_client_credentials(&anoncred);
+
+	/* Initialize TLS session
+	 */
+	gnutls_init(&session, GNUTLS_CLIENT | GNUTLS_DATAGRAM);
+	gnutls_heartbeat_enable(session, GNUTLS_HB_PEER_ALLOWED_TO_SEND);
+	gnutls_dtls_set_mtu(session, 1500);
+
+	/* Use default priorities */
+	gnutls_priority_set_direct(session,
+				   "NONE:+VERS-DTLS1.0:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-ECDH:+CURVE-ALL",
+				   NULL);
+
+	/* put the anonymous credentials to the current session
+	 */
+	gnutls_credentials_set(session, GNUTLS_CRD_ANON, anoncred);
+
+	gnutls_transport_set_int(session, fd);
+
+	/* Perform the TLS handshake
+	 */
+	do {
+		ret = gnutls_handshake(session);
+	}
+	while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
+
+	if (ret < 0) {
+		fail("client: Handshake failed\n");
+		gnutls_perror(ret);
+		exit(1);
+	} else {
+		if (debug)
+			success("client: Handshake was completed\n");
+	}
+
+	if (debug)
+		success("client: DTLS version is: %s\n",
+			gnutls_protocol_get_name
+			(gnutls_protocol_get_version(session)));
+
+	if (!server_init) {
+		do {
+			ret =
+			    gnutls_record_recv(session, buffer,
+					       sizeof(buffer));
+
+			if (ret == GNUTLS_E_HEARTBEAT_PING_RECEIVED) {
+				if (debug)
+					success
+					    ("Ping received. Replying with pong.\n");
+				ret2 = gnutls_heartbeat_pong(session, 0);
+				if (ret2 < 0) {
+					fail("pong: %s\n",
+					     gnutls_strerror(ret));
+					terminate();
+				}
+			}
+		}
+		while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED
+		       || ret == GNUTLS_E_HEARTBEAT_PING_RECEIVED);
+
+		if (ret < 0) {
+			fail("recv: %s\n", gnutls_strerror(ret));
+			terminate();
+		}
+	} else {
+		do {
+			ret =
+			    gnutls_heartbeat_ping(session, 256, 5,
+						  GNUTLS_HEARTBEAT_WAIT);
+
+			if (debug)
+				success("Ping sent.\n");
+		}
+		while (ret == GNUTLS_E_AGAIN
+		       || ret == GNUTLS_E_INTERRUPTED);
+
+		if (ret < 0) {
+			fail("ping: %s\n", gnutls_strerror(ret));
+			terminate();
+		}
+	}
+
+	gnutls_bye(session, GNUTLS_SHUT_WR);
+
+	close(fd);
+
+	gnutls_deinit(session);
+
+	gnutls_anon_free_client_credentials(anoncred);
+
+	gnutls_global_deinit();
 }
 
 
 
-static gnutls_session_t
-initialize_tls_session (void)
+static gnutls_session_t initialize_tls_session(void)
 {
-    gnutls_session_t session;
+	gnutls_session_t session;
 
-    gnutls_init (&session, GNUTLS_SERVER | GNUTLS_DATAGRAM);
-    gnutls_heartbeat_enable (session, GNUTLS_HB_PEER_ALLOWED_TO_SEND);
-    gnutls_dtls_set_mtu (session, 1500);
+	gnutls_init(&session, GNUTLS_SERVER | GNUTLS_DATAGRAM);
+	gnutls_heartbeat_enable(session, GNUTLS_HB_PEER_ALLOWED_TO_SEND);
+	gnutls_dtls_set_mtu(session, 1500);
 
-    /* avoid calling all the priority functions, since the defaults
-     * are adequate.
-     */
-    gnutls_priority_set_direct (session,
-                                "NONE:+VERS-DTLS1.0:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-ECDH:+CURVE-ALL",
-                                NULL);
+	/* avoid calling all the priority functions, since the defaults
+	 * are adequate.
+	 */
+	gnutls_priority_set_direct(session,
+				   "NONE:+VERS-DTLS1.0:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-ECDH:+CURVE-ALL",
+				   NULL);
 
-    return session;
+	return session;
 }
 
-static void
-terminate (void)
+static void terminate(void)
 {
-    int status;
+	int status;
 
-    kill (child, SIGTERM);
-    wait (&status);
-    exit (1);
+	kill(child, SIGTERM);
+	wait(&status);
+	exit(1);
 }
 
-static void
-server (int fd, int server_init)
+static void server(int fd, int server_init)
 {
-    int ret, ret2;
-    char buffer[MAX_BUF + 1];
-    gnutls_session_t session;
-    gnutls_anon_server_credentials_t anoncred;
-    /* this must be called once in the program
-     */
-    global_init ();
-
-    if (debug)
-      {
-          gnutls_global_set_log_function (server_log_func);
-          gnutls_global_set_log_level (4711);
-      }
-
-    gnutls_anon_allocate_server_credentials (&anoncred);
-
-    session = initialize_tls_session ();
-    gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
-
-    gnutls_transport_set_int (session, fd);
-
-    do
-      {
-          ret = gnutls_handshake (session);
-      }
-    while (ret < 0 && gnutls_error_is_fatal (ret) == 0);
-    if (ret < 0)
-      {
-          close (fd);
-          gnutls_deinit (session);
-          fail ("server: Handshake has failed (%s)\n\n",
-                gnutls_strerror (ret));
-          terminate ();
-      }
-    if (debug)
-        success ("server: Handshake was completed\n");
-
-    if (debug)
-        success ("server: TLS version is: %s\n",
-                 gnutls_protocol_get_name (gnutls_protocol_get_version
-                                           (session)));
-
-    /* see the Getting peer's information example */
-    /* print_info(session); */
-
-    if (server_init)
-      {
-          do
-            {
-                ret =
-                    gnutls_record_recv (session, buffer, sizeof (buffer));
-
-                if (ret == GNUTLS_E_HEARTBEAT_PING_RECEIVED)
-                  {
-                      if (debug)
-                          success ("Ping received. Replying with pong.\n");
-                      ret2 = gnutls_heartbeat_pong (session, 0);
-                      if (ret2 < 0)
-                        {
-                            fail ("pong: %s\n", gnutls_strerror (ret));
-                            terminate ();
-                        }
-                  }
-            }
-          while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED
-                 || ret == GNUTLS_E_HEARTBEAT_PING_RECEIVED);
-      }
-    else
-      {
-          do
-            {
-                ret =
-                    gnutls_heartbeat_ping (session, 256, 5,
-                                           GNUTLS_HEARTBEAT_WAIT);
-
-                if (debug)
-                  success ("Ping sent.\n");
-            }
-          while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED);
-
-          if (ret < 0)
-            {
-                fail ("ping: %s\n", gnutls_strerror (ret));
-                terminate ();
-            }
-      }
-
-    /* do not wait for the peer to close the connection.
-     */
-    gnutls_bye (session, GNUTLS_SHUT_WR);
-
-    close (fd);
-    gnutls_deinit (session);
-
-    gnutls_anon_free_server_credentials (anoncred);
-
-    gnutls_global_deinit ();
-
-    if (debug)
-        success ("server: finished\n");
+	int ret, ret2;
+	char buffer[MAX_BUF + 1];
+	gnutls_session_t session;
+	gnutls_anon_server_credentials_t anoncred;
+	/* this must be called once in the program
+	 */
+	global_init();
+
+	if (debug) {
+		gnutls_global_set_log_function(server_log_func);
+		gnutls_global_set_log_level(4711);
+	}
+
+	gnutls_anon_allocate_server_credentials(&anoncred);
+
+	session = initialize_tls_session();
+	gnutls_credentials_set(session, GNUTLS_CRD_ANON, anoncred);
+
+	gnutls_transport_set_int(session, fd);
+
+	do {
+		ret = gnutls_handshake(session);
+	}
+	while (ret < 0 && gnutls_error_is_fatal(ret) == 0);
+	if (ret < 0) {
+		close(fd);
+		gnutls_deinit(session);
+		fail("server: Handshake has failed (%s)\n\n",
+		     gnutls_strerror(ret));
+		terminate();
+	}
+	if (debug)
+		success("server: Handshake was completed\n");
+
+	if (debug)
+		success("server: TLS version is: %s\n",
+			gnutls_protocol_get_name
+			(gnutls_protocol_get_version(session)));
+
+	/* see the Getting peer's information example */
+	/* print_info(session); */
+
+	if (server_init) {
+		do {
+			ret =
+			    gnutls_record_recv(session, buffer,
+					       sizeof(buffer));
+
+			if (ret == GNUTLS_E_HEARTBEAT_PING_RECEIVED) {
+				if (debug)
+					success
+					    ("Ping received. Replying with pong.\n");
+				ret2 = gnutls_heartbeat_pong(session, 0);
+				if (ret2 < 0) {
+					fail("pong: %s\n",
+					     gnutls_strerror(ret));
+					terminate();
+				}
+			}
+		}
+		while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED
+		       || ret == GNUTLS_E_HEARTBEAT_PING_RECEIVED);
+	} else {
+		do {
+			ret =
+			    gnutls_heartbeat_ping(session, 256, 5,
+						  GNUTLS_HEARTBEAT_WAIT);
+
+			if (debug)
+				success("Ping sent.\n");
+		}
+		while (ret == GNUTLS_E_AGAIN
+		       || ret == GNUTLS_E_INTERRUPTED);
+
+		if (ret < 0) {
+			fail("ping: %s\n", gnutls_strerror(ret));
+			terminate();
+		}
+	}
+
+	/* do not wait for the peer to close the connection.
+	 */
+	gnutls_bye(session, GNUTLS_SHUT_WR);
+
+	close(fd);
+	gnutls_deinit(session);
+
+	gnutls_anon_free_server_credentials(anoncred);
+
+	gnutls_global_deinit();
+
+	if (debug)
+		success("server: finished\n");
 }
 
-static void
-start (int server_initiated)
+static void start(int server_initiated)
 {
-    int fd[2];
-    int ret;
-
-    ret = socketpair (AF_UNIX, SOCK_STREAM, 0, fd);
-    if (ret < 0)
-      {
-          perror ("socketpair");
-          exit (1);
-      }
-
-    child = fork ();
-    if (child < 0)
-      {
-          perror ("fork");
-          fail ("fork");
-          exit (1);
-      }
-
-    if (child)
-      {
-          int status;
-          /* parent */
-
-          server (fd[0], server_initiated);
-          wait (&status);
-          if (WEXITSTATUS (status) != 0)
-              fail ("Child died with status %d\n", WEXITSTATUS (status));
-      }
-    else
-      {
-          close (fd[0]);
-          client (fd[1], server_initiated);
-          exit (0);
-      }
+	int fd[2];
+	int ret;
+
+	ret = socketpair(AF_UNIX, SOCK_STREAM, 0, fd);
+	if (ret < 0) {
+		perror("socketpair");
+		exit(1);
+	}
+
+	child = fork();
+	if (child < 0) {
+		perror("fork");
+		fail("fork");
+		exit(1);
+	}
+
+	if (child) {
+		int status;
+		/* parent */
+
+		server(fd[0], server_initiated);
+		wait(&status);
+		if (WEXITSTATUS(status) != 0)
+			fail("Child died with status %d\n",
+			     WEXITSTATUS(status));
+	} else {
+		close(fd[0]);
+		client(fd[1], server_initiated);
+		exit(0);
+	}
 }
 
-void
-doit (void)
+void doit(void)
 {
-    start (0);
-    start (1);
+	start(0);
+	start(1);
 }
 
-#endif /* _WIN32 */
+#endif				/* _WIN32 */