X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fpsycstore%2Ftest_psycstore.c;h=1e700402131c7985de2a534bc2087873fb05ae6b;hb=0c5cea1c26efb8b53f643a6ce6b162d9c9fe2b8f;hp=125e64f5825298808eabeaac15b8027dc8e393fe;hpb=40884377f3126bbecbfd3243d47224b3094914f9;p=oweals%2Fgnunet.git diff --git a/src/psycstore/test_psycstore.c b/src/psycstore/test_psycstore.c index 125e64f58..1e7004021 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 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 @@ -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. */ /** @@ -54,7 +54,7 @@ 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_EddsaPrivateKey *channel_key; static struct GNUNET_CRYPTO_EcdsaPrivateKey *slave_key; @@ -143,10 +143,10 @@ end_normally (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) static void end () { - 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); @@ -154,7 +154,8 @@ end () void -state_reset_result (void *cls, int64_t result, const char *err_msg) +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); @@ -169,7 +170,7 @@ 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]; @@ -195,7 +196,8 @@ 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) +state_get_prefix_result (void *cls, int64_t result, + const char *err_msg, uint16_t err_msg_size) { struct StateClosure *scls = cls; op = NULL; @@ -208,7 +210,8 @@ 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) +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 +224,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, @@ -250,17 +253,18 @@ counters_result (void *cls, int status, uint64_t max_fragment_id, 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) +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); @@ -272,29 +276,17 @@ state_modify_result (void *cls, int64_t result, const char *err_msg) void -state_sync_result (void *cls, int64_t result, const char *err_msg) +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); } @@ -328,7 +320,8 @@ fragment_result (void *cls, void -message_get_latest_result (void *cls, int64_t result, const char *err_msg) +message_get_latest_result (void *cls, int64_t result, + const char *err_msg, uint16_t err_msg_size) { struct FragmentClosure *fcls = cls; op = NULL; @@ -350,12 +343,14 @@ message_get_latest_result (void *cls, int64_t result, const char *err_msg) 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); } void -message_get_result (void *cls, int64_t result, const char *err_msg) +message_get_result (void *cls, int64_t result, + const char *err_msg, uint16_t err_msg_size) { struct FragmentClosure *fcls = cls; op = NULL; @@ -365,13 +360,14 @@ message_get_result (void *cls, int64_t result, const char *err_msg) fcls->n = 0; fcls->n_expected = 3; op = GNUNET_PSYCSTORE_message_get_latest (h, &channel_pub_key, &slave_pub_key, - 1, &fragment_result, + 1, "", &fragment_result, &message_get_latest_result, fcls); } void -message_get_fragment_result (void *cls, int64_t result, const char *err_msg) +message_get_fragment_result (void *cls, int64_t result, + const char *err_msg, uint16_t err_msg_size) { struct FragmentClosure *fcls = cls; op = NULL; @@ -382,14 +378,15 @@ message_get_fragment_result (void *cls, int64_t result, const char *err_msg) fcls->n_expected = 3; 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, + message_id, message_id, 0, "", &fragment_result, &message_get_result, fcls); } void -fragment_get_latest_result (void *cls, int64_t result, const char *err_msg) +fragment_get_latest_result (void *cls, int64_t result, + const char *err_msg, uint16_t err_msg_size) { struct FragmentClosure *fcls = cls; op = NULL; @@ -407,7 +404,8 @@ fragment_get_latest_result (void *cls, int64_t result, const char *err_msg) void -fragment_get_result (void *cls, int64_t result, const char *err_msg) +fragment_get_result (void *cls, int64_t result, + const char *err_msg, uint16_t err_msg_size) { struct FragmentClosure *fcls = cls; op = NULL; @@ -424,7 +422,8 @@ fragment_get_result (void *cls, int64_t result, const char *err_msg) void -fragment_store_result (void *cls, int64_t result, const char *err_msg) +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); @@ -495,7 +494,8 @@ fragment_store () void -membership_test_result (void *cls, int64_t result, const char *err_msg) +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); @@ -506,7 +506,8 @@ membership_test_result (void *cls, int64_t result, const char *err_msg) void -membership_store_result (void *cls, int64_t result, const char *err_msg) +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); @@ -517,6 +518,7 @@ membership_store_result (void *cls, int64_t result, const char *err_msg) &membership_test_result, NULL); } + /** * Main function of the test, run from scheduler. *