X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Ftest_server.c;h=c39744f8ae1d429b8db2bddc52a63408d97d9269;hb=4a25afcbc1cd57637f340a5b5369b999429b79f9;hp=360c9c2425e5536cd0d6c494952fbd665ebd535f;hpb=d9d94d0e53d26af75ec8241383d166544ebd79f3;p=oweals%2Fgnunet.git

diff --git a/src/util/test_server.c b/src/util/test_server.c
index 360c9c242..c39744f8a 100644
--- a/src/util/test_server.c
+++ b/src/util/test_server.c
@@ -22,17 +22,11 @@
  * @brief tests for server.c
  */
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_client_lib.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_server_lib.h"
-#include "gnunet_time_lib.h"
-
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#include "gnunet_util_lib.h"
 
 #define PORT 12435
 
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 250)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2)
 
 #define MY_TYPE 128
 #define MY_TYPE2 129
@@ -54,14 +48,14 @@ finish_up (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_assert (ok == 6);
   ok = 0;
   GNUNET_SERVER_destroy (server);
-  GNUNET_CLIENT_disconnect (cc, GNUNET_NO);
+  GNUNET_CLIENT_disconnect (cc);
   GNUNET_CONFIGURATION_destroy (cfg);
 }
 
 
 static void
 recv_fin_cb (void *cls, struct GNUNET_SERVER_Client *client,
-	     const struct GNUNET_MessageHeader *message)
+             const struct GNUNET_MessageHeader *message)
 {
   GNUNET_assert (ok == 5);
   ok = 6;
@@ -98,20 +92,19 @@ reply_msg (void *cls, size_t size, void *buf)
 
 static void
 recv_cb (void *cls, struct GNUNET_SERVER_Client *client,
-	 const struct GNUNET_MessageHeader *message)
+         const struct GNUNET_MessageHeader *message)
 {
   GNUNET_assert (ok == 2);
   ok = 3;
   argclient = client;
   GNUNET_SERVER_client_keep (argclient);
-  GNUNET_assert (sizeof (struct GNUNET_MessageHeader) ==
-		 ntohs (message->size));
+  GNUNET_assert (sizeof (struct GNUNET_MessageHeader) == ntohs (message->size));
   GNUNET_assert (MY_TYPE == ntohs (message->type));
   GNUNET_assert (NULL !=
-		 GNUNET_SERVER_notify_transmit_ready (client,
-						      ntohs (message->size),
-						      TIMEOUT, &reply_msg,
-						      NULL));
+                 GNUNET_SERVER_notify_transmit_ready (client,
+                                                      ntohs (message->size),
+                                                      TIMEOUT, &reply_msg,
+                                                      NULL));
 }
 
 
@@ -147,12 +140,12 @@ transmit_initial_message (void *cls, size_t size, void *buf)
   msg.size = htons (sizeof (struct GNUNET_MessageHeader));
   memcpy (buf, &msg, sizeof (struct GNUNET_MessageHeader));
   GNUNET_assert (NULL !=
-		 GNUNET_CLIENT_notify_transmit_ready (cc,
-						      sizeof (struct
-							      GNUNET_MessageHeader),
-						      TIMEOUT, GNUNET_YES,
-						      &transmit_second_message,
-						      NULL));
+                 GNUNET_CLIENT_notify_transmit_ready (cc,
+                                                      sizeof (struct
+                                                              GNUNET_MessageHeader),
+                                                      TIMEOUT, GNUNET_YES,
+                                                      &transmit_second_message,
+                                                      NULL));
   GNUNET_CLIENT_receive (cc, &first_reply_handler, NULL, TIMEOUT);
   return sizeof (struct GNUNET_MessageHeader);
 }
@@ -181,43 +174,28 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   cfg = GNUNET_CONFIGURATION_create ();
   GNUNET_CONFIGURATION_set_value_number (cfg, "test-server", "PORT", PORT);
   GNUNET_CONFIGURATION_set_value_string (cfg, "test-server", "HOSTNAME",
-					 "localhost");
+                                         "localhost");
   GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME",
-					 "localhost");
+                                         "localhost");
   cc = GNUNET_CLIENT_connect ("test-server", cfg);
   GNUNET_assert (cc != NULL);
   GNUNET_assert (NULL !=
-		 GNUNET_CLIENT_notify_transmit_ready (cc,
-						      sizeof (struct
-							      GNUNET_MessageHeader),
-						      TIMEOUT, GNUNET_YES,
-						      &transmit_initial_message,
-						      NULL));
-}
-
-
-/**
- * Main method, starts scheduler with task1,
- * checks that "ok" is correct at the end.
- */
-static int
-check ()
-{
-  ok = 1;
-  GNUNET_SCHEDULER_run (&task, &ok);
-  return ok;
+                 GNUNET_CLIENT_notify_transmit_ready (cc,
+                                                      sizeof (struct
+                                                              GNUNET_MessageHeader),
+                                                      TIMEOUT, GNUNET_YES,
+                                                      &transmit_initial_message,
+                                                      NULL));
 }
 
 
 int
 main (int argc, char *argv[])
 {
-  int ret = 0;
-
   GNUNET_log_setup ("test_server", "WARNING", NULL);
-  ret += check ();
-
-  return ret;
+  ok = 1;
+  GNUNET_SCHEDULER_run (&task, &ok);
+  return ok;
 }
 
 /* end of test_server.c */