X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Ftest_client.c;h=ae3bfdb953c119ae69f404dd8b00e43d7540901a;hb=65f518e8036699fa3c574266d39e3cd1263af9e8;hp=92b9ed49fdf5e210786e48cef7f8e71a0539298b;hpb=ccc7218f3d2008d4e7ec5e222ba6b6451ec677ba;p=oweals%2Fgnunet.git

diff --git a/src/util/test_client.c b/src/util/test_client.c
index 92b9ed49f..ae3bfdb95 100644
--- a/src/util/test_client.c
+++ b/src/util/test_client.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -22,14 +22,8 @@
  * @brief tests for client.c
  */
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_client_lib.h"
-#include "gnunet_configuration_lib.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_server_lib.h"
-#include "gnunet_time_lib.h"
+#include "gnunet_util_lib.h"
 
-#define VERBOSE GNUNET_NO
 
 #define PORT 14325
 
@@ -79,7 +73,7 @@ echo_cb (void *cls, struct GNUNET_SERVER_Client *client,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Receiving message from client, bouncing back\n");
   GNUNET_assert (sizeof (struct GNUNET_MessageHeader) == ntohs (message->size));
-  cc = GNUNET_malloc (sizeof (struct CopyContext));
+  cc = GNUNET_new (struct CopyContext);
   cc->client = client;
   cpy = GNUNET_malloc (ntohs (message->size));
   memcpy (cpy, message, ntohs (message->size));
@@ -137,6 +131,10 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   struct sockaddr *sap[2];
   socklen_t slens[2];
 
+  /* test that ill-configured client fails instantly */
+  GNUNET_assert (NULL == GNUNET_CLIENT_connect ("invalid-service", cfg));
+
+  /* test IPC between client and server */
   sap[0] = (struct sockaddr *) &sa;
   slens[0] = sizeof (sa);
   sap[1] = NULL;
@@ -170,15 +168,14 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 }
 
 
-/**
- * Main method, starts scheduler with task1,
- * checks that "ok" is correct at the end.
- */
-static int
-check ()
+int
+main (int argc, char *argv[])
 {
   int ok;
 
+  GNUNET_log_setup ("test_client",
+                    "WARNING",
+                    NULL);
   cfg = GNUNET_CONFIGURATION_create ();
   GNUNET_CONFIGURATION_set_value_number (cfg, MYNAME, "PORT", PORT);
   GNUNET_CONFIGURATION_set_value_string (cfg, MYNAME, "HOSTNAME", "localhost");
@@ -190,21 +187,4 @@ check ()
   return ok;
 }
 
-int
-main (int argc, char *argv[])
-{
-  int ret = 0;
-
-  GNUNET_log_setup ("test_client",
-#if VERBOSE
-                    "DEBUG",
-#else
-                    "WARNING",
-#endif
-                    NULL);
-  ret += check ();
-
-  return ret;
-}
-
 /* end of test_client.c */