X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fpsyc%2Ftest_psyc.c;h=03a1890b1fa160256b24967f4545170ce2288351;hb=2105059516320800eaa8fff1196b58f29a50ba7c;hp=8b4aad773dac30c23fc3b619e8c120863a2fe318;hpb=83495695331fcfa8824d7a6d407b82cfcfc8b13c;p=oweals%2Fgnunet.git diff --git a/src/psyc/test_psyc.c b/src/psyc/test_psyc.c index 8b4aad773..03a1890b1 100644 --- a/src/psyc/test_psyc.c +++ b/src/psyc/test_psyc.c @@ -1,6 +1,6 @@ /* * This file is part of GNUnet - * (C) 2013 Christian Grothoff (and other contributing authors) + * Copyright (C) 2013 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 @@ -14,13 +14,13 @@ * * 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 psyc/test_psyc.c - * @brief Test for the PSYC service. + * @brief Tests for the PSYC API. * @author Gabor X Toth * @author Christian Grothoff */ @@ -32,14 +32,11 @@ #include "gnunet_common.h" #include "gnunet_util_lib.h" #include "gnunet_testing_lib.h" -#include "gnunet_env_lib.h" +#include "gnunet_psyc_util_lib.h" #include "gnunet_psyc_service.h" #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) -#define DEBUG_SERVICE 1 - - /** * Return value from 'main'. */ @@ -47,27 +44,30 @@ static int res; static const struct GNUNET_CONFIGURATION_Handle *cfg; +static struct GNUNET_PeerIdentity this_peer; + /** * Handle for task for timeout termination. */ -static GNUNET_SCHEDULER_TaskIdentifier end_badly_task; +static struct GNUNET_SCHEDULER_Task * end_badly_task; static struct GNUNET_PSYC_Master *mst; static struct GNUNET_PSYC_Slave *slv; +static struct GNUNET_PSYC_Channel *mst_chn, *slv_chn; + static struct GNUNET_CRYPTO_EddsaPrivateKey *channel_key; -static struct GNUNET_CRYPTO_EddsaPrivateKey *slave_key; +static struct GNUNET_CRYPTO_EcdsaPrivateKey *slave_key; static struct GNUNET_CRYPTO_EddsaPublicKey channel_pub_key; -static struct GNUNET_CRYPTO_EddsaPublicKey slave_pub_key; - -struct GNUNET_PSYC_MasterTransmitHandle *mth; +static struct GNUNET_CRYPTO_EcdsaPublicKey slave_pub_key; struct TransmitClosure { struct GNUNET_PSYC_MasterTransmitHandle *mst_tmit; struct GNUNET_PSYC_SlaveTransmitHandle *slv_tmit; - struct GNUNET_ENV_Environment *env; + struct GNUNET_PSYC_Environment *env; + struct GNUNET_PSYC_Modifier *mod; char *data[16]; const char *mod_value; size_t mod_value_size; @@ -77,45 +77,77 @@ struct TransmitClosure uint8_t n; }; -struct TransmitClosure *tmit; +static struct TransmitClosure *tmit; -static int join_req_count; +static uint8_t join_req_count, end_count; enum { - TEST_NONE, - TEST_SLAVE_TRANSMIT, - TEST_MASTER_TRANSMIT, + TEST_NONE = 0, + TEST_MASTER_START = 1, + TEST_SLAVE_JOIN_REJECT = 2, + TEST_SLAVE_JOIN_ACCEPT = 3, + TEST_SLAVE_ADD = 4, + TEST_SLAVE_REMOVE = 5, + TEST_SLAVE_TRANSMIT = 6, + TEST_MASTER_TRANSMIT = 7, + TEST_MASTER_HISTORY_REPLAY_LATEST = 8, + TEST_SLAVE_HISTORY_REPLAY_LATEST = 9, + TEST_MASTER_HISTORY_REPLAY = 10, + TEST_SLAVE_HISTORY_REPLAY = 11, + TEST_MASTER_STATE_GET = 12, + TEST_SLAVE_STATE_GET = 13, + TEST_MASTER_STATE_GET_PREFIX = 14, + TEST_SLAVE_STATE_GET_PREFIX = 15, } test; static void master_transmit (); +static void +master_history_replay_latest (); + -/** - * Clean up all resources used. - */ static void -cleanup () +master_stopped (void *cls) { - if (NULL != slv) + if (NULL != tmit) { - GNUNET_PSYC_slave_part (slv); - slv = NULL; + GNUNET_PSYC_env_destroy (tmit->env); + GNUNET_free (tmit); + tmit = NULL; } + GNUNET_SCHEDULER_shutdown (); +} + + +static void +slave_parted (void *cls) +{ if (NULL != mst) { - GNUNET_PSYC_master_stop (mst); + GNUNET_PSYC_master_stop (mst, GNUNET_NO, &master_stopped, NULL); mst = NULL; } - if (NULL != tmit) + else + master_stopped (NULL); +} + + +/** + * Clean up all resources used. + */ +static void +cleanup () +{ + if (NULL != slv) { - GNUNET_ENV_environment_destroy (tmit->env); - GNUNET_free (tmit); - tmit = NULL; + GNUNET_PSYC_slave_part (slv, GNUNET_NO, &slave_parted, NULL); + slv = NULL; } - GNUNET_SCHEDULER_shutdown (); + else + slave_parted (NULL); } @@ -123,10 +155,9 @@ cleanup () * Terminate the test case (failure). * * @param cls NULL - * @param tc scheduler context */ static void -end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +end_badly (void *cls) { res = 1; cleanup (); @@ -138,10 +169,9 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) * Terminate the test case (success). * * @param cls NULL - * @param tc scheduler context */ static void -end_normally (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +end_normally (void *cls) { res = 0; cleanup (); @@ -155,12 +185,12 @@ end_normally (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) static void end () { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ending tests.\n"); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Ending tests.\n"); - if (end_badly_task != GNUNET_SCHEDULER_NO_TASK) + if (end_badly_task != NULL) { GNUNET_SCHEDULER_cancel (end_badly_task); - end_badly_task = GNUNET_SCHEDULER_NO_TASK; + end_badly_task = NULL; } GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MILLISECONDS, &end_normally, NULL); @@ -168,23 +198,34 @@ end () static void -master_message_cb (void *cls, uint64_t message_id, uint32_t flags, - const struct GNUNET_MessageHeader *msg) +master_message_cb (void *cls, const struct GNUNET_PSYC_MessageHeader *msg) { - if (NULL == msg) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Error while receiving message %llu\n", message_id); - return; - } + GNUNET_assert (NULL != msg); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Test #%d: Master got PSYC message fragment of size %u " + "belonging to message ID %" PRIu64 " with flags %x\n", + test, ntohs (msg->header.size), + GNUNET_ntohll (msg->message_id), ntohl (msg->flags)); + // FIXME +} + + +static void +master_message_part_cb (void *cls, const struct GNUNET_PSYC_MessageHeader *msg, + const struct GNUNET_MessageHeader *pmsg) +{ + GNUNET_assert (NULL != msg && NULL != pmsg); + + uint64_t message_id = GNUNET_ntohll (msg->message_id); + uint32_t flags = ntohl (msg->flags); - uint16_t type = ntohs (msg->type); - uint16_t size = ntohs (msg->size); + uint16_t type = ntohs (pmsg->type); + uint16_t size = ntohs (pmsg->size); - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "Master got message part of type %u and size %u " - "belonging to message ID %llu with flags %xu\n", - type, size, message_id, flags); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Test #%d: Master got message part of type %u and size %u " + "belonging to message ID %" PRIu64 " with flags %x\n", + test, type, size, message_id, flags); switch (test) { @@ -192,7 +233,8 @@ master_message_cb (void *cls, uint64_t message_id, uint32_t flags, if (GNUNET_PSYC_MESSAGE_REQUEST != flags) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Unexpected request flags: %x" PRIu32 "\n", flags); + "Test #%d: Unexpected request flags: %x" PRIu32 "\n", + test, flags); GNUNET_assert (0); return; } @@ -203,6 +245,20 @@ master_message_cb (void *cls, uint64_t message_id, uint32_t flags, break; case TEST_MASTER_TRANSMIT: + if (GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_END == type && 2 == ++end_count) + master_history_replay_latest (); + break; + + case TEST_MASTER_HISTORY_REPLAY: + case TEST_MASTER_HISTORY_REPLAY_LATEST: + if (GNUNET_PSYC_MESSAGE_HISTORIC != flags) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Test #%d: Unexpected flags for historic message: %x" PRIu32 "\n", + test, flags); + GNUNET_assert (0); + return; + } break; default: @@ -212,29 +268,53 @@ master_message_cb (void *cls, uint64_t message_id, uint32_t flags, static void -slave_message_cb (void *cls, uint64_t message_id, uint32_t flags, - const struct GNUNET_MessageHeader *msg) +slave_message_cb (void *cls, const struct GNUNET_PSYC_MessageHeader *msg) { - if (NULL == msg) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Error while receiving message %llu\n", message_id); - return; - } + GNUNET_assert (NULL != msg); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Test #%d: Slave got PSYC message fragment of size %u " + "belonging to message ID %" PRIu64 " with flags %x\n", + test, ntohs (msg->header.size), + GNUNET_ntohll (msg->message_id), ntohl (msg->flags)); + // FIXME +} + - uint16_t type = ntohs (msg->type); - uint16_t size = ntohs (msg->size); +static void +slave_message_part_cb (void *cls, + const struct GNUNET_PSYC_MessageHeader *msg, + const struct GNUNET_MessageHeader *pmsg) +{ + GNUNET_assert (NULL != msg && NULL != pmsg); - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "Slave got message part of type %u and size %u " - "belonging to message ID %llu with flags %xu\n", - type, size, message_id, flags); + uint64_t message_id = GNUNET_ntohll (msg->message_id); + uint32_t flags = ntohl (msg->flags); + + uint16_t type = ntohs (pmsg->type); + uint16_t size = ntohs (pmsg->size); + + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Test #%d: Slave got message part of type %u and size %u " + "belonging to message ID %" PRIu64 " with flags %x\n", + test, type, size, message_id, flags); switch (test) { case TEST_MASTER_TRANSMIT: - if (GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_END == type) - end (); + if (GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_END == type && 2 == ++end_count) + master_history_replay_latest (); + break; + + case TEST_SLAVE_HISTORY_REPLAY: + case TEST_SLAVE_HISTORY_REPLAY_LATEST: + if (GNUNET_PSYC_MESSAGE_HISTORIC != flags) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Test #%d: Unexpected flags for historic message: %x" PRIu32 "\n", + test, flags); + GNUNET_assert (0); + return; + } break; default: @@ -244,9 +324,239 @@ slave_message_cb (void *cls, uint64_t message_id, uint32_t flags, static void -transmit_resume (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +state_get_var (void *cls, const struct GNUNET_MessageHeader *mod, + const char *name, const void *value, + uint32_t value_size, uint32_t full_value_size) +{ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Got state var: %s\n%.*s\n", + name, + (int) value_size, + (const char *) value); +} + + +/*** Slave state_get_prefix() ***/ + +static void +slave_state_get_prefix_result (void *cls, int64_t result, + const void *err_msg, uint16_t err_msg_size) +{ + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Test #%d: slave_state_get_prefix:\t%" PRId64 " (%.*s)\n", + test, result, + (int) err_msg_size, + (const char *) err_msg); + // FIXME: GNUNET_assert (2 == result); + end (); +} + + +static void +slave_state_get_prefix () +{ + test = TEST_SLAVE_STATE_GET_PREFIX; + GNUNET_PSYC_channel_state_get_prefix (slv_chn, "_foo", state_get_var, + slave_state_get_prefix_result, NULL); +} + + +/*** Master state_get_prefix() ***/ + + +static void +master_state_get_prefix_result (void *cls, int64_t result, + const void *err_msg, uint16_t err_msg_size) +{ + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Test #%d: master_state_get_prefix:\t%" PRId64 " (%s)\n", + test, result, (char *) err_msg); + // FIXME: GNUNET_assert (2 == result); + slave_state_get_prefix (); +} + + +static void +master_state_get_prefix () +{ + test = TEST_MASTER_STATE_GET_PREFIX; + GNUNET_PSYC_channel_state_get_prefix (mst_chn, "_foo", state_get_var, + master_state_get_prefix_result, NULL); +} + + +/*** Slave state_get() ***/ + + +static void +slave_state_get_result (void *cls, int64_t result, + const void *err_msg, uint16_t err_msg_size) +{ + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Test #%d: slave_state_get:\t%" PRId64 " (%.*s)\n", + test, result, err_msg_size, (char *) err_msg); + // FIXME: GNUNET_assert (2 == result); + master_state_get_prefix (); +} + + +static void +slave_state_get () +{ + test = TEST_SLAVE_STATE_GET; + GNUNET_PSYC_channel_state_get (slv_chn, "_foo_bar_baz", state_get_var, + slave_state_get_result, NULL); +} + + +/*** Master state_get() ***/ + + +static void +master_state_get_result (void *cls, int64_t result, + const void *err_msg, uint16_t err_msg_size) +{ + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Test #%d: master_state_get:\t%" PRId64 " (%.*s)\n", + test, result, err_msg_size, (char *) err_msg); + // FIXME: GNUNET_assert (1 == result); + slave_state_get (); +} + + +static void +master_state_get () +{ + test = TEST_MASTER_STATE_GET; + GNUNET_PSYC_channel_state_get (mst_chn, "_foo_bar_baz", state_get_var, + master_state_get_result, NULL); +} + + +/*** Slave history_replay() ***/ + +static void +slave_history_replay_result (void *cls, int64_t result, + const void *err_msg, uint16_t err_msg_size) +{ + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Test #%d: slave_history_replay:\t%" PRId64 " (%.*s)\n", + test, result, + (int) err_msg_size, + (const char *) err_msg); + GNUNET_assert (9 == result); + + master_state_get (); +} + + +static void +slave_history_replay () +{ + test = TEST_SLAVE_HISTORY_REPLAY; + GNUNET_PSYC_channel_history_replay (slv_chn, 1, 1, "", + GNUNET_PSYC_HISTORY_REPLAY_LOCAL, + slave_message_cb, + slave_message_part_cb, + slave_history_replay_result, NULL); +} + + +/*** Master history_replay() ***/ + + +static void +master_history_replay_result (void *cls, int64_t result, + const void *err_msg, uint16_t err_msg_size) +{ + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Test #%d: master_history_replay:\t%" PRId64 " (%.*s)\n", + test, result, + (int) err_msg_size, + (const char *) err_msg); + GNUNET_assert (9 == result); + + slave_history_replay (); +} + + +static void +master_history_replay () +{ + test = TEST_MASTER_HISTORY_REPLAY; + GNUNET_PSYC_channel_history_replay (mst_chn, 1, 1, "", + GNUNET_PSYC_HISTORY_REPLAY_LOCAL, + master_message_cb, + master_message_part_cb, + master_history_replay_result, NULL); +} + + +/*** Slave history_replay_latest() ***/ + + +static void +slave_history_replay_latest_result (void *cls, int64_t result, + const void *err_msg, uint16_t err_msg_size) +{ + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Test #%d: slave_history_replay_latest:\t%" PRId64 " (%.*s)\n", + test, result, + (int) err_msg_size, + (const char *) err_msg); + GNUNET_assert (9 == result); + + master_history_replay (); +} + + +static void +slave_history_replay_latest () +{ + test = TEST_SLAVE_HISTORY_REPLAY_LATEST; + GNUNET_PSYC_channel_history_replay_latest (slv_chn, 1, "", + GNUNET_PSYC_HISTORY_REPLAY_LOCAL, + &slave_message_cb, + &slave_message_part_cb, + &slave_history_replay_latest_result, + NULL); +} + + +/*** Master history_replay_latest() ***/ + + +static void +master_history_replay_latest_result (void *cls, int64_t result, + const void *err_msg, uint16_t err_msg_size) +{ + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Test #%d: master_history_replay_latest:\t%" PRId64 " (%.*s)\n", + test, result, err_msg_size, (char *) err_msg); + GNUNET_assert (9 == result); + + slave_history_replay_latest (); +} + + +static void +master_history_replay_latest () +{ + test = TEST_MASTER_HISTORY_REPLAY_LATEST; + GNUNET_PSYC_channel_history_replay_latest (mst_chn, 1, "", + GNUNET_PSYC_HISTORY_REPLAY_LOCAL, + &master_message_cb, + &master_message_part_cb, + &master_history_replay_latest_result, + NULL); +} + + +static void +transmit_resume (void *cls) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmission resumed.\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Test #%d: Transmission resumed.\n", test); struct TransmitClosure *tmit = cls; if (NULL != tmit->mst_tmit) GNUNET_PSYC_master_transmit_resume (tmit->mst_tmit); @@ -255,51 +565,92 @@ transmit_resume (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } +static int +tmit_notify_data (void *cls, uint16_t *data_size, void *data) +{ + struct TransmitClosure *tmit = cls; + if (0 == tmit->data_count) + { + *data_size = 0; + return GNUNET_YES; + } + + uint16_t size = strlen (tmit->data[tmit->n]); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Test #%d: Transmit notify data: %u bytes available, " + "processing fragment %u/%u (size %u).\n", + test, *data_size, tmit->n + 1, tmit->data_count, size); + if (*data_size < size) + { + *data_size = 0; + GNUNET_assert (0); + return GNUNET_SYSERR; + } + + if (GNUNET_YES != tmit->paused && 0 < tmit->data_delay[tmit->n]) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Test #%d: Transmission paused.\n", test); + tmit->paused = GNUNET_YES; + GNUNET_SCHEDULER_add_delayed ( + GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, + tmit->data_delay[tmit->n]), + &transmit_resume, tmit); + *data_size = 0; + return GNUNET_NO; + } + tmit->paused = GNUNET_NO; + + *data_size = size; + GNUNET_memcpy (data, tmit->data[tmit->n], size); + + return ++tmit->n < tmit->data_count ? GNUNET_NO : GNUNET_YES; +} + + static int tmit_notify_mod (void *cls, uint16_t *data_size, void *data, uint8_t *oper, uint32_t *full_value_size) { struct TransmitClosure *tmit = cls; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Transmit notify modifier: %lu bytes available, " + "Test #%d: Transmit notify modifier: %u bytes available, " "%u modifiers left to process.\n", - *data_size, GNUNET_ENV_environment_get_count (tmit->env)); + test, *data_size, (unsigned int) GNUNET_PSYC_env_get_count (tmit->env)); - enum GNUNET_ENV_Operator op = 0; - const char *name = NULL; - const char *value = NULL; uint16_t name_size = 0; size_t value_size = 0; + const char *value = NULL; - if (NULL != oper) + if (NULL != oper && NULL != tmit->mod) { /* New modifier */ - if (GNUNET_NO == GNUNET_ENV_environment_shift (tmit->env, &op, &name, - (void *) &value, &value_size)) + tmit->mod = tmit->mod->next; + if (NULL == tmit->mod) { /* No more modifiers, continue with data */ *data_size = 0; return GNUNET_YES; } - GNUNET_assert (value_size < UINT32_MAX); - *full_value_size = value_size; - *oper = op; - name_size = strlen (name); + GNUNET_assert (tmit->mod->value_size < UINT32_MAX); + *full_value_size = tmit->mod->value_size; + *oper = tmit->mod->oper; + name_size = strlen (tmit->mod->name); - if (name_size + 1 + value_size <= *data_size) + if (name_size + 1 + tmit->mod->value_size <= *data_size) { - *data_size = name_size + 1 + value_size; + *data_size = name_size + 1 + tmit->mod->value_size; } else { - tmit->mod_value_size = value_size; + tmit->mod_value_size = tmit->mod->value_size; value_size = *data_size - name_size - 1; tmit->mod_value_size -= value_size; - tmit->mod_value = value + value_size; + tmit->mod_value = tmit->mod->value + value_size; } - memcpy (data, name, name_size); + GNUNET_memcpy (data, tmit->mod->name, name_size); ((char *)data)[name_size] = '\0'; - memcpy ((char *)data + name_size + 1, value, value_size); + GNUNET_memcpy ((char *)data + name_size + 1, tmit->mod->value, value_size); } else if (NULL != tmit->mod_value && 0 < tmit->mod_value_size) { /* Modifier continuation */ @@ -326,103 +677,139 @@ tmit_notify_mod (void *cls, uint16_t *data_size, void *data, uint8_t *oper, } *data_size = value_size; - memcpy (data, value, value_size); + GNUNET_memcpy (data, value, value_size); } - return 0 == tmit->mod_value_size ? GNUNET_YES : GNUNET_NO; + return GNUNET_NO; } -static int -tmit_notify_data (void *cls, uint16_t *data_size, void *data) +static void +slave_join (); + + +static void +slave_transmit () { - struct TransmitClosure *tmit = cls; - if (0 == tmit->data_count) - { - *data_size = 0; - return GNUNET_YES; - } + test = TEST_SLAVE_TRANSMIT; + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Test #%d: Slave sending request to master.\n", test); - uint16_t size = strlen (tmit->data[tmit->n]); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Transmit notify data: %u bytes available, " - "processing fragment %u/%u (size %u).\n", - *data_size, tmit->n + 1, tmit->data_count, size); - if (*data_size < size) - { - *data_size = 0; - GNUNET_assert (0); - return GNUNET_SYSERR; - } + tmit = GNUNET_new (struct TransmitClosure); + tmit->env = GNUNET_PSYC_env_create (); + GNUNET_PSYC_env_add (tmit->env, GNUNET_PSYC_OP_ASSIGN, + "_abc", "abc def", 7); + GNUNET_PSYC_env_add (tmit->env, GNUNET_PSYC_OP_ASSIGN, + "_abc_def", "abc def ghi", 11); + tmit->mod = GNUNET_PSYC_env_head (tmit->env); + tmit->n = 0; + tmit->data[0] = "slave test"; + tmit->data_count = 1; + tmit->slv_tmit + = GNUNET_PSYC_slave_transmit (slv, "_request_test", &tmit_notify_mod, + &tmit_notify_data, tmit, + GNUNET_PSYC_SLAVE_TRANSMIT_NONE); +} - if (GNUNET_YES != tmit->paused && 0 < tmit->data_delay[tmit->n]) - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmission paused.\n"); - tmit->paused = GNUNET_YES; - GNUNET_SCHEDULER_add_delayed ( - GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, - tmit->data_delay[tmit->n]), - &transmit_resume, tmit); - *data_size = 0; - return GNUNET_NO; - } - tmit->paused = GNUNET_NO; - *data_size = size; - memcpy (data, tmit->data[tmit->n], size); +static void +slave_remove_cb (void *cls, int64_t result, + const void *err_msg, uint16_t err_msg_size) +{ + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Test #%d: slave_remove:\t%" PRId64 " (%.*s)\n", + test, result, err_msg_size, (char *) err_msg); - return ++tmit->n < tmit->data_count ? GNUNET_NO : GNUNET_YES; + slave_transmit (); } static void -slave_join (); +slave_remove () +{ + test = TEST_SLAVE_REMOVE; + struct GNUNET_PSYC_Channel *chn = GNUNET_PSYC_master_get_channel (mst); + GNUNET_PSYC_channel_slave_remove (chn, &slave_pub_key, 2, + &slave_remove_cb, chn); +} static void -join_decision_cb (void *cls, int is_admitted, - const struct GNUNET_PSYC_MessageHeader *join_msg) +slave_add_cb (void *cls, int64_t result, + const void *err_msg, uint16_t err_msg_size) { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "Slave got join decision: %d\n", is_admitted); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Test #%d: slave_add:\t%" PRId64 " (%.*s)\n", + test, result, err_msg_size, (char *) err_msg); + slave_remove (); +} - if (GNUNET_YES != is_admitted) - { /* First join request is refused, retry. */ - //GNUNET_assert (1 == join_req_count); - slave_join (); - return; - } - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Slave sending request to master.\n"); +static void +slave_add () +{ + test = TEST_SLAVE_ADD; + struct GNUNET_PSYC_Channel *chn = GNUNET_PSYC_master_get_channel (mst); + GNUNET_PSYC_channel_slave_add (chn, &slave_pub_key, 2, 2, &slave_add_cb, chn); +} - test = TEST_SLAVE_TRANSMIT; - tmit = GNUNET_new (struct TransmitClosure); - tmit->env = GNUNET_ENV_environment_create (); - GNUNET_ENV_environment_add (tmit->env, GNUNET_ENV_OP_ASSIGN, - "_abc", "abc def", 7); - GNUNET_ENV_environment_add (tmit->env, GNUNET_ENV_OP_ASSIGN, - "_abc_def", "abc def ghi", 11); - tmit->n = 0; - tmit->data[0] = "slave test"; - tmit->data_count = 1; - tmit->slv_tmit - = GNUNET_PSYC_slave_transmit (slv, "_request_test", tmit_notify_mod, - tmit_notify_data, tmit, - GNUNET_PSYC_SLAVE_TRANSMIT_NONE); +static void +first_slave_parted (void *cls) +{ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "First slave parted.\n"); + slave_join (TEST_SLAVE_JOIN_ACCEPT); +} + + +static void +schedule_slave_part (void *cls) +{ + GNUNET_PSYC_slave_part (slv, GNUNET_NO, &first_slave_parted, NULL); +} + + +static void +join_decision_cb (void *cls, + const struct GNUNET_PSYC_JoinDecisionMessage *dcsn, + int is_admitted, + const struct GNUNET_PSYC_Message *join_msg) +{ + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Test #%d: Slave got join decision: %d\n", test, is_admitted); + + switch (test) + { + case TEST_SLAVE_JOIN_REJECT: + GNUNET_assert (0 == is_admitted); + GNUNET_assert (1 == join_req_count); + GNUNET_SCHEDULER_add_now (&schedule_slave_part, NULL); + break; + + case TEST_SLAVE_JOIN_ACCEPT: + GNUNET_assert (1 == is_admitted); + GNUNET_assert (2 == join_req_count); + slave_add (); + break; + + default: + GNUNET_break (0); + } } static void -join_request_cb (void *cls, const struct GNUNET_CRYPTO_EddsaPublicKey *slave_key, - const struct GNUNET_PSYC_MessageHeader *msg, +join_request_cb (void *cls, + const struct GNUNET_PSYC_JoinRequestMessage *req, + const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_key, + const struct GNUNET_PSYC_Message *join_msg, struct GNUNET_PSYC_JoinHandle *jh) { struct GNUNET_HashCode slave_key_hash; GNUNET_CRYPTO_hash (slave_key, sizeof (*slave_key), &slave_key_hash); - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "Got join request from %s.\n", - GNUNET_h2s (&slave_key_hash)); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Test #%d: Got join request #%u from %s.\n", + test, join_req_count, GNUNET_h2s (&slave_key_hash)); /* Reject first request */ int is_admitted = (0 < join_req_count++) ? GNUNET_YES : GNUNET_NO; @@ -431,37 +818,52 @@ join_request_cb (void *cls, const struct GNUNET_CRYPTO_EddsaPublicKey *slave_key static void -slave_connect_cb (void *cls, uint64_t max_message_id) +slave_connect_cb (void *cls, int result, uint64_t max_message_id) { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "Slave connected: %lu\n", max_message_id); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Test #%d: Slave connected: %d, max_message_id: %" PRIu64 "\n", + test, result, max_message_id); + GNUNET_assert (TEST_SLAVE_JOIN_REJECT == test || TEST_SLAVE_JOIN_ACCEPT == test); + GNUNET_assert (GNUNET_OK == result || GNUNET_NO == result); } static void -slave_join () +slave_join (int t) { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Joining slave.\n"); + test = t; + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Test #%d: Joining slave.\n", t); - struct GNUNET_PeerIdentity origin; // FIXME: this peer - struct GNUNET_ENV_Environment *env = GNUNET_ENV_environment_create (); - GNUNET_ENV_environment_add (env, GNUNET_ENV_OP_ASSIGN, + struct GNUNET_PeerIdentity origin = this_peer; + struct GNUNET_PSYC_Environment *env = GNUNET_PSYC_env_create (); + GNUNET_PSYC_env_add (env, GNUNET_PSYC_OP_ASSIGN, "_foo", "bar baz", 7); - GNUNET_ENV_environment_add (env, GNUNET_ENV_OP_ASSIGN, + GNUNET_PSYC_env_add (env, GNUNET_PSYC_OP_ASSIGN, "_foo_bar", "foo bar baz", 11); - slv = GNUNET_PSYC_slave_join (cfg, &channel_pub_key, slave_key, &origin, - 0, NULL, &slave_message_cb, + struct GNUNET_PSYC_Message * + join_msg = GNUNET_PSYC_message_create ("_request_join", env, "some data", 9); + + slv = GNUNET_PSYC_slave_join (cfg, &channel_pub_key, slave_key, + GNUNET_PSYC_SLAVE_JOIN_NONE, + &origin, 0, NULL, + &slave_message_cb, &slave_message_part_cb, &slave_connect_cb, &join_decision_cb, NULL, - "_request_join", env, "some data", 9); - GNUNET_ENV_environment_destroy (env); + join_msg); + GNUNET_free (join_msg); + slv_chn = GNUNET_PSYC_slave_get_channel (slv); + GNUNET_PSYC_env_destroy (env); } static void master_transmit () { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Master sending message to all.\n"); test = TEST_MASTER_TRANSMIT; + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Test #%d: Master sending message to all.\n", test); + end_count = 0; + uint32_t i, j; char *name_max = "_test_max"; @@ -480,19 +882,20 @@ master_transmit () val_cont[i] = (0 == j % 10000) ? '0' + j / 10000 : '!'; tmit = GNUNET_new (struct TransmitClosure); - tmit->env = GNUNET_ENV_environment_create (); - GNUNET_ENV_environment_add (tmit->env, GNUNET_ENV_OP_ASSIGN, + tmit->env = GNUNET_PSYC_env_create (); + GNUNET_PSYC_env_add (tmit->env, GNUNET_PSYC_OP_ASSIGN, "_foo", "bar baz", 7); - GNUNET_ENV_environment_add (tmit->env, GNUNET_ENV_OP_ASSIGN, + GNUNET_PSYC_env_add (tmit->env, GNUNET_PSYC_OP_ASSIGN, name_max, val_max, GNUNET_PSYC_MODIFIER_MAX_PAYLOAD - name_max_size); - GNUNET_ENV_environment_add (tmit->env, GNUNET_ENV_OP_ASSIGN, + GNUNET_PSYC_env_add (tmit->env, GNUNET_PSYC_OP_ASSIGN, "_foo_bar", "foo bar baz", 11); - GNUNET_ENV_environment_add (tmit->env, GNUNET_ENV_OP_ASSIGN, + GNUNET_PSYC_env_add (tmit->env, GNUNET_PSYC_OP_ASSIGN, name_cont, val_cont, GNUNET_PSYC_MODIFIER_MAX_PAYLOAD - name_cont_size + GNUNET_PSYC_MOD_CONT_MAX_PAYLOAD); + tmit->mod = GNUNET_PSYC_env_head (tmit->env); tmit->data[0] = "foo"; tmit->data[1] = GNUNET_malloc (GNUNET_PSYC_DATA_MAX_PAYLOAD + 1); for (i = 0; i < GNUNET_PSYC_DATA_MAX_PAYLOAD; i++) @@ -502,18 +905,42 @@ master_transmit () tmit->data_delay[1] = 3; tmit->data_count = 4; tmit->mst_tmit - = GNUNET_PSYC_master_transmit (mst, "_notice_test", tmit_notify_mod, - tmit_notify_data, tmit, + = GNUNET_PSYC_master_transmit (mst, "_notice_test", &tmit_notify_mod, + &tmit_notify_data, tmit, GNUNET_PSYC_MASTER_TRANSMIT_INC_GROUP_GEN); } static void -master_start_cb (void *cls, uint64_t max_message_id) +master_start_cb (void *cls, int result, uint64_t max_message_id) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Master started: %" PRIu64 "\n", max_message_id); - slave_join (); + "Test #%d: Master started: %d, max_message_id: %" PRIu64 "\n", + test, result, max_message_id); + GNUNET_assert (TEST_MASTER_START == test); + GNUNET_assert (GNUNET_OK == result || GNUNET_NO == result); + slave_join (TEST_SLAVE_JOIN_REJECT); +} + + +static void +master_start () +{ + test = TEST_MASTER_START; + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Test #%d: Starting master.\n", test); + mst = GNUNET_PSYC_master_start (cfg, channel_key, GNUNET_PSYC_CHANNEL_PRIVATE, + &master_start_cb, &join_request_cb, + &master_message_cb, &master_message_part_cb, + NULL); + mst_chn = GNUNET_PSYC_master_get_channel (mst); +} + + +static void +schedule_master_start (void *cls) +{ + master_start (); } @@ -525,7 +952,7 @@ master_start_cb (void *cls, uint64_t max_message_id) * @param peer handle to access more of the peer (not used) */ static void -#if DEBUG_SERVICE +#if DEBUG_TEST_PSYC run (void *cls, char *const *args, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c) #else @@ -537,16 +964,21 @@ run (void *cls, cfg = c; end_badly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); + GNUNET_CRYPTO_get_peer_identity (cfg, &this_peer); + channel_key = GNUNET_CRYPTO_eddsa_key_create (); - slave_key = GNUNET_CRYPTO_eddsa_key_create (); + slave_key = GNUNET_CRYPTO_ecdsa_key_create (); GNUNET_CRYPTO_eddsa_key_get_public (channel_key, &channel_pub_key); - GNUNET_CRYPTO_eddsa_key_get_public (slave_key, &slave_pub_key); + GNUNET_CRYPTO_ecdsa_key_get_public (slave_key, &slave_pub_key); - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Starting master.\n"); - mst = GNUNET_PSYC_master_start (cfg, channel_key, GNUNET_PSYC_CHANNEL_PRIVATE, - &master_start_cb, &join_request_cb, - &master_message_cb, NULL); +#if DEBUG_TEST_PSYC + master_start (); +#else + /* Allow some time for the services to initialize. */ + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, + &schedule_master_start, NULL); +#endif } @@ -554,7 +986,7 @@ int main (int argc, char *argv[]) { res = 1; -#if DEBUG_SERVICE +#if DEBUG_TEST_PSYC const struct GNUNET_GETOPT_CommandLineOption opts[] = { GNUNET_GETOPT_OPTION_END };