/*
This file is part of GNUnet.
- Copyright (C) 2009, 2010, 2015 GNUnet e.V.
+ Copyright (C) 2009, 2010, 2015, 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
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- 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., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file core/test_core_api_reliability.c
* @brief testcase for core_api.c focusing on reliable transmission (with TCP)
+ * @author Christian Grothoff
*/
#include "platform.h"
#include "gnunet_arm_service.h"
#include "gnunet_util_lib.h"
#include "gnunet_ats_service.h"
#include "gnunet_transport_service.h"
+#include "gnunet_transport_hello_service.h"
#include <gauger.h>
/**
*/
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 600)
-/**
- * What delay do we request from the core service for transmission?
- */
-#define FAST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
-
#define MTYPE 12345
{
struct GNUNET_CONFIGURATION_Handle *cfg;
struct GNUNET_CORE_Handle *ch;
+ struct GNUNET_MQ_Handle *mq;
struct GNUNET_PeerIdentity id;
struct GNUNET_TRANSPORT_OfferHelloHandle *oh;
struct GNUNET_MessageHeader *hello;
- struct GNUNET_TRANSPORT_GetHelloHandle *ghh;
+ struct GNUNET_TRANSPORT_HelloGetHandle *ghh;
struct GNUNET_ATS_ConnectivityHandle *ats;
struct GNUNET_ATS_ConnectivitySuggestHandle *ats_sh;
int connect_status;
static struct PeerContext p2;
-static struct GNUNET_CORE_TransmitHandle *nth;
-
static int ok;
static int32_t tr_n;
}
if (NULL != p->ghh)
{
- GNUNET_TRANSPORT_get_hello_cancel (p->ghh);
+ GNUNET_TRANSPORT_hello_get_cancel (p->ghh);
p->ghh = NULL;
}
if (NULL != p->oh)
GNUNET_SCHEDULER_cancel (err_task);
err_task = NULL;
}
- if (NULL != nth)
- {
- GNUNET_CORE_notify_transmit_ready_cancel (nth);
- nth = NULL;
- }
terminate_peer (&p1);
terminate_peer (&p2);
-
+
}
-static size_t
-transmit_ready (void *cls,
- size_t size,
- void *buf)
+static void
+send_message (struct GNUNET_MQ_Handle *mq,
+ int32_t num)
{
- char *cbuf = buf;
- struct TestMessage hdr;
+ struct GNUNET_MQ_Envelope *env;
+ struct TestMessage *hdr;
unsigned int s;
- unsigned int ret;
- nth = NULL;
- GNUNET_assert (size <= GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE);
- if (NULL == buf)
- {
- if (NULL != p1.ch)
- GNUNET_break (NULL !=
- (nth = GNUNET_CORE_notify_transmit_ready (p1.ch, GNUNET_NO,
- GNUNET_CORE_PRIO_BEST_EFFORT,
- FAST_TIMEOUT,
- &p2.id,
- get_size (tr_n),
- &transmit_ready,
- &p1)));
- return 0;
- }
+ GNUNET_assert (NULL != mq);
GNUNET_assert (tr_n < TOTAL_MSGS);
- ret = 0;
s = get_size (tr_n);
- GNUNET_assert (size >= s);
- GNUNET_assert (buf != NULL);
- cbuf = buf;
- do
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending message %u of size %u at offset %u\n",
- tr_n,
- s,
- ret);
- hdr.header.size = htons (s);
- hdr.header.type = htons (MTYPE);
- hdr.num = htonl (tr_n);
- GNUNET_memcpy (&cbuf[ret], &hdr, sizeof (struct TestMessage));
- ret += sizeof (struct TestMessage);
- memset (&cbuf[ret], tr_n, s - sizeof (struct TestMessage));
- ret += s - sizeof (struct TestMessage);
- tr_n++;
- s = get_size (tr_n);
- if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16))
- break; /* sometimes pack buffer full, sometimes not */
- }
- while (size - ret >= s);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending message %u of size %u\n",
+ tr_n,
+ s);
+ env = GNUNET_MQ_msg_extra (hdr,
+ s - sizeof (struct TestMessage),
+ MTYPE);
+ hdr->num = htonl (tr_n);
+ memset (&hdr[1],
+ tr_n,
+ s - sizeof (struct TestMessage));
+ tr_n++;
GNUNET_SCHEDULER_cancel (err_task);
err_task =
GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&terminate_task_error,
NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Returning total message block of size %u\n",
- ret);
- total_bytes += ret;
- return ret;
+ total_bytes += s;
+ GNUNET_MQ_send (mq,
+ env);
}
-static void
+static void *
connect_notify (void *cls,
- const struct GNUNET_PeerIdentity *peer)
+ const struct GNUNET_PeerIdentity *peer,
+ struct GNUNET_MQ_Handle *mq)
{
struct PeerContext *pc = cls;
if (0 == memcmp (&pc->id,
peer,
sizeof (struct GNUNET_PeerIdentity)))
- return;
+ return (void *) peer;
+ pc->mq = mq;
GNUNET_assert (0 == pc->connect_status);
pc->connect_status = 1;
if (pc == &p1)
&terminate_task_error,
NULL);
start_time = GNUNET_TIME_absolute_get ();
- GNUNET_break (NULL !=
- (nth = GNUNET_CORE_notify_transmit_ready (p1.ch,
- GNUNET_NO,
- GNUNET_CORE_PRIO_BEST_EFFORT,
- TIMEOUT,
- &p2.id,
- get_size (0),
- &transmit_ready,
- &p1)));
+ send_message (mq,
+ 0);
}
+ return (void *) peer;
}
static void
disconnect_notify (void *cls,
- const struct GNUNET_PeerIdentity *peer)
+ const struct GNUNET_PeerIdentity *peer,
+ void *internal_cls)
{
struct PeerContext *pc = cls;
- if (0 == memcmp (&pc->id, peer, sizeof (struct GNUNET_PeerIdentity)))
+ if (0 == memcmp (&pc->id,
+ peer,
+ sizeof (struct GNUNET_PeerIdentity)))
return;
+ pc->mq = NULL;
pc->connect_status = 0;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Encrypted connection to `%s' cut\n",
static int
-inbound_notify (void *cls,
- const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message)
+check_test (void *cls,
+ const struct TestMessage *hdr)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Core provides inbound data from `%s'.\n",
- GNUNET_i2s (other));
- return GNUNET_OK;
+ return GNUNET_OK; /* accept all */
}
-static int
-outbound_notify (void *cls,
- const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message)
-{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Core notifies about outbound data for `%s'.\n",
- GNUNET_i2s (other));
- return GNUNET_OK;
-}
-
-
-static size_t
-transmit_ready (void *cls,
- size_t size,
- void *buf);
-
-
-static int
-process_mtype (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message)
+static void
+handle_test (void *cls,
+ const struct TestMessage *hdr)
{
static int n;
unsigned int s;
- const struct TestMessage *hdr;
- hdr = (const struct TestMessage *) message;
s = get_size (n);
- if (MTYPE != ntohs (message->type))
- return GNUNET_SYSERR;
- if (ntohs (message->size) != s)
+ if (ntohs (hdr->header.size) != s)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Expected message %u of size %u, got %u bytes of message %u\n",
- n, s,
- ntohs (message->size),
+ n,
+ s,
+ ntohs (hdr->header.size),
ntohl (hdr->num));
GNUNET_SCHEDULER_cancel (err_task);
err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error,
NULL);
- return GNUNET_SYSERR;
+ return;
}
if (ntohl (hdr->num) != n)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Expected message %u of size %u, got %u bytes of message %u\n",
- n, s,
- ntohs (message->size),
- ntohl (hdr->num));
+ n,
+ s,
+ (unsigned int) ntohs (hdr->header.size),
+ (unsigned int) ntohl (hdr->num));
GNUNET_SCHEDULER_cancel (err_task);
err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error,
NULL);
- return GNUNET_SYSERR;
+ return;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Got message %u of size %u\n",
- ntohl (hdr->num),
- ntohs (message->size));
+ (unsigned int) ntohl (hdr->num),
+ (unsigned int) ntohs (hdr->header.size));
n++;
if (0 == (n % (TOTAL_MSGS / 100)))
- FPRINTF (stderr, "%s", ".");
+ FPRINTF (stderr,
+ "%s",
+ ".");
if (n == TOTAL_MSGS)
{
ok = 0;
else
{
if (n == tr_n)
- GNUNET_break (NULL !=
- GNUNET_CORE_notify_transmit_ready (p1.ch,
- GNUNET_NO /* no cork */,
- GNUNET_CORE_PRIO_BEST_EFFORT,
- FAST_TIMEOUT /* ignored! */,
- &p2.id,
- get_size (tr_n),
- &transmit_ready, &p1));
+ {
+ send_message (p1.mq,
+ tr_n);
+ }
}
- return GNUNET_OK;
}
-static struct GNUNET_CORE_MessageHandler handlers[] = {
- {&process_mtype, MTYPE, 0},
- {NULL, 0, 0}
-};
-
-
static void
init_notify (void *cls,
const struct GNUNET_PeerIdentity *my_identity)
{
struct PeerContext *p = cls;
+ struct GNUNET_MQ_MessageHandler handlers[] = {
+ GNUNET_MQ_hd_var_size (test,
+ MTYPE,
+ struct TestMessage,
+ NULL),
+ GNUNET_MQ_handler_end ()
+ };
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Connection to CORE service of `%s' established\n",
GNUNET_assert (ok == 2);
OKPP;
/* connect p2 */
- GNUNET_assert (NULL != (p2.ch = GNUNET_CORE_connect (p2.cfg, &p2,
- &init_notify,
- &connect_notify,
- &disconnect_notify,
- &inbound_notify, GNUNET_YES,
- &outbound_notify, GNUNET_YES,
- handlers)));
+ GNUNET_assert (NULL !=
+ (p2.ch = GNUNET_CORE_connect (p2.cfg,
+ &p2,
+ &init_notify,
+ &connect_notify,
+ &disconnect_notify,
+ handlers)));
}
else
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received (my) `%s' from transport service\n", "HELLO");
GNUNET_assert (message != NULL);
+ GNUNET_free_non_null (p->hello);
p->hello = GNUNET_copy_message (message);
if ((p == &p1) && (NULL == p2.oh))
p2.oh = GNUNET_TRANSPORT_offer_hello (p2.cfg,
binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
p->cfg = GNUNET_CONFIGURATION_create ();
- p->arm_proc =
- GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
- NULL, NULL, NULL,
- binary,
- "gnunet-service-arm",
- "-c", cfgname, NULL);
+ p->arm_proc
+ = GNUNET_OS_start_process (GNUNET_YES,
+ GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+ NULL, NULL, NULL,
+ binary,
+ "gnunet-service-arm",
+ "-c",
+ cfgname,
+ NULL);
GNUNET_assert (GNUNET_OK ==
GNUNET_CONFIGURATION_load (p->cfg,
cfgname));
p->ats = GNUNET_ATS_connectivity_init (p->cfg);
GNUNET_assert (NULL != p->ats);
- p->ghh = GNUNET_TRANSPORT_get_hello (p->cfg,
+ p->ghh = GNUNET_TRANSPORT_hello_get (p->cfg,
+ GNUNET_TRANSPORT_AC_ANY,
&process_hello,
p);
GNUNET_free (binary);
const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
+ struct GNUNET_MQ_MessageHandler handlers[] = {
+ GNUNET_MQ_hd_fixed_size (test,
+ MTYPE,
+ struct TestMessage,
+ NULL),
+ GNUNET_MQ_handler_end ()
+ };
+
GNUNET_assert (ok == 1);
OKPP;
- setup_peer (&p1, "test_core_api_peer1.conf");
- setup_peer (&p2, "test_core_api_peer2.conf");
+ setup_peer (&p1,
+ "test_core_api_peer1.conf");
+ setup_peer (&p2,
+ "test_core_api_peer2.conf");
err_task =
GNUNET_SCHEDULER_add_delayed (TIMEOUT,
&terminate_task_error,
NULL);
GNUNET_assert (NULL !=
- (p1.ch = GNUNET_CORE_connect (p1.cfg, &p1,
+ (p1.ch = GNUNET_CORE_connect (p1.cfg,
+ &p1,
&init_notify,
&connect_notify,
&disconnect_notify,
- &inbound_notify,
- GNUNET_YES,
- &outbound_notify,
- GNUNET_YES,
handlers)));
}
int
-main (int argc, char *argv1[])
+main (int argc,
+ char *argv1[])
{
char *const argv[] = {
"test-core-api-reliability",
&ok);
stop_arm (&p1);
stop_arm (&p2);
+ GNUNET_free_non_null (p1.hello);
+ GNUNET_free_non_null (p2.hello);
GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1");
GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-2");
projects / oweals / gnunet.git / blobdiff