/*
This file is part of GNUnet.
- Copyright (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_server_with_client.c
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, const struct GNUNET_SCHEDULER_TaskContext *tc)
+send_done (void *cls)
{
struct GNUNET_SERVER_Client *argclient = 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;
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;
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);
static void
-clean_up (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+clean_up (void *cls)
{
GNUNET_SERVER_destroy (server);
server = NULL;
* @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;
}
-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}
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;
sap[0] = (struct sockaddr *) &sa;
slens[0] = sizeof (sa);
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);
}