-fixing

[oweals/gnunet.git] / src / util / test_client.c

diff --git a/src/util/test_client.c b/src/util/test_client.c
index bb7d5008ac4e0696e224943b6b7d9a665a1e44d1..7d7ec8cff1eec3c21f0c624f848b83521caa627e 100644 (file)
--- a/src/util/test_client.c
+++ b/src/util/test_client.c
@@ -29,7 +29,6 @@
 #include "gnunet_server_lib.h"
 #include "gnunet_time_lib.h"
 
-#define VERBOSE GNUNET_EXTRA_LOGGING
 
 #define PORT 14325
 
@@ -109,7 +108,7 @@ recv_bounce (void *cls, const struct GNUNET_MessageHeader *got)
   msg.type = htons (MY_TYPE);
   msg.size = htons (sizeof (struct GNUNET_MessageHeader));
   GNUNET_assert (0 == memcmp (got, &msg, sizeof (struct GNUNET_MessageHeader)));
-  GNUNET_CLIENT_disconnect (client, GNUNET_YES);
+  GNUNET_CLIENT_disconnect (client);
   client = NULL;
   GNUNET_SERVER_destroy (server);
   server = NULL;
@@ -137,6 +136,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 +173,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 +192,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 */