X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Ftest_core_api.c;h=0cf88a3244e20d8143d02a42b896de1c3bfa80f6;hb=fe3cc0e1a6f83c6ba4e0e1ec1185f1173ff16570;hp=973b97bff445955901dc9f0c2b1381ffb2fb8842;hpb=bb5fe91d23b0938baa3c4f0e92a83df659df216a;p=oweals%2Fgnunet.git diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c index 973b97bff..0cf88a324 100644 --- a/src/core/test_core_api.c +++ b/src/core/test_core_api.c @@ -1,31 +1,33 @@ /* 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. + 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 . - 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. + SPDX-License-Identifier: AGPL3.0-or-later */ /** * @file core/test_core_api.c * @brief testcase for core_api.c + * @author Christian Grothoff */ #include "platform.h" #include "gnunet_arm_service.h" #include "gnunet_core_service.h" #include "gnunet_util_lib.h" #include "gnunet_transport_service.h" +#include "gnunet_transport_hello_service.h" #include "gnunet_ats_service.h" #define MTYPE 12345 @@ -35,8 +37,8 @@ struct PeerContext struct GNUNET_CONFIGURATION_Handle *cfg; struct GNUNET_CORE_Handle *ch; struct GNUNET_PeerIdentity id; - struct GNUNET_TRANSPORT_Handle *th; - struct GNUNET_TRANSPORT_GetHelloHandle *ghh; + struct GNUNET_TRANSPORT_OfferHelloHandle *oh; + struct GNUNET_TRANSPORT_HelloGetHandle *ghh; struct GNUNET_ATS_ConnectivityHandle *ats; struct GNUNET_ATS_ConnectivitySuggestHandle *ats_sh; struct GNUNET_MessageHeader *hello; @@ -55,6 +57,15 @@ static int ok; #define OKPP do { ok++; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0) +static void +offer_hello_done (void *cls) +{ + struct PeerContext *p = cls; + + p->oh = NULL; +} + + static void process_hello (void *cls, const struct GNUNET_MessageHeader *message) @@ -62,12 +73,17 @@ process_hello (void *cls, struct PeerContext *p = cls; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received (my) `%s' from transport service\n", "HELLO"); + "Received (my) HELLO from transport service\n"); GNUNET_assert (message != NULL); - if ((p == &p1) && (p2.th != NULL)) - GNUNET_TRANSPORT_offer_hello (p2.th, message, NULL, NULL); - if ((p == &p2) && (p1.th != NULL)) - GNUNET_TRANSPORT_offer_hello (p1.th, message, NULL, NULL); + if ((p == &p1) && (NULL == p2.oh)) + p2.oh = GNUNET_TRANSPORT_offer_hello (p2.cfg, message, + &offer_hello_done, + &p2); + if ((p == &p2) && (NULL == p1.oh)) + p1.oh = GNUNET_TRANSPORT_offer_hello (p1.cfg, + message, + &offer_hello_done, + &p1); } @@ -79,11 +95,15 @@ terminate_peer (struct PeerContext *p) GNUNET_CORE_disconnect (p->ch); p->ch = NULL; } - if (NULL != p->th) + if (NULL != p->ghh) { - GNUNET_TRANSPORT_get_hello_cancel (p->ghh); - GNUNET_TRANSPORT_disconnect (p->th); - p->th = NULL; + GNUNET_TRANSPORT_hello_get_cancel (p->ghh); + p->ghh = NULL; + } + if (NULL != p->oh) + { + GNUNET_TRANSPORT_offer_hello_cancel (p->oh); + p->oh = NULL; } if (NULL != p->ats_sh) { @@ -99,8 +119,7 @@ terminate_peer (struct PeerContext *p) static void -terminate_task (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +terminate_task (void *cls) { GNUNET_assert (ok == 6); terminate_peer (&p1); @@ -110,8 +129,7 @@ terminate_task (void *cls, static void -terminate_task_error (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +terminate_task_error (void *cls) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ENDING ANGRILY %u\n", @@ -123,122 +141,101 @@ terminate_task_error (void *cls, } -static size_t -transmit_ready (void *cls, size_t size, void *buf) -{ - struct PeerContext *p = cls; - struct GNUNET_MessageHeader *m; - - GNUNET_assert (ok == 4); - OKPP; - GNUNET_assert (p == &p1); - GNUNET_assert (NULL != buf); - m = (struct GNUNET_MessageHeader *) buf; - m->type = htons (MTYPE); - m->size = htons (sizeof (struct GNUNET_MessageHeader)); - return sizeof (struct GNUNET_MessageHeader); -} - - -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; + struct GNUNET_MQ_Envelope *env; + struct GNUNET_MessageHeader *msg; - if (0 == memcmp (&pc->id, peer, sizeof (struct GNUNET_PeerIdentity))) - return; + if (0 == memcmp (&pc->id, + peer, + sizeof (struct GNUNET_PeerIdentity))) + return (void *) peer; GNUNET_assert (pc->connect_status == 0); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Encrypted connection established to peer `%4s'\n", + "Encrypted connection established to peer `%s'\n", GNUNET_i2s (peer)); pc->connect_status = 1; if (pc == &p1) { + uint64_t flags; + const void *extra; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Asking core (1) for transmission to peer `%4s'\n", + "Asking core (1) for transmission to peer `%s'\n", GNUNET_i2s (&p2.id)); - if (NULL == - GNUNET_CORE_notify_transmit_ready (p1.ch, GNUNET_YES, - GNUNET_CORE_PRIO_BEST_EFFORT, - GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_SECONDS, 145), - &p2.id, - sizeof (struct GNUNET_MessageHeader), - &transmit_ready, &p1)) - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "RECEIVED NULL when asking core (1) for transmission to peer `%4s'\n", - GNUNET_i2s (&p2.id)); - } + env = GNUNET_MQ_msg (msg, + MTYPE); + /* enable corking for this test */ + extra = GNUNET_CORE_get_mq_options (GNUNET_YES, + GNUNET_CORE_PRIO_BEST_EFFORT, + &flags); + GNUNET_MQ_env_set_options (env, + flags, + extra); + /* now actually transmit message */ + GNUNET_assert (ok == 4); + OKPP; + GNUNET_MQ_send (mq, + env); } + return (void *) peer; } static void -disconnect_notify (void *cls, const struct GNUNET_PeerIdentity *peer) +disconnect_notify (void *cls, + 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->connect_status = 0; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Encrypted connection to `%4s' cut\n", + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Encrypted connection to `%s' cut\n", GNUNET_i2s (peer)); } -static int -inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other, - const struct GNUNET_MessageHeader *message) +static void +handle_test (void *cls, + const struct GNUNET_MessageHeader *message) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Core provides inbound data from `%4s'.\n", GNUNET_i2s (other)); - return GNUNET_OK; -} - + const struct GNUNET_PeerIdentity *peer = cls; -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 `%4s'.\n", - GNUNET_i2s (other)); - return GNUNET_OK; -} - - -static int -process_mtype (void *cls, - const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_MessageHeader *message) -{ - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Receiving message from `%4s'.\n", + "Receiving message from `%s'.\n", GNUNET_i2s (peer)); GNUNET_assert (ok == 5); OKPP; GNUNET_SCHEDULER_cancel (err_task); - err_task = GNUNET_SCHEDULER_add_now (&terminate_task, NULL); - return GNUNET_OK; + err_task = GNUNET_SCHEDULER_add_now (&terminate_task, + NULL); } -static struct GNUNET_CORE_MessageHandler handlers[] = { - {&process_mtype, MTYPE, sizeof (struct GNUNET_MessageHeader)}, - {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_fixed_size (test, + MTYPE, + struct GNUNET_MessageHeader, + NULL), + GNUNET_MQ_handler_end () + }; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Core connection to `%4s' established\n", + "Core connection to `%s' established\n", GNUNET_i2s (my_identity)); p->id = *my_identity; if (cls == &p1) @@ -246,10 +243,12 @@ init_notify (void *cls, GNUNET_assert (ok == 2); OKPP; /* connect p2 */ - p2.ch = - GNUNET_CORE_connect (p2.cfg, &p2, &init_notify, &connect_notify, - &disconnect_notify, &inbound_notify, GNUNET_YES, - &outbound_notify, GNUNET_YES, handlers); + p2.ch = GNUNET_CORE_connect (p2.cfg, + &p2, + &init_notify, + &connect_notify, + &disconnect_notify, + handlers); } else { @@ -272,17 +271,23 @@ setup_peer (struct PeerContext *p, 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, + 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->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, NULL, NULL); - GNUNET_assert (NULL != p->th); + "-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->th, &process_hello, p); + p->ghh = GNUNET_TRANSPORT_hello_get (p->cfg, + GNUNET_TRANSPORT_AC_ANY, + &process_hello, + p); GNUNET_free (binary); } @@ -293,21 +298,30 @@ run (void *cls, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) { + struct GNUNET_MQ_MessageHandler handlers[] = { + GNUNET_MQ_hd_fixed_size (test, + MTYPE, + struct GNUNET_MessageHeader, + 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 (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300), &terminate_task_error, NULL); p1.ch = - GNUNET_CORE_connect (p1.cfg, &p1, + GNUNET_CORE_connect (p1.cfg, + &p1, &init_notify, &connect_notify, &disconnect_notify, - &inbound_notify, GNUNET_YES, - &outbound_notify, GNUNET_YES, handlers); } @@ -315,11 +329,16 @@ run (void *cls, static void stop_arm (struct PeerContext *p) { - if (0 != GNUNET_OS_process_kill (p->arm_proc, GNUNET_TERM_SIG)) - GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); - if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK) - GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", + if (0 != GNUNET_OS_process_kill (p->arm_proc, + GNUNET_TERM_SIG)) + GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, + "kill"); + if (GNUNET_OK != + GNUNET_OS_process_wait (p->arm_proc)) + GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, + "waitpid"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; @@ -328,9 +347,11 @@ stop_arm (struct PeerContext *p) int -main (int argc, char *argv1[]) +main (int argc, + char *argv1[]) { - char *const argv[] = { "test-core-api", + char *const argv[] = { + "test-core-api", "-c", "test_core_api_data.conf", NULL @@ -342,8 +363,13 @@ main (int argc, char *argv1[]) GNUNET_log_setup ("test-core-api", "WARNING", NULL); - GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, - "test-core-api", "nohelp", options, &run, &ok); + GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, + argv, + "test-core-api", + "nohelp", + options, + &run, + &ok); stop_arm (&p1); stop_arm (&p2); GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1");