/*
This file is part of GNUnet.
- (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+ 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
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_disconnect.c
* @brief tests for server.c, specifically GNUNET_SERVER_client_disconnect
*/
#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"
+#include "gnunet_util_lib.h"
-#define VERBOSE GNUNET_NO
#define PORT 12435
static struct GNUNET_SERVER_Handle *server;
-static struct GNUNET_CLIENT_Connection *cc;
+static struct GNUNET_MQ_Handle *mq;
static struct GNUNET_CONFIGURATION_Handle *cfg;
-static struct GNUNET_SCHEDULER_Handle *sched;
-
static int ok;
static void
-finish_up (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+finish_up (void *cls)
{
GNUNET_assert (ok == 5);
ok = 0;
GNUNET_SERVER_destroy (server);
- GNUNET_CLIENT_disconnect (cc, GNUNET_NO);
+ GNUNET_MQ_destroy (mq);
GNUNET_CONFIGURATION_destroy (cfg);
}
static void
-notify_disconnect (void *cls, struct GNUNET_SERVER_Client *clientarg)
+notify_disconnect (void *cls,
+ struct GNUNET_SERVER_Client *clientarg)
{
- if (clientarg == NULL)
+ if (NULL == clientarg)
return;
GNUNET_assert (ok == 4);
ok = 5;
- GNUNET_SCHEDULER_add_now (sched,
- &finish_up,
- NULL);
+ GNUNET_SCHEDULER_add_now (&finish_up, NULL);
}
static void
-server_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+server_disconnect (void *cls)
{
struct GNUNET_SERVER_Client *argclient = cls;
+
GNUNET_assert (ok == 3);
ok = 4;
GNUNET_SERVER_client_disconnect (argclient);
static void
recv_cb (void *cls,
- struct GNUNET_SERVER_Client *client,
+ struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
GNUNET_assert (ok == 2);
ok = 3;
GNUNET_SERVER_client_keep (client);
- GNUNET_SCHEDULER_add_now (sched,
- &server_disconnect, client);
- GNUNET_assert (sizeof (struct GNUNET_MessageHeader) ==
- ntohs (message->size));
+ GNUNET_SCHEDULER_add_now (&server_disconnect, client);
+ GNUNET_assert (sizeof (struct GNUNET_MessageHeader) == ntohs (message->size));
GNUNET_assert (MY_TYPE == ntohs (message->type));
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
};
-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, const struct GNUNET_SCHEDULER_TaskContext *tc)
+task (void *cls)
{
struct sockaddr_in sa;
- struct sockaddr * sap[2];
+ struct sockaddr *sap[2];
socklen_t slens[2];
+ struct GNUNET_MQ_Envelope *env;
+ struct GNUNET_MessageHeader *msg;
- sap[0] = (struct sockaddr*) &sa;
+ sap[0] = (struct sockaddr *) &sa;
slens[0] = sizeof (sa);
sap[1] = NULL;
slens[1] = 0;
- sched = tc->sched;
memset (&sa, 0, sizeof (sa));
#if HAVE_SOCKADDR_IN_SIN_LEN
sa.sin_len = sizeof (sa);
#endif
sa.sin_family = AF_INET;
sa.sin_port = htons (PORT);
- server = GNUNET_SERVER_create (tc->sched,
- NULL,
- NULL,
- sap,
- slens,
- TIMEOUT,
- GNUNET_NO);
+ server = GNUNET_SERVER_create (NULL, NULL, sap, slens, TIMEOUT, GNUNET_NO);
GNUNET_assert (server != NULL);
GNUNET_SERVER_add_handlers (server, handlers);
GNUNET_SERVER_disconnect_notify (server, ¬ify_disconnect, NULL);
cfg = GNUNET_CONFIGURATION_create ();
GNUNET_CONFIGURATION_set_value_number (cfg, "test-server", "PORT", PORT);
- GNUNET_CONFIGURATION_set_value_string (cfg, "test-server", "HOSTNAME", "localhost");
- GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME", "localhost");
- cc = GNUNET_CLIENT_connect (tc->sched,
- "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));
+ GNUNET_CONFIGURATION_set_value_string (cfg, "test-server", "HOSTNAME",
+ "localhost");
+ GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME",
+ "localhost");
+ 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);
}