/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+ 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
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @file util/test_client.c
* @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 PORT 14325
#define MYNAME "test_client"
-static struct GNUNET_CLIENT_Connection *client;
+static struct GNUNET_MQ_Handle *mq;
static struct GNUNET_SERVER_Handle *server;
struct GNUNET_MessageHeader *cpy;
};
+
static size_t
copy_msg (void *cls, size_t size, void *buf)
{
GNUNET_assert (sizeof (struct GNUNET_MessageHeader) == ntohs (cpy->size));
GNUNET_assert (size >= ntohs (cpy->size));
- memcpy (buf, cpy, ntohs (cpy->size));
+ GNUNET_memcpy (buf, cpy, ntohs (cpy->size));
GNUNET_SERVER_receive_done (ctx->client, GNUNET_OK);
GNUNET_free (cpy);
GNUNET_free (ctx);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Message bounced back to client\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Message bounced back to client\n");
return sizeof (struct GNUNET_MessageHeader);
}
* Callback that just bounces the message back to the sender.
*/
static void
-echo_cb (void *cls, struct GNUNET_SERVER_Client *client,
+echo_cb (void *cls,
+ struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
struct CopyContext *cc;
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));
+ GNUNET_memcpy (cpy, message, ntohs (message->size));
cc->cpy = cpy;
GNUNET_assert (NULL !=
GNUNET_SERVER_notify_transmit_ready (client,
static void
-recv_bounce (void *cls, const struct GNUNET_MessageHeader *got)
+handle_bounce (void *cls,
+ const struct GNUNET_MessageHeader *got)
{
int *ok = cls;
- struct GNUNET_MessageHeader msg;
-
- GNUNET_assert (got != NULL); /* timeout */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving bounce, checking content\n");
- 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);
- client = NULL;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Receiving bounce, checking content\n");
+ GNUNET_assert (NULL != got);
+ GNUNET_MQ_destroy (mq);
+ mq = NULL;
GNUNET_SERVER_destroy (server);
server = NULL;
*ok = 0;
}
-static size_t
-make_msg (void *cls, size_t size, void *buf)
+/**
+ * Generic error handler, called with the appropriate error code and
+ * the same closure specified at the creation of the message queue.
+ * Not every message queue implementation supports an error handler.
+ *
+ * @param cls closure with the `struct GNUNET_STATISTICS_Handle *`
+ * @param error error code
+ */
+static void
+mq_error_handler (void *cls,
+ enum GNUNET_MQ_Error error)
{
- struct GNUNET_MessageHeader *msg = buf;
-
- GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader));
- msg->type = htons (MY_TYPE);
- msg->size = htons (sizeof (struct GNUNET_MessageHeader));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating message for transmission\n");
- return sizeof (struct GNUNET_MessageHeader);
+ GNUNET_assert (0); /* should never happen */
}
static void
-task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+task (void *cls)
{
struct sockaddr_in sa;
struct sockaddr *sap[2];
socklen_t slens[2];
+ struct GNUNET_MQ_Envelope *env;
+ struct GNUNET_MessageHeader *msg;
+ struct GNUNET_MQ_MessageHandler chandlers[] = {
+ GNUNET_MQ_hd_fixed_size (bounce,
+ MY_TYPE,
+ struct GNUNET_MessageHeader,
+ cls),
+ GNUNET_MQ_handler_end ()
+ };
/* test that ill-configured client fails instantly */
- GNUNET_assert (NULL == GNUNET_CLIENT_connect ("invalid-service", cfg));
+ GNUNET_assert (NULL == GNUNET_CLIENT_connecT (cfg,
+ "invalid-service",
+ NULL,
+ &mq_error_handler,
+ NULL));
/* test IPC between client and server */
sap[0] = (struct sockaddr *) &sa;
server =
GNUNET_SERVER_create (NULL, NULL, sap, slens,
GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_MILLISECONDS, 10000), GNUNET_NO);
+ (GNUNET_TIME_UNIT_SECONDS, 10), GNUNET_NO);
GNUNET_assert (server != NULL);
handlers[0].callback_cls = cls;
handlers[1].callback_cls = cls;
GNUNET_SERVER_add_handlers (server, handlers);
- client = GNUNET_CLIENT_connect (MYNAME, cfg);
- GNUNET_assert (client != NULL);
- GNUNET_assert (NULL !=
- GNUNET_CLIENT_notify_transmit_ready (client,
- sizeof (struct
- GNUNET_MessageHeader),
- GNUNET_TIME_UNIT_SECONDS,
- GNUNET_NO, &make_msg,
- NULL));
- GNUNET_CLIENT_receive (client, &recv_bounce, cls,
- GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_MILLISECONDS, 10000));
+ mq = GNUNET_CLIENT_connecT (cfg,
+ MYNAME,
+ chandlers,
+ &mq_error_handler,
+ NULL);
+ GNUNET_assert (NULL != mq);
+ env = GNUNET_MQ_msg (msg,
+ MY_TYPE);
+ GNUNET_MQ_send (mq,
+ env);
}
cfg = GNUNET_CONFIGURATION_create ();
GNUNET_CONFIGURATION_set_value_number (cfg, MYNAME, "PORT", PORT);
GNUNET_CONFIGURATION_set_value_string (cfg, MYNAME, "HOSTNAME", "localhost");
- GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME",
- "localhost");
ok = 1;
GNUNET_SCHEDULER_run (&task, &ok);
GNUNET_CONFIGURATION_destroy (cfg);
projects / oweals / gnunet.git / blobdiff