[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37457 - gnunet/src/util
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r37457 - gnunet/src/util |
|
Date: |
Tue, 5 Jul 2016 14:10:06 +0200 |
Author: grothoff
Date: 2016-07-05 14:10:06 +0200 (Tue, 05 Jul 2016)
New Revision: 37457
Modified:
gnunet/src/util/test_server_disconnect.c
gnunet/src/util/test_server_with_client.c
gnunet/src/util/test_server_with_client_unix.c
Log:
update remaining tests to use new MQ API
Modified: gnunet/src/util/test_server_disconnect.c
===================================================================
--- gnunet/src/util/test_server_disconnect.c 2016-07-05 11:51:32 UTC (rev
37456)
+++ gnunet/src/util/test_server_disconnect.c 2016-07-05 12:10:06 UTC (rev
37457)
@@ -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 @@
GNUNET_assert (ok == 5);
ok = 0;
GNUNET_SERVER_destroy (server);
- GNUNET_CLIENT_disconnect (cc);
+ GNUNET_MQ_destroy (mq);
GNUNET_CONFIGURATION_destroy (cfg);
}
@@ -96,21 +96,6 @@
};
-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)
{
@@ -117,6 +102,8 @@
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 @@
"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);
}
Modified: gnunet/src/util/test_server_with_client.c
===================================================================
--- gnunet/src/util/test_server_with_client.c 2016-07-05 11:51:32 UTC (rev
37456)
+++ gnunet/src/util/test_server_with_client.c 2016-07-05 12:10:06 UTC (rev
37457)
@@ -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 @@
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 @@
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 @@
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 @@
* @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 @@
}
-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 @@
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 @@
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);
}
Modified: gnunet/src/util/test_server_with_client_unix.c
===================================================================
--- gnunet/src/util/test_server_with_client_unix.c 2016-07-05 11:51:32 UTC
(rev 37456)
+++ gnunet/src/util/test_server_with_client_unix.c 2016-07-05 12:10:06 UTC
(rev 37457)
@@ -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 @@
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 @@
}
-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 @@
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 @@
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);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37457 - gnunet/src/util,
gnunet <=