X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fpsycstore%2Ftest_psycstore.c;h=f9a7ce9cac88dd68de1bf402e14e8ab651f5d285;hb=3aab63d5c50db0eb784d3b65b2bd989d3458c960;hp=15eb2de30343a0826f33d98b74b559bec7a304e5;hpb=2a95ef75f9df9267eda0a2a6625082288bc9715b;p=oweals%2Fgnunet.git diff --git a/src/psycstore/test_psycstore.c b/src/psycstore/test_psycstore.c index 15eb2de30..f9a7ce9ca 100644 --- a/src/psycstore/test_psycstore.c +++ b/src/psycstore/test_psycstore.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,8 +14,8 @@ * * 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. */ /** @@ -25,15 +25,15 @@ * @author Christian Grothoff */ +#include + #include "platform.h" -#include "gnunet_common.h" #include "gnunet_util_lib.h" -#include "gnunet_psycstore_service.h" +#include "gnunet_common.h" #include "gnunet_testing_lib.h" +#include "gnunet_psycstore_service.h" -#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10) - -#define DEBUG_SERVICE 0 +#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) /** @@ -54,13 +54,13 @@ static struct GNUNET_PSYCSTORE_OperationHandle *op; /** * Handle for task for timeout termination. */ -static GNUNET_SCHEDULER_TaskIdentifier end_badly_task; +static struct GNUNET_SCHEDULER_Task *end_badly_task; -static struct GNUNET_CRYPTO_EccPrivateKey *channel_key; -static struct GNUNET_CRYPTO_EccPrivateKey *slave_key; +static struct GNUNET_CRYPTO_EddsaPrivateKey *channel_key; +static struct GNUNET_CRYPTO_EcdsaPrivateKey *slave_key; -static struct GNUNET_CRYPTO_EccPublicSignKey channel_pub_key; -static struct GNUNET_CRYPTO_EccPublicSignKey slave_pub_key; +static struct GNUNET_CRYPTO_EddsaPublicKey channel_pub_key; +static struct GNUNET_CRYPTO_EcdsaPublicKey slave_pub_key; static struct FragmentClosure { @@ -77,7 +77,7 @@ struct StateClosure { size_t value_size[16]; } scls; -static struct GNUNET_ENV_Modifier modifiers[16]; +static struct GNUNET_PSYC_Modifier modifiers[16]; /** * Clean up all resources used. @@ -113,10 +113,9 @@ cleanup () * Terminate the testcase (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 (); @@ -127,10 +126,9 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) * Terminate the testcase (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 (); @@ -143,21 +141,26 @@ end_normally (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) static void end () { - if (end_badly_task != GNUNET_SCHEDULER_NO_TASK) + if (NULL != end_badly_task) { 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); } -void -state_reset_result (void *cls, int64_t result, const char *err_msg) +static void +state_reset_result (void *cls, + int64_t result, + const char *err_msg, + uint16_t err_msg_size) { op = NULL; - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "state_reset_result:\t%d\n", result); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "state_reset_result:\t%d\n", + (int) result); GNUNET_assert (GNUNET_OK == result); op = GNUNET_PSYCSTORE_state_reset (h, &channel_pub_key, @@ -169,7 +172,10 @@ state_reset_result (void *cls, int64_t result, const char *err_msg) static int -state_result (void *cls, const char *name, const void *value, size_t value_size) +state_result (void *cls, + const char *name, + const void *value, + uint32_t value_size) { struct StateClosure *scls = cls; const char *nam = scls->name[scls->n]; @@ -180,7 +186,9 @@ state_result (void *cls, const char *name, const void *value, size_t value_size) && 0 == memcmp (value, val, val_size) && 0 == strcmp (name, nam)) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " variable %s matches\n", name); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + " variable %s matches\n", + name); return GNUNET_YES; } else @@ -194,8 +202,9 @@ state_result (void *cls, const char *name, const void *value, size_t value_size) } -void -state_get_prefix_result (void *cls, int64_t result, const char *err_msg) +static void +state_get_prefix_result (void *cls, int64_t result, + const char *err_msg, uint16_t err_msg_size) { struct StateClosure *scls = cls; op = NULL; @@ -207,8 +216,9 @@ state_get_prefix_result (void *cls, int64_t result, const char *err_msg) } -void -state_get_result (void *cls, int64_t result, const char *err_msg) +static void +state_get_result (void *cls, int64_t result, + const char *err_msg, uint16_t err_msg_size) { op = NULL; GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "state_get_result:\t%d\n", result); @@ -221,8 +231,8 @@ state_get_result (void *cls, int64_t result, const char *err_msg) scls.value_size[0] = sizeof ("ten eleven twelve") - 1; scls.name[1] = "_sync_foo"; - scls.value[1] = "one two three"; - scls.value_size[1] = sizeof ("one two three") - 1; + scls.value[1] = "three two one"; + scls.value_size[1] = sizeof ("three two one") - 1; op = GNUNET_PSYCSTORE_state_get_prefix (h, &channel_pub_key, "_sync", &state_result, @@ -230,122 +240,85 @@ state_get_result (void *cls, int64_t result, const char *err_msg) } -void -counters_slave_result (void *cls, uint64_t max_state_msg_id) +static void +counters_result (void *cls, int status, uint64_t max_fragment_id, + uint64_t max_message_id, uint64_t max_group_generation, + uint64_t max_state_message_id) { struct FragmentClosure *fcls = cls; int result = 0; op = NULL; - if (max_state_msg_id == GNUNET_ntohll (fcls->msg[0]->message_id)) + if (GNUNET_OK == status + && max_fragment_id == GNUNET_ntohll (fcls->msg[2]->fragment_id) + && max_message_id == GNUNET_ntohll (fcls->msg[2]->message_id) + && max_group_generation == GNUNET_ntohll (fcls->msg[2]->group_generation) + && max_state_message_id == GNUNET_ntohll (fcls->msg[0]->message_id)) result = 1; - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "counters_get_slave:\t%d\n", result); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "counters_get:\t%d\n", result); GNUNET_assert (result == 1); scls.n = 0; - scls.name[0] = "_bar"; - scls.value[0] = "four five six"; - scls.value_size[0] = sizeof ("four five six") - 1; + scls.name[0] = "_sync_bar"; + scls.value[0] = "ten eleven twelve"; + scls.value_size[0] = sizeof ("ten eleven twelve") - 1; - op = GNUNET_PSYCSTORE_state_get (h, &channel_pub_key, "_bar_x_yy_zzz", + op = GNUNET_PSYCSTORE_state_get (h, &channel_pub_key, "_sync_bar_x_yy_zzz", &state_result, &state_get_result, &scls); } -void -state_modify_result (void *cls, int64_t result, const char *err_msg) +static void +state_modify_result (void *cls, int64_t result, + const char *err_msg, uint16_t err_msg_size) { op = NULL; GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "state_modify_result:\t%d\n", result); GNUNET_assert (GNUNET_OK == result); - op = GNUNET_PSYCSTORE_counters_get_slave (h, &channel_pub_key, - &counters_slave_result, cls); + op = GNUNET_PSYCSTORE_counters_get (h, &channel_pub_key, + &counters_result, cls); } -void -state_sync_result (void *cls, int64_t result, const char *err_msg) +static void +state_sync_result (void *cls, int64_t result, + const char *err_msg, uint16_t err_msg_size) { struct FragmentClosure *fcls = cls; op = NULL; GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "state_sync_result:\t%d\n", result); GNUNET_assert (GNUNET_OK == result); - modifiers[0] = (struct GNUNET_ENV_Modifier) { - .oper = '=', - .name = "_sync_foo", - .value = "one two three", - .value_size = sizeof ("one two three") - 1 - }; - modifiers[1] = (struct GNUNET_ENV_Modifier) { - .oper = '=', - .name = "_bar", - .value = "four five six", - .value_size = sizeof ("four five six") - 1 - }; - op = GNUNET_PSYCSTORE_state_modify (h, &channel_pub_key, - GNUNET_ntohll (fcls->msg[0]->message_id), 0, - 2, modifiers, state_modify_result, fcls); + GNUNET_ntohll (fcls->msg[0]->message_id), + 0, state_modify_result, fcls); } -void -counters_master_result (void *cls, uint64_t fragment_id, uint64_t message_id, - uint64_t group_generation) -{ - struct FragmentClosure *fcls = cls; - int result = 0; - op = NULL; - - if (fragment_id == GNUNET_ntohll (fcls->msg[2]->fragment_id) && - message_id == GNUNET_ntohll (fcls->msg[2]->message_id) && - group_generation == GNUNET_ntohll (fcls->msg[2]->group_generation)) - result = 1; - - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "counters_get_master:\t%d\n", result); - GNUNET_assert (result == 1); - - modifiers[0] = (struct GNUNET_ENV_Modifier) { - .oper = '=', - .name = "_sync_foo", - .value = "three two one", - .value_size = sizeof ("three two one") - 1 - }; - modifiers[1] = (struct GNUNET_ENV_Modifier) { - .oper = '=', - .name = "_sync_bar", - .value = "ten eleven twelve", - .value_size = sizeof ("ten eleven twelve") - 1 - }; - - op = GNUNET_PSYCSTORE_state_sync (h, &channel_pub_key, - GNUNET_ntohll (fcls->msg[0]->message_id) + 1, - 2, modifiers, state_sync_result, fcls); -} - - -int +static int fragment_result (void *cls, struct GNUNET_MULTICAST_MessageHeader *msg, enum GNUNET_PSYCSTORE_MessageFlags flags) { struct FragmentClosure *fcls = cls; + GNUNET_assert (fcls->n < fcls->n_expected); struct GNUNET_MULTICAST_MessageHeader *msg0 = fcls->msg[fcls->n]; uint64_t flags0 = fcls->flags[fcls->n++]; if (flags == flags0 && msg->header.size == msg0->header.size && 0 == memcmp (msg, msg0, ntohs (msg->header.size))) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " fragment %llu matches\n", + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " fragment %" PRIu64 " matches\n", GNUNET_ntohll (msg->fragment_id)); return GNUNET_YES; } else { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, " fragment %llu differs\n", + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + " fragment differs: expected %" PRIu64 ", got %" PRIu64 "\n", + GNUNET_ntohll (msg0->fragment_id), GNUNET_ntohll (msg->fragment_id)); GNUNET_assert (0); return GNUNET_SYSERR; @@ -353,82 +326,134 @@ fragment_result (void *cls, } -void -message_get_result (void *cls, int64_t result, const char *err_msg) +static void +message_get_latest_result (void *cls, int64_t result, + const char *err_msg, uint16_t err_msg_size) +{ + struct FragmentClosure *fcls = cls; + op = NULL; + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "message_get_latest:\t%d\n", result); + GNUNET_assert (0 < result && fcls->n == fcls->n_expected); + + modifiers[0] = (struct GNUNET_PSYC_Modifier) { + .oper = '=', + .name = "_sync_foo", + .value = "three two one", + .value_size = sizeof ("three two one") - 1 + }; + modifiers[1] = (struct GNUNET_PSYC_Modifier) { + .oper = '=', + .name = "_sync_bar", + .value = "ten eleven twelve", + .value_size = sizeof ("ten eleven twelve") - 1 + }; + + op = GNUNET_PSYCSTORE_state_sync (h, &channel_pub_key, + GNUNET_ntohll (fcls->msg[0]->message_id) + 1, + GNUNET_ntohll (fcls->msg[0]->message_id) + 2, + 2, modifiers, state_sync_result, fcls); +} + + +static void +message_get_result (void *cls, int64_t result, + const char *err_msg, uint16_t err_msg_size) { struct FragmentClosure *fcls = cls; op = NULL; GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "message_get:\t%d\n", result); - GNUNET_assert (result > 0 && fcls->n && fcls->n_expected); + GNUNET_assert (0 < result && fcls->n == fcls->n_expected); - op = GNUNET_PSYCSTORE_counters_get_master (h, &channel_pub_key, - &counters_master_result, fcls); + fcls->n = 0; + fcls->n_expected = 3; + op = GNUNET_PSYCSTORE_message_get_latest (h, &channel_pub_key, &slave_pub_key, + 1, "", &fragment_result, + &message_get_latest_result, fcls); } -void -message_get_fragment_result (void *cls, int64_t result, const char *err_msg) +static void +message_get_fragment_result (void *cls, int64_t result, + const char *err_msg, uint16_t err_msg_size) { struct FragmentClosure *fcls = cls; op = NULL; GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "message_get_fragment:\t%d\n", result); - GNUNET_assert (result > 0 && fcls->n && fcls->n_expected); + GNUNET_assert (0 < result && fcls->n == fcls->n_expected); fcls->n = 0; fcls->n_expected = 3; - op = GNUNET_PSYCSTORE_message_get (h, &channel_pub_key, - GNUNET_ntohll (fcls->msg[0]->message_id), + uint64_t message_id = GNUNET_ntohll (fcls->msg[0]->message_id); + op = GNUNET_PSYCSTORE_message_get (h, &channel_pub_key, &slave_pub_key, + message_id, message_id, 0, "", &fragment_result, &message_get_result, fcls); } -void -fragment_get_result (void *cls, int64_t result, const char *err_msg) +static void +fragment_get_latest_result (void *cls, int64_t result, + const char *err_msg, uint16_t err_msg_size) { struct FragmentClosure *fcls = cls; op = NULL; - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "fragment_get:\t%d\n", result); - GNUNET_assert (result > 0 && fcls->n && fcls->n_expected); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "fragment_get_latest:\t%d\n", result); + GNUNET_assert (0 < result && fcls->n == fcls->n_expected); fcls->n = 1; fcls->n_expected = 2; - op = GNUNET_PSYCSTORE_message_get_fragment (h, &channel_pub_key, + op = GNUNET_PSYCSTORE_message_get_fragment (h, &channel_pub_key, &slave_pub_key, GNUNET_ntohll (fcls->msg[1]->message_id), GNUNET_ntohll (fcls->msg[1]->fragment_offset), &fragment_result, - &message_get_fragment_result, - fcls); + &message_get_fragment_result, fcls); +} + +static void +fragment_get_result (void *cls, int64_t result, + const char *err_msg, uint16_t err_msg_size) +{ + struct FragmentClosure *fcls = cls; + op = NULL; + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "fragment_get:\t%d\n", + (int) result); + GNUNET_assert (0 < result && fcls->n == fcls->n_expected); + + fcls->n = 0; + fcls->n_expected = 3; + op = GNUNET_PSYCSTORE_fragment_get_latest (h, &channel_pub_key, + &slave_pub_key, fcls->n_expected, + &fragment_result, + &fragment_get_latest_result, fcls); } -void -fragment_store_result (void *cls, int64_t result, const char *err_msg) +static void +fragment_store_result (void *cls, int64_t result, + const char *err_msg, uint16_t err_msg_size) { op = NULL; GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "fragment_store:\t%d\n", result); GNUNET_assert (GNUNET_OK == result); if ((intptr_t) cls == GNUNET_YES) - { + { /* last fragment */ fcls.n = 0; fcls.n_expected = 1; - op = GNUNET_PSYCSTORE_fragment_get (h, &channel_pub_key, - GNUNET_ntohll (fcls.msg[0]->fragment_id), + uint64_t fragment_id = GNUNET_ntohll (fcls.msg[0]->fragment_id); + op = GNUNET_PSYCSTORE_fragment_get (h, &channel_pub_key, &slave_pub_key, + fragment_id, fragment_id, &fragment_result, &fragment_get_result, &fcls); } } -void -membership_test_result (void *cls, int64_t result, const char *err_msg) +static void +fragment_store () { - op = NULL; - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "membership_test:\t%d\n", result); - GNUNET_assert (GNUNET_OK == result); - struct GNUNET_MULTICAST_MessageHeader *msg; fcls.flags[0] = GNUNET_PSYCSTORE_MESSAGE_STATE; fcls.msg[0] = msg = GNUNET_malloc (sizeof (*msg) + sizeof (channel_pub_key)); @@ -444,22 +469,22 @@ membership_test_result (void *cls, int64_t result, const char *err_msg) msg->group_generation = GNUNET_htonll (INT64_MAX - 3); msg->flags = htonl (GNUNET_MULTICAST_MESSAGE_LAST_FRAGMENT); - memcpy (&msg[1], &channel_pub_key, sizeof (channel_pub_key)); + GNUNET_memcpy (&msg[1], &channel_pub_key, sizeof (channel_pub_key)); msg->purpose.size = htonl (ntohs (msg->header.size) - sizeof (msg->header) - sizeof (msg->hop_counter) - sizeof (msg->signature)); msg->purpose.purpose = htonl (234); - GNUNET_assert (GNUNET_OK == GNUNET_CRYPTO_ecc_sign (slave_key, &msg->purpose, - &msg->signature)); + GNUNET_assert (GNUNET_OK == GNUNET_CRYPTO_eddsa_sign (channel_key, &msg->purpose, + &msg->signature)); op = GNUNET_PSYCSTORE_fragment_store (h, &channel_pub_key, msg, fcls.flags[0], &fragment_store_result, GNUNET_NO); fcls.flags[1] = GNUNET_PSYCSTORE_MESSAGE_STATE_APPLIED; fcls.msg[1] = msg = GNUNET_malloc (sizeof (*msg) + sizeof (channel_pub_key)); - memcpy (msg, fcls.msg[0], sizeof (*msg) + sizeof (channel_pub_key)); + GNUNET_memcpy (msg, fcls.msg[0], sizeof (*msg) + sizeof (channel_pub_key)); msg->fragment_id = GNUNET_htonll (INT64_MAX - 4); msg->fragment_offset = GNUNET_htonll (1024); @@ -468,7 +493,7 @@ membership_test_result (void *cls, int64_t result, const char *err_msg) fcls.flags[2] = GNUNET_PSYCSTORE_MESSAGE_STATE_HASH; fcls.msg[2] = msg = GNUNET_malloc (sizeof (*msg) + sizeof (channel_pub_key)); - memcpy (msg, fcls.msg[1], sizeof (*msg) + sizeof (channel_pub_key)); + GNUNET_memcpy (msg, fcls.msg[1], sizeof (*msg) + sizeof (channel_pub_key)); msg->fragment_id = GNUNET_htonll (INT64_MAX); msg->fragment_offset = GNUNET_htonll (16384); @@ -476,18 +501,33 @@ membership_test_result (void *cls, int64_t result, const char *err_msg) &fragment_store_result, (void *) GNUNET_YES); } -void -membership_store_result (void *cls, int64_t result, const char *err_msg) + +static void +membership_test_result (void *cls, int64_t result, + const char *err_msg, uint16_t err_msg_size) +{ + op = NULL; + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "membership_test:\t%d\n", result); + GNUNET_assert (GNUNET_OK == result); + + fragment_store (); +} + + +static void +membership_store_result (void *cls, int64_t result, + const char *err_msg, uint16_t err_msg_size) { op = NULL; GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "membership_store:\t%d\n", result); GNUNET_assert (GNUNET_OK == result); op = GNUNET_PSYCSTORE_membership_test (h, &channel_pub_key, &slave_pub_key, - 4, 1, + INT64_MAX - 10, 2, &membership_test_result, NULL); } + /** * Main function of the test, run from scheduler. * @@ -496,28 +536,29 @@ membership_store_result (void *cls, int64_t result, const char *err_msg) * @param peer handle to access more of the peer (not used) */ static void -#if DEBUG_SERVICE +#if DEBUG_TEST_PSYCSTORE run (void *cls, char *const *args, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) #else - run (void *cls, - const struct GNUNET_CONFIGURATION_Handle *cfg, - struct GNUNET_TESTING_Peer *peer) +run (void *cls, + const struct GNUNET_CONFIGURATION_Handle *cfg, + struct GNUNET_TESTING_Peer *peer) #endif { - end_badly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, - &end_badly, NULL); + end_badly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); + h = GNUNET_PSYCSTORE_connect (cfg); GNUNET_assert (NULL != h); - channel_key = GNUNET_CRYPTO_ecc_key_create (); - slave_key = GNUNET_CRYPTO_ecc_key_create (); + channel_key = GNUNET_CRYPTO_eddsa_key_create (); + slave_key = GNUNET_CRYPTO_ecdsa_key_create (); - GNUNET_CRYPTO_ecc_key_get_public_for_signature (channel_key, &channel_pub_key); - GNUNET_CRYPTO_ecc_key_get_public_for_signature (slave_key, &slave_pub_key); + GNUNET_CRYPTO_eddsa_key_get_public (channel_key, &channel_pub_key); + GNUNET_CRYPTO_ecdsa_key_get_public (slave_key, &slave_pub_key); op = GNUNET_PSYCSTORE_membership_store (h, &channel_pub_key, &slave_pub_key, - GNUNET_YES, 4, 2, 1, + GNUNET_YES, INT64_MAX - 5, + INT64_MAX - 10, 2, &membership_store_result, NULL); } @@ -526,7 +567,7 @@ int main (int argc, char *argv[]) { res = 1; -#if DEBUG_SERVICE +#if DEBUG_TEST_PSYCSTORE const struct GNUNET_GETOPT_CommandLineOption opts[] = { GNUNET_GETOPT_OPTION_END };