X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fpsyc%2Ftest_psyc.c;h=03a1890b1fa160256b24967f4545170ce2288351;hb=2105059516320800eaa8fff1196b58f29a50ba7c;hp=5ea83dd63a7b5e77868ac84b1cea00f1e5e9bfd2;hpb=95f9076a2139f5fb042b944a0658b6cda2fa35db;p=oweals%2Fgnunet.git

diff --git a/src/psyc/test_psyc.c b/src/psyc/test_psyc.c
index 5ea83dd63..03a1890b1 100644
--- a/src/psyc/test_psyc.c
+++ b/src/psyc/test_psyc.c
@@ -34,7 +34,6 @@
 #include "gnunet_testing_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)
 
@@ -45,7 +44,6 @@ static int res;
 
 static const struct GNUNET_CONFIGURATION_Handle *cfg;
 
-static struct GNUNET_CORE_Handle *core;
 static struct GNUNET_PeerIdentity this_peer;
 
 /**
@@ -143,11 +141,6 @@ slave_parted (void *cls)
 static void
 cleanup ()
 {
-  if (NULL != core)
-  {
-    GNUNET_CORE_disconnect (core);
-    core = NULL;
-  }
   if (NULL != slv)
   {
     GNUNET_PSYC_slave_part (slv, GNUNET_NO, &slave_parted, NULL);
@@ -192,7 +185,7 @@ end_normally (void *cls)
 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 != NULL)
   {
@@ -208,7 +201,7 @@ static void
 master_message_cb (void *cls, const struct GNUNET_PSYC_MessageHeader *msg)
 {
   GNUNET_assert (NULL != msg);
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+  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),
@@ -229,7 +222,7 @@ master_message_part_cb (void *cls, const struct GNUNET_PSYC_MessageHeader *msg,
   uint16_t type = ntohs (pmsg->type);
   uint16_t size = ntohs (pmsg->size);
 
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+  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);
@@ -278,7 +271,7 @@ static void
 slave_message_cb (void *cls, const struct GNUNET_PSYC_MessageHeader *msg)
 {
   GNUNET_assert (NULL != msg);
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+  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),
@@ -300,7 +293,7 @@ slave_message_part_cb (void *cls,
   uint16_t type = ntohs (pmsg->type);
   uint16_t size = ntohs (pmsg->size);
 
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+  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);
@@ -336,7 +329,10 @@ state_get_var (void *cls, const struct GNUNET_MessageHeader *mod,
                uint32_t value_size, uint32_t full_value_size)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Got state var: %s\n%.*s\n", name, value_size, value);
+              "Got state var: %s\n%.*s\n",
+              name,
+              (int) value_size,
+              (const char *) value);
 }
 
 
@@ -346,9 +342,11 @@ 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_WARNING,
-              "slave_state_get_prefix:\t%" PRId64 " (%.s)\n",
-              result, err_msg_size, err_msg);
+  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 ();
 }
@@ -370,8 +368,9 @@ 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_WARNING,
-              "master_state_get_prefix:\t%" PRId64 " (%s)\n", result, err_msg);
+  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 ();
 }
@@ -393,9 +392,9 @@ 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_WARNING,
-              "slave_state_get:\t%" PRId64 " (%.*s)\n",
-              result, err_msg_size, err_msg);
+  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 ();
 }
@@ -417,9 +416,9 @@ 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_WARNING,
-              "master_state_get:\t%" PRId64 " (%.*s)\n",
-              result, err_msg_size, err_msg);
+  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 ();
 }
@@ -440,9 +439,11 @@ 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_WARNING,
-              "slave_history_replay:\t%" PRId64 " (%.*s)\n",
-              result, err_msg_size, err_msg);
+  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 ();
@@ -468,9 +469,11 @@ 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_WARNING,
-              "master_history_replay:\t%" PRId64 " (%.*s)\n",
-              result, err_msg_size, err_msg);
+  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 ();
@@ -496,9 +499,11 @@ 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_WARNING,
-              "slave_history_replay_latest:\t%" PRId64 " (%.*s)\n",
-              result, err_msg_size, err_msg);
+  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 ();
@@ -525,9 +530,9 @@ 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_WARNING,
-              "master_history_replay_latest:\t%" PRId64 " (%.*s)\n",
-              result, err_msg_size, err_msg);
+  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 ();
@@ -550,7 +555,8 @@ master_history_replay_latest ()
 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);
@@ -596,7 +602,7 @@ tmit_notify_data (void *cls, uint16_t *data_size, void *data)
   tmit->paused = GNUNET_NO;
 
   *data_size = size;
-  memcpy (data, tmit->data[tmit->n], size);
+  GNUNET_memcpy (data, tmit->data[tmit->n], size);
 
   return ++tmit->n < tmit->data_count ? GNUNET_NO : GNUNET_YES;
 }
@@ -608,9 +614,9 @@ tmit_notify_mod (void *cls, uint16_t *data_size, void *data, uint8_t *oper,
 {
   struct TransmitClosure *tmit = cls;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Test #%d: Transmit notify modifier: %lu bytes available, "
+              "Test #%d: Transmit notify modifier: %u bytes available, "
               "%u modifiers left to process.\n",
-              test, *data_size, GNUNET_PSYC_env_get_count (tmit->env));
+              test, *data_size, (unsigned int) GNUNET_PSYC_env_get_count (tmit->env));
 
   uint16_t name_size = 0;
   size_t value_size = 0;
@@ -642,9 +648,9 @@ tmit_notify_mod (void *cls, uint16_t *data_size, void *data, uint8_t *oper,
       tmit->mod_value = tmit->mod->value + value_size;
     }
 
-    memcpy (data, tmit->mod->name, name_size);
+    GNUNET_memcpy (data, tmit->mod->name, name_size);
     ((char *)data)[name_size] = '\0';
-    memcpy ((char *)data + name_size + 1, tmit->mod->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 */
@@ -671,7 +677,7 @@ 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 GNUNET_NO;
@@ -686,7 +692,7 @@ static void
 slave_transmit ()
 {
   test = TEST_SLAVE_TRANSMIT;
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Test #%d: Slave sending request to master.\n", test);
 
   tmit = GNUNET_new (struct TransmitClosure);
@@ -710,9 +716,9 @@ static 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);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Test #%d: slave_remove:\t%" PRId64 " (%.*s)\n",
+              test, result, err_msg_size, (char *) err_msg);
 
   slave_transmit ();
 }
@@ -732,9 +738,9 @@ static 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);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Test #%d: slave_add:\t%" PRId64 " (%.*s)\n",
+              test, result, err_msg_size, (char *) err_msg);
   slave_remove ();
 }
 
@@ -769,7 +775,7 @@ join_decision_cb (void *cls,
                   int is_admitted,
                   const struct GNUNET_PSYC_Message *join_msg)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Test #%d: Slave got join decision: %d\n", test, is_admitted);
 
   switch (test)
@@ -801,7 +807,7 @@ join_request_cb (void *cls,
 {
   struct GNUNET_HashCode slave_key_hash;
   GNUNET_CRYPTO_hash (slave_key, sizeof (*slave_key), &slave_key_hash);
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Test #%d: Got join request #%u from %s.\n",
               test, join_req_count, GNUNET_h2s (&slave_key_hash));
 
@@ -814,7 +820,7 @@ join_request_cb (void *cls,
 static void
 slave_connect_cb (void *cls, int result, uint64_t max_message_id)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+  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);
@@ -826,7 +832,8 @@ static void
 slave_join (int t)
 {
   test = t;
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test #%d: Joining slave.\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Test #%d: Joining slave.\n", t);
 
   struct GNUNET_PeerIdentity origin = this_peer;
   struct GNUNET_PSYC_Environment *env = GNUNET_PSYC_env_create ();
@@ -853,7 +860,7 @@ static void
 master_transmit ()
 {
   test = TEST_MASTER_TRANSMIT;
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Test #%d: Master sending message to all.\n", test);
   end_count = 0;
 
@@ -920,7 +927,8 @@ static void
 master_start ()
 {
   test = TEST_MASTER_START;
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Test #%d: Starting master.\n", test);
+  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,
@@ -936,21 +944,6 @@ schedule_master_start (void *cls)
 }
 
 
-static 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.
  *
@@ -971,14 +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_ecdsa_key_create ();
 
   GNUNET_CRYPTO_eddsa_key_get_public (channel_key, &channel_pub_key);
   GNUNET_CRYPTO_ecdsa_key_get_public (slave_key, &slave_pub_key);
 
-  core = GNUNET_CORE_connect (cfg, NULL, &core_connected, NULL, NULL,
-                              NULL, GNUNET_NO, NULL, GNUNET_NO, 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
 }