X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fpsyc%2Ftest_psyc.c;h=ba31d9329e0f0a96a11fbec5dca94b8710fe9e4d;hb=26d1b687ca01be01505b69ff48ae5d3e0cd4186e;hp=360d56c064d25fd0cc689474fc5d2571ba50c375;hpb=dbdb091b11204e1e1caaa3f4260bb6cf1168cbd2;p=oweals%2Fgnunet.git diff --git a/src/psyc/test_psyc.c b/src/psyc/test_psyc.c index 360d56c06..ba31d9329 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 Christian Grothoff (and other contributing authors) * * GNUnet is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published @@ -20,7 +20,7 @@ /** * @file psyc/test_psyc.c - * @brief Test for the PSYC service. + * @brief Tests for the PSYC API. * @author Gabor X Toth * @author Christian Grothoff */ @@ -33,42 +33,44 @@ #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" +#include "gnunet_core_service.h" #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) -#define DEBUG_SERVICE 1 - - /** * Return value from 'main'. */ -static int res; +int res; + +const struct GNUNET_CONFIGURATION_Handle *cfg; -static const struct GNUNET_CONFIGURATION_Handle *cfg; +struct GNUNET_CORE_Handle *core; +struct GNUNET_PeerIdentity this_peer; /** * Handle for task for timeout termination. */ -static GNUNET_SCHEDULER_TaskIdentifier end_badly_task; +struct GNUNET_SCHEDULER_Task * end_badly_task; -static struct GNUNET_PSYC_Master *mst; -static struct GNUNET_PSYC_Slave *slv; -static struct GNUNET_PSYC_Channel *ch; +struct GNUNET_PSYC_Master *mst; +struct GNUNET_PSYC_Slave *slv; -static struct GNUNET_CRYPTO_EddsaPrivateKey *channel_key; -static struct GNUNET_CRYPTO_EddsaPrivateKey *slave_key; +struct GNUNET_PSYC_Channel *mst_chn, *slv_chn; -static struct GNUNET_CRYPTO_EddsaPublicKey channel_pub_key; -static struct GNUNET_CRYPTO_EddsaPublicKey slave_pub_key; +struct GNUNET_CRYPTO_EddsaPrivateKey *channel_key; +struct GNUNET_CRYPTO_EcdsaPrivateKey *slave_key; -struct GNUNET_PSYC_MasterTransmitHandle *mth; +struct GNUNET_CRYPTO_EddsaPublicKey channel_pub_key; +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_ENV_Modifier *mod; char *data[16]; const char *mod_value; size_t mod_value_size; @@ -80,99 +82,145 @@ struct TransmitClosure struct TransmitClosure *tmit; +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 = 2, + TEST_SLAVE_TRANSMIT = 3, + TEST_MASTER_TRANSMIT = 4, + TEST_MASTER_HISTORY_REPLAY_LATEST = 5, + TEST_SLAVE_HISTORY_REPLAY_LATEST = 6, + TEST_MASTER_HISTORY_REPLAY = 7, + TEST_SLAVE_HISTORY_REPLAY = 8, + TEST_MASTER_STATE_GET = 9, + TEST_SLAVE_STATE_GET = 10, + TEST_MASTER_STATE_GET_PREFIX = 11, + TEST_SLAVE_STATE_GET_PREFIX = 12, } test; -static void +void master_transmit (); +void +master_history_replay_latest (); -/** - * Clean up all resources used. - */ -static void -cleanup () + +void master_stopped (void *cls) { - if (NULL != slv) + if (NULL != tmit) { - GNUNET_PSYC_slave_part (slv); - slv = NULL; + GNUNET_ENV_environment_destroy (tmit->env); + GNUNET_free (tmit); + tmit = NULL; } + GNUNET_SCHEDULER_shutdown (); +} + +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. + */ +void +cleanup () +{ + if (NULL != core) { - GNUNET_ENV_environment_destroy (tmit->env); - GNUNET_free (tmit); - tmit = NULL; + GNUNET_CORE_disconnect (core); + core = NULL; } - GNUNET_SCHEDULER_shutdown (); + if (NULL != slv) + { + GNUNET_PSYC_slave_part (slv, GNUNET_NO, &slave_parted, NULL); + slv = NULL; + } + else + slave_parted (NULL); } /** - * Terminate the testcase (failure). + * Terminate the test case (failure). * * @param cls NULL * @param tc scheduler context */ -static void +void end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { res = 1; cleanup (); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Test FAILED.\n"); } /** - * Terminate the testcase (success). + * Terminate the test case (success). * * @param cls NULL * @param tc scheduler context */ -static void +void end_normally (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { res = 0; cleanup (); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test PASSED.\n"); } /** - * Finish the testcase (successfully). + * Finish the test case (successfully). */ -static void +void end () { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "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); } -static void -master_message (void *cls, uint64_t message_id, uint32_t flags, - const struct GNUNET_MessageHeader *msg) +void +master_message_cb (void *cls, uint64_t message_id, uint32_t flags, + const struct GNUNET_PSYC_MessageHeader *msg) +{ + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Test #%d: Master got PSYC message fragment of size %u " + "belonging to message ID %" PRIu64 " with flags %x\n", + test, ntohs (msg->header.size), message_id, flags); + // FIXME +} + + +void +master_message_part_cb (void *cls, uint64_t message_id, + uint64_t data_offset, uint32_t flags, + const struct GNUNET_MessageHeader *msg) { if (NULL == msg) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Error while receiving message %llu\n", message_id); + "Error while receiving message %" PRIu64 "\n", message_id); return; } @@ -180,9 +228,9 @@ master_message (void *cls, uint64_t message_id, uint32_t flags, uint16_t size = ntohs (msg->size); GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "Master got message part of type %u and size %u " - "belonging to message ID %llu with flags %u\n", - type, size, message_id, flags); + "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) { @@ -190,7 +238,7 @@ master_message (void *cls, uint64_t message_id, uint32_t flags, if (GNUNET_PSYC_MESSAGE_REQUEST != flags) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Unexpected request flags: %lu\n", flags); + "Unexpected request flags: %x" PRIu32 "\n", flags); GNUNET_assert (0); return; } @@ -201,6 +249,20 @@ master_message (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: @@ -209,14 +271,27 @@ master_message (void *cls, uint64_t message_id, uint32_t flags, } -static void -slave_message (void *cls, uint64_t message_id, uint32_t flags, - const struct GNUNET_MessageHeader *msg) +void +slave_message_cb (void *cls, uint64_t message_id, uint32_t flags, + const struct GNUNET_PSYC_MessageHeader *msg) +{ + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Test #%d: Slave got PSYC message fragment of size %u " + "belonging to message ID %" PRIu64 " with flags %x\n", + test, ntohs (msg->header.size), message_id, flags); + // FIXME +} + + +void +slave_message_part_cb (void *cls, uint64_t message_id, + uint64_t data_offset, uint32_t flags, + const struct GNUNET_MessageHeader *msg) { if (NULL == msg) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Error while receiving message %llu\n", message_id); + "Error while receiving message " PRIu64 "\n", message_id); return; } @@ -224,15 +299,27 @@ slave_message (void *cls, uint64_t message_id, uint32_t flags, uint16_t size = ntohs (msg->size); GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "Slave got message part of type %u and size %u " - "belonging to message ID %llu with flags %u\n", - type, size, message_id, flags); + "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", + flags); + GNUNET_assert (0); + return; + } break; default: @@ -241,21 +328,222 @@ slave_message (void *cls, uint64_t message_id, uint32_t flags, } -static void -join_request (void *cls, const struct GNUNET_CRYPTO_EddsaPublicKey *slave_key, - const char *method_name, - size_t variable_count, const struct GNUNET_ENV_Modifier *variables, - const void *data, size_t data_size, - struct GNUNET_PSYC_JoinHandle *jh) +void +state_get_var (void *cls, const char *name, const void *value, size_t value_size) +{ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Got state var: %s\n%.*s\n", name, value_size, value); +} + + +/*** Slave state_get_prefix() ***/ + +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_WARNING, - "Got join request: %s (%zu vars)", method_name, variable_count); - GNUNET_PSYC_join_decision (jh, GNUNET_YES, 0, NULL, "_notice_join", NULL, - "you're in", 9); + "slave_state_get_prefix:\t%" PRId64 " (%.s)\n", + result, err_msg_size, err_msg); + // FIXME: GNUNET_assert (2 == result); + end (); } -static void +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() ***/ + + +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_WARNING, + "master_state_get_prefix:\t%" PRId64 " (%s)\n", result, err_msg); + // FIXME: GNUNET_assert (2 == result); + slave_state_get_prefix (); +} + + +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() ***/ + + +void +slave_state_get_result (void *cls, int64_t result, + const void *err_msg, uint16_t err_msg_size) +{ + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "slave_state_get:\t%" PRId64 " (%.*s)\n", + result, err_msg_size, err_msg); + // FIXME: GNUNET_assert (2 == result); + master_state_get_prefix (); +} + + +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() ***/ + + +void +master_state_get_result (void *cls, int64_t result, + const void *err_msg, uint16_t err_msg_size) +{ + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "master_state_get:\t%" PRId64 " (%.*s)\n", + result, err_msg_size, err_msg); + // FIXME: GNUNET_assert (1 == result); + slave_state_get (); +} + + +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() ***/ + +void +slave_history_replay_result (void *cls, int64_t result, + const void *err_msg, uint16_t err_msg_size) +{ + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "slave_history_replay:\t%" PRId64 " (%.*s)\n", + result, err_msg_size, err_msg); + GNUNET_assert (9 == result); + + master_state_get (); +} + + +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() ***/ + + +void +master_history_replay_result (void *cls, int64_t result, + const void *err_msg, uint16_t err_msg_size) +{ + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "master_history_replay:\t%" PRId64 " (%.*s)\n", + result, err_msg_size, err_msg); + GNUNET_assert (9 == result); + + slave_history_replay (); +} + + +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() ***/ + + +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_WARNING, + "slave_history_replay_latest:\t%" PRId64 " (%.*s)\n", + result, err_msg_size, err_msg); + GNUNET_assert (9 == result); + + master_history_replay (); +} + + +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() ***/ + + +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_WARNING, + "master_history_replay_latest:\t%" PRId64 " (%.*s)\n", + result, err_msg_size, err_msg); + GNUNET_assert (9 == result); + + slave_history_replay_latest (); +} + + +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); +} + + +void transmit_resume (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmission resumed.\n"); @@ -267,7 +555,49 @@ transmit_resume (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } -static int +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, + "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; + } + + 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); + + return ++tmit->n < tmit->data_count ? GNUNET_NO : GNUNET_YES; +} + + +int tmit_notify_mod (void *cls, uint16_t *data_size, void *data, uint8_t *oper, uint32_t *full_value_size) { @@ -277,41 +607,39 @@ tmit_notify_mod (void *cls, uint16_t *data_size, void *data, uint8_t *oper, "%u modifiers left to process.\n", *data_size, GNUNET_ENV_environment_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); + memcpy (data, tmit->mod->name, name_size); ((char *)data)[name_size] = '\0'; - memcpy ((char *)data + name_size + 1, value, value_size); + memcpy ((char *)data + name_size + 1, tmit->mod->value, value_size); } else if (NULL != tmit->mod_value && 0 < tmit->mod_value_size) { /* Modifier continuation */ @@ -341,58 +669,19 @@ tmit_notify_mod (void *cls, uint16_t *data_size, void *data, uint8_t *oper, 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) -{ - 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, - "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; - } - - 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); - - return ++tmit->n < tmit->data_count ? GNUNET_NO : GNUNET_YES; -} +static void +slave_join (); -static void -slave_joined (void *cls, uint64_t max_message_id) +void +slave_transmit () { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Slave joined: %lu\n", max_message_id); - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Slave sending request to master.\n"); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Slave sending request to master.\n"); test = TEST_SLAVE_TRANSMIT; tmit = GNUNET_new (struct TransmitClosure); @@ -401,40 +690,127 @@ slave_joined (void *cls, uint64_t max_message_id) "_abc", "abc def", 7); GNUNET_ENV_environment_add (tmit->env, GNUNET_ENV_OP_ASSIGN, "_abc_def", "abc def ghi", 11); + tmit->mod = GNUNET_ENV_environment_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 (slv, "_request_test", &tmit_notify_mod, + &tmit_notify_data, tmit, GNUNET_PSYC_SLAVE_TRANSMIT_NONE); } + +void +slave_remove_cb (void *cls, int64_t result, + const void *err_msg, uint16_t err_msg_size) +{ + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "slave_remove:\t%" PRId64 " (%.*s)\n", + result, err_msg_size, err_msg); + + slave_transmit (); +} + + +void +slave_add_cb (void *cls, int64_t result, + const void *err_msg, uint16_t err_msg_size) +{ + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "slave_add:\t%" PRId64 " (%.*s)\n", + result, err_msg_size, err_msg); + + struct GNUNET_PSYC_Channel *chn = cls; + GNUNET_PSYC_channel_slave_remove (chn, &slave_pub_key, 2, + &slave_remove_cb, chn); + +} + + +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_WARNING, + "Slave got join decision: %d\n", is_admitted); + + if (GNUNET_YES != is_admitted) + { /* First join request is refused, retry. */ + GNUNET_assert (1 == join_req_count); + slave_join (); + return; + } + + 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); +} + + +static void +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 #%u from %s.\n", + join_req_count, GNUNET_h2s (&slave_key_hash)); + + /* Reject first request */ + int is_admitted = (0 < join_req_count++) ? GNUNET_YES : GNUNET_NO; + GNUNET_PSYC_join_decision (jh, is_admitted, 0, NULL, NULL); +} + + +static void +slave_connect_cb (void *cls, int result, uint64_t max_message_id) +{ + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Slave connected: %d, max_message_id: %" PRIu64 "\n", + result, max_message_id); + GNUNET_assert (TEST_SLAVE_JOIN == test); + GNUNET_assert (GNUNET_OK == result || GNUNET_NO == result); +} + + static void slave_join () { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Joining slave.\n"); + test = TEST_SLAVE_JOIN; - struct GNUNET_PeerIdentity origin; - struct GNUNET_PeerIdentity relays[16]; + struct GNUNET_PeerIdentity origin = this_peer; struct GNUNET_ENV_Environment *env = GNUNET_ENV_environment_create (); GNUNET_ENV_environment_add (env, GNUNET_ENV_OP_ASSIGN, "_foo", "bar baz", 7); GNUNET_ENV_environment_add (env, GNUNET_ENV_OP_ASSIGN, "_foo_bar", "foo bar baz", 11); - slv = GNUNET_PSYC_slave_join (cfg, &channel_pub_key, slave_key, &origin, - 16, relays, &slave_message, &join_request, - &slave_joined, NULL, "_request_join", env, - "some data", 9); + 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, &origin, 0, NULL, + &slave_message_cb, &slave_message_part_cb, + &slave_connect_cb, &join_decision_cb, NULL, + join_msg); + GNUNET_free (join_msg); + slv_chn = GNUNET_PSYC_slave_get_channel (slv); GNUNET_ENV_environment_destroy (env); } -static void +void master_transmit () { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Master sending message to all.\n"); test = TEST_MASTER_TRANSMIT; + end_count = 0; + uint32_t i, j; char *name_max = "_test_max"; @@ -466,6 +842,7 @@ master_transmit () name_cont, val_cont, GNUNET_PSYC_MODIFIER_MAX_PAYLOAD - name_cont_size + GNUNET_PSYC_MOD_CONT_MAX_PAYLOAD); + tmit->mod = GNUNET_ENV_environment_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++) @@ -475,21 +852,58 @@ 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_started (void *cls, uint64_t max_message_id) +void +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); + "Master started: %d, max_message_id: %" PRIu64 "\n", + result, max_message_id); + GNUNET_assert (TEST_MASTER_START == test); + GNUNET_assert (GNUNET_OK == result || GNUNET_NO == result); slave_join (); } +void +master_start () +{ + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Starting master.\n"); + test = TEST_MASTER_START; + 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); +} + +void +schedule_master_start (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + master_start (); +} + + +void +core_connected (void *cls, const struct GNUNET_PeerIdentity *my_identity) +{ + this_peer = *my_identity; + +#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 + +} + /** * Main function of the test, run from scheduler. * @@ -497,8 +911,8 @@ master_started (void *cls, uint64_t max_message_id) * @param cfg configuration we use (also to connect to PSYC service) * @param peer handle to access more of the peer (not used) */ -static void -#if DEBUG_SERVICE +void +#if DEBUG_TEST_PSYC run (void *cls, char *const *args, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c) #else @@ -511,14 +925,13 @@ run (void *cls, end_badly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); 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_message, &join_request, &master_started, NULL); + core = GNUNET_CORE_connect (cfg, NULL, &core_connected, NULL, NULL, + NULL, GNUNET_NO, NULL, GNUNET_NO, NULL); } @@ -526,7 +939,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 };