X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fpsyc%2Ftest_psyc.c;h=ba31d9329e0f0a96a11fbec5dca94b8710fe9e4d;hb=26d1b687ca01be01505b69ff48ae5d3e0cd4186e;hp=0077bc9b77d65d403d83ea50f98bdc35e206a771;hpb=a8133f3ff80aaaccc904e4bbaf69bc53dee499cb;p=oweals%2Fgnunet.git diff --git a/src/psyc/test_psyc.c b/src/psyc/test_psyc.c index 0077bc9b7..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 @@ -35,34 +35,35 @@ #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 0 - - /** * Return value from 'main'. */ -static int res; +int res; -static const struct GNUNET_CONFIGURATION_Handle *cfg; +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; +struct GNUNET_PSYC_Master *mst; +struct GNUNET_PSYC_Slave *slv; -static struct GNUNET_CRYPTO_EddsaPrivateKey *channel_key; -static struct GNUNET_CRYPTO_EcdsaPrivateKey *slave_key; +struct GNUNET_PSYC_Channel *mst_chn, *slv_chn; -static struct GNUNET_CRYPTO_EddsaPublicKey channel_pub_key; -static struct GNUNET_CRYPTO_EcdsaPublicKey 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 { @@ -81,43 +82,73 @@ struct TransmitClosure struct TransmitClosure *tmit; -static uint8_t join_req_count; +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); } @@ -127,7 +158,7 @@ cleanup () * @param cls NULL * @param tc scheduler context */ -static void +void end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { res = 1; @@ -142,7 +173,7 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) * @param cls NULL * @param tc scheduler context */ -static void +void end_normally (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { res = 0; @@ -154,29 +185,42 @@ end_normally (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) /** * 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 +void master_message_cb (void *cls, uint64_t message_id, uint32_t flags, - const struct GNUNET_MessageHeader *msg) + 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; } @@ -184,9 +228,9 @@ master_message_cb (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 %x\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) { @@ -205,6 +249,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: @@ -213,14 +271,27 @@ master_message_cb (void *cls, uint64_t message_id, uint32_t flags, } -static void +void slave_message_cb (void *cls, uint64_t message_id, uint32_t flags, - const struct GNUNET_MessageHeader *msg) + 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; } @@ -228,15 +299,27 @@ slave_message_cb (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 %x\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: @@ -245,7 +328,222 @@ slave_message_cb (void *cls, uint64_t message_id, uint32_t flags, } -static void +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, + "slave_state_get_prefix:\t%" PRId64 " (%.s)\n", + result, err_msg_size, err_msg); + // FIXME: GNUNET_assert (2 == result); + end (); +} + + +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"); @@ -257,7 +555,7 @@ 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; @@ -299,7 +597,7 @@ tmit_notify_data (void *cls, uint16_t *data_size, void *data) } -static int +int tmit_notify_mod (void *cls, uint16_t *data_size, void *data, uint8_t *oper, uint32_t *full_value_size) { @@ -371,7 +669,7 @@ 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; } @@ -379,22 +677,11 @@ static void slave_join (); -static void -join_decision_cb (void *cls, int is_admitted, - const struct GNUNET_PSYC_MessageHeader *join_msg) +void +slave_transmit () { - 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; - } GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Slave sending request to master.\n"); - test = TEST_SLAVE_TRANSMIT; tmit = GNUNET_new (struct TransmitClosure); @@ -408,15 +695,65 @@ join_decision_cb (void *cls, int is_admitted, 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_request_cb (void *cls, const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_key, - const struct GNUNET_PSYC_MessageHeader *msg, +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; @@ -432,10 +769,13 @@ join_request_cb (void *cls, const struct GNUNET_CRYPTO_EcdsaPublicKey *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); + "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); } @@ -443,29 +783,34 @@ static void slave_join () { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Joining slave.\n"); + test = TEST_SLAVE_JOIN; - struct GNUNET_PeerIdentity origin; // FIXME: this peer + 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); - struct GNUNET_MessageHeader * + 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, + 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"; @@ -507,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_start_cb (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. * @@ -529,8 +911,8 @@ master_start_cb (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 @@ -548,10 +930,8 @@ run (void *cls, GNUNET_CRYPTO_eddsa_key_get_public (channel_key, &channel_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); + core = GNUNET_CORE_connect (cfg, NULL, &core_connected, NULL, NULL, + NULL, GNUNET_NO, NULL, GNUNET_NO, NULL); } @@ -559,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 };