From b97332aac1d2c14ba8985e82fad90077673027c0 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 5 Jul 2016 12:10:06 +0000 Subject: [PATCH] update remaining tests to use new MQ API --- src/util/test_server_disconnect.c | 43 +++++++---------- src/util/test_server_with_client.c | 64 ++++++++++++------------- src/util/test_server_with_client_unix.c | 48 ++++++++----------- 3 files changed, 68 insertions(+), 87 deletions(-) diff --git a/src/util/test_server_disconnect.c b/src/util/test_server_disconnect.c index f59fa547f..de9c4722d 100644 --- a/src/util/test_server_disconnect.c +++ b/src/util/test_server_disconnect.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - Copyright (C) 2009, 2010 GNUnet e.V. + Copyright (C) 2009, 2010, 2016 GNUnet e.V. GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -33,7 +33,7 @@ static struct GNUNET_SERVER_Handle *server; -static struct GNUNET_CLIENT_Connection *cc; +static struct GNUNET_MQ_Handle *mq; static struct GNUNET_CONFIGURATION_Handle *cfg; @@ -46,7 +46,7 @@ finish_up (void *cls) GNUNET_assert (ok == 5); ok = 0; GNUNET_SERVER_destroy (server); - GNUNET_CLIENT_disconnect (cc); + GNUNET_MQ_destroy (mq); GNUNET_CONFIGURATION_destroy (cfg); } @@ -96,27 +96,14 @@ static struct GNUNET_SERVER_MessageHandler handlers[] = { }; -static size_t -transmit_initial_message (void *cls, size_t size, void *buf) -{ - struct GNUNET_MessageHeader msg; - - GNUNET_assert (ok == 1); - ok = 2; - GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader)); - msg.type = htons (MY_TYPE); - msg.size = htons (sizeof (struct GNUNET_MessageHeader)); - memcpy (buf, &msg, sizeof (struct GNUNET_MessageHeader)); - return sizeof (struct GNUNET_MessageHeader); -} - - static void task (void *cls) { struct sockaddr_in sa; struct sockaddr *sap[2]; socklen_t slens[2]; + struct GNUNET_MQ_Envelope *env; + struct GNUNET_MessageHeader *msg; sap[0] = (struct sockaddr *) &sa; slens[0] = sizeof (sa); @@ -138,15 +125,17 @@ task (void *cls) "localhost"); GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", "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)); + mq = GNUNET_CLIENT_connecT (cfg, + "test-server", + NULL, + NULL, + NULL); + GNUNET_assert (NULL != mq); + ok = 2; + env = GNUNET_MQ_msg (msg, + MY_TYPE); + GNUNET_MQ_send (mq, + env); } diff --git a/src/util/test_server_with_client.c b/src/util/test_server_with_client.c index 8a8f65474..59f9b6afd 100644 --- a/src/util/test_server_with_client.c +++ b/src/util/test_server_with_client.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - Copyright (C) 2009 GNUnet e.V. + Copyright (C) 2009, 2016 GNUnet e.V. GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -33,12 +33,13 @@ static struct GNUNET_SERVER_Handle *server; -static struct GNUNET_CLIENT_Connection *client; +static struct GNUNET_MQ_Handle *mq; static struct GNUNET_CONFIGURATION_Handle *cfg; static int ok; + static void send_done (void *cls) { @@ -51,7 +52,8 @@ send_done (void *cls) static void -recv_cb (void *cls, struct GNUNET_SERVER_Client *argclient, +recv_cb (void *cls, + struct GNUNET_SERVER_Client *argclient, const struct GNUNET_MessageHeader *message) { void *addr; @@ -60,7 +62,9 @@ recv_cb (void *cls, struct GNUNET_SERVER_Client *argclient, struct sockaddr_in *have; GNUNET_assert (GNUNET_OK == - GNUNET_SERVER_client_get_address (argclient, &addr, &addrlen)); + GNUNET_SERVER_client_get_address (argclient, + &addr, + &addrlen)); GNUNET_assert (addrlen == sizeof (struct sockaddr_in)); have = addr; @@ -79,12 +83,14 @@ recv_cb (void *cls, struct GNUNET_SERVER_Client *argclient, ok++; GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 50), - &send_done, argclient); + &send_done, + argclient); break; case 4: ok++; - GNUNET_CLIENT_disconnect (client); - GNUNET_SERVER_receive_done (argclient, GNUNET_OK); + GNUNET_MQ_destroy (mq); + GNUNET_SERVER_receive_done (argclient, + GNUNET_OK); break; default: GNUNET_assert (0); @@ -111,7 +117,8 @@ clean_up (void *cls) * @param client identification of the client */ static void -notify_disconnect (void *cls, struct GNUNET_SERVER_Client *client) +notify_disconnect (void *cls, + struct GNUNET_SERVER_Client *client) { if (client == NULL) return; @@ -121,24 +128,6 @@ notify_disconnect (void *cls, struct GNUNET_SERVER_Client *client) } -static size_t -notify_ready (void *cls, size_t size, void *buf) -{ - struct GNUNET_MessageHeader *msg; - - GNUNET_assert (size >= 256); - GNUNET_assert (1 == ok); - ok++; - msg = buf; - msg->type = htons (MY_TYPE); - msg->size = htons (sizeof (struct GNUNET_MessageHeader)); - msg++; - msg->type = htons (MY_TYPE); - msg->size = htons (sizeof (struct GNUNET_MessageHeader)); - return 2 * sizeof (struct GNUNET_MessageHeader); -} - - static struct GNUNET_SERVER_MessageHandler handlers[] = { {&recv_cb, NULL, MY_TYPE, sizeof (struct GNUNET_MessageHeader)}, {NULL, NULL, 0, 0} @@ -151,6 +140,8 @@ task (void *cls) struct sockaddr_in sa; struct sockaddr *sap[2]; socklen_t slens[2]; + struct GNUNET_MQ_Envelope *env; + struct GNUNET_MessageHeader *msg; sap[0] = (struct sockaddr *) &sa; slens[0] = sizeof (sa); @@ -175,12 +166,21 @@ task (void *cls) GNUNET_CONFIGURATION_set_value_string (cfg, "test", "HOSTNAME", "localhost"); GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", "localhost"); - client = GNUNET_CLIENT_connect ("test", cfg); - GNUNET_assert (client != NULL); - GNUNET_CLIENT_notify_transmit_ready (client, 256, - GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_MILLISECONDS, 250), - GNUNET_NO, ¬ify_ready, NULL); + mq = GNUNET_CLIENT_connecT (cfg, + "test", + NULL, + NULL, + NULL); + GNUNET_assert (NULL != mq); + ok = 2; + env = GNUNET_MQ_msg (msg, + MY_TYPE); + GNUNET_MQ_send (mq, + env); + env = GNUNET_MQ_msg (msg, + MY_TYPE); + GNUNET_MQ_send (mq, + env); } diff --git a/src/util/test_server_with_client_unix.c b/src/util/test_server_with_client_unix.c index 64f1d9c23..ef48aabce 100644 --- a/src/util/test_server_with_client_unix.c +++ b/src/util/test_server_with_client_unix.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - Copyright (C) 2009 GNUnet e.V. + Copyright (C) 2009, 2016 GNUnet e.V. GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -31,7 +31,7 @@ static struct GNUNET_SERVER_Handle *server; -static struct GNUNET_CLIENT_Connection *client; +static struct GNUNET_MQ_Handle *mq; static struct GNUNET_CONFIGURATION_Handle *cfg; @@ -65,7 +65,7 @@ recv_cb (void *cls, break; case 4: ok++; - GNUNET_CLIENT_disconnect (client); + GNUNET_MQ_destroy (mq); GNUNET_SERVER_receive_done (argclient, GNUNET_OK); break; default: @@ -104,24 +104,6 @@ notify_disconnect (void *cls, } -static size_t -notify_ready (void *cls, size_t size, void *buf) -{ - struct GNUNET_MessageHeader *msg; - - GNUNET_assert (size >= 256); - GNUNET_assert (1 == ok); - ok++; - msg = buf; - msg->type = htons (MY_TYPE); - msg->size = htons (sizeof (struct GNUNET_MessageHeader)); - msg++; - msg->type = htons (MY_TYPE); - msg->size = htons (sizeof (struct GNUNET_MessageHeader)); - return 2 * sizeof (struct GNUNET_MessageHeader); -} - - static struct GNUNET_SERVER_MessageHandler handlers[] = { {&recv_cb, NULL, MY_TYPE, sizeof (struct GNUNET_MessageHeader)}, {NULL, NULL, 0, 0} @@ -135,6 +117,8 @@ task (void *cls) const char *unixpath = "/tmp/testsock"; struct sockaddr *sap[2]; socklen_t slens[2]; + struct GNUNET_MQ_Envelope *env; + struct GNUNET_MessageHeader *msg; memset (&un, 0, sizeof (un)); un.sun_family = AF_UNIX; @@ -160,13 +144,21 @@ task (void *cls) GNUNET_CONFIGURATION_set_value_string (cfg, "test", "UNIXPATH", unixpath); GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", "localhost"); - - client = GNUNET_CLIENT_connect ("test", cfg); - GNUNET_assert (client != NULL); - GNUNET_CLIENT_notify_transmit_ready (client, 256, - GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_MILLISECONDS, 250), - GNUNET_NO, ¬ify_ready, NULL); + mq = GNUNET_CLIENT_connecT (cfg, + "test", + NULL, + NULL, + NULL); + GNUNET_assert (NULL != mq); + ok = 2; + env = GNUNET_MQ_msg (msg, + MY_TYPE); + GNUNET_MQ_send (mq, + env); + env = GNUNET_MQ_msg (msg, + MY_TYPE); + GNUNET_MQ_send (mq, + env); } -- 2.25.1