GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
#include "gnunet_testing_lib.h"
#include "gnunet_core_service.h"
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
#define TEST_ALL GNUNET_NO
#define DEFAULT_NUM_PEERS 4
+#define DEFAULT_ADDITIONAL_MESSAGES 2
+
#define MAX_OUTSTANDING_CONNECTIONS 100
static float fail_percentage = 0.00;
static int ok;
+static unsigned long long num_additional_messages;
+
static unsigned long long num_peers;
static unsigned int total_connections;
static struct TestMessageContext *other_test_messages;
+/**
+ * Check whether peers successfully shut down.
+ */
+void shutdown_callback (void *cls,
+ const char *emsg)
+{
+ if (emsg != NULL)
+ {
+#if VERBOSE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Shutdown of peers failed!\n");
+#endif
+ if (ok == 0)
+ ok = 666;
+ }
+ else
+ {
+#if VERBOSE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "All peers successfully shut down!\n");
+#endif
+ }
+}
+
static void
finish_testing ()
{
struct PeerContext *free_peer_pos;
struct TestMessageContext *pos;
struct TestMessageContext *free_pos;
- int count;
#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
}
all_peers = NULL;
- count = 0;
pos = test_messages;
while (pos != NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Calling daemons_stop\n");
#endif
- GNUNET_TESTING_daemons_stop (pg, TIMEOUT);
+ GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"daemons_stop finished\n");
total_server_connections -= 2;
}
-static void
-send_other_messages (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc);
-
-static int
-process_mtype (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message,
- struct GNUNET_TIME_Relative latency,
- uint32_t distance)
-{
- struct TestMessageContext *pos = cls;
- struct GNUNET_TestMessage *msg = (struct GNUNET_TestMessage *)message;
- if (pos->uid != ntohl(msg->uid))
- return GNUNET_OK;
-
- GNUNET_assert(0 == memcmp(peer, &pos->peer1->id, sizeof(struct GNUNET_PeerIdentity)));
- if (total_other_expected_messages == 0)
- {
- total_messages_received++;
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received message from `%4s', type %d, uid %u, distance %u.\n", GNUNET_i2s (peer), ntohs(message->type), ntohl(msg->uid), distance);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Total messages received %d, expected %d.\n", total_messages_received, expected_messages);
-#endif
- }
- else
- {
- total_other_messages++;
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received message from `%4s', type %d, uid %u, distance %u.\n", GNUNET_i2s (peer), ntohs(message->type), ntohl(msg->uid), distance);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Total messages received %d, expected %d.\n", total_other_messages, total_other_expected_messages);
-#endif
- }
-
- if ((total_messages_received == expected_messages) && (total_other_messages == 0))
- {
- GNUNET_SCHEDULER_cancel (sched, die_task);
- GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 420), &send_other_messages, NULL);
- }
- else if ((total_other_expected_messages > 0) && (total_other_messages == total_other_expected_messages))
- {
- GNUNET_SCHEDULER_cancel (sched, die_task);
- GNUNET_SCHEDULER_add_now (sched, &finish_testing, NULL);
- }
- else
- {
- pos->disconnect_task = GNUNET_SCHEDULER_add_now(sched, &disconnect_cores, pos);
- }
-
- return GNUNET_OK;
-}
-
static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
{
if (pg != NULL)
{
- GNUNET_TESTING_daemons_stop (pg, TIMEOUT);
+ GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
ok = 7331; /* Opposite of leet */
}
else
}
}
+static void
+send_other_messages (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc);
+
+static int
+process_mtype (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *message,
+ struct GNUNET_TIME_Relative latency,
+ uint32_t distance)
+{
+ struct TestMessageContext *pos = cls;
+ struct GNUNET_TestMessage *msg = (struct GNUNET_TestMessage *)message;
+ if (pos->uid != ntohl(msg->uid))
+ return GNUNET_OK;
+
+ GNUNET_assert(0 == memcmp(peer, &pos->peer1->id, sizeof(struct GNUNET_PeerIdentity)));
+ if (total_other_expected_messages == 0)
+ {
+ total_messages_received++;
+#if VERBOSE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received message from `%4s', type %d, uid %u, distance %u.\n", GNUNET_i2s (peer), ntohs(message->type), ntohl(msg->uid), distance);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Total messages received %d, expected %d.\n", total_messages_received, expected_messages);
+#endif
+ }
+ else
+ {
+ total_other_messages++;
+#if VERBOSE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received message from `%4s', type %d, uid %u, distance %u.\n", GNUNET_i2s (peer), ntohs(message->type), ntohl(msg->uid), distance);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Total messages received %d, expected %d.\n", total_other_messages, total_other_expected_messages);
+#endif
+ }
+
+ if ((total_messages_received == expected_messages) && (total_other_messages == 0))
+ {
+ GNUNET_SCHEDULER_cancel (sched, die_task);
+ die_task = GNUNET_SCHEDULER_add_delayed (sched,
+ TEST_TIMEOUT,
+ &end_badly, "waiting for DV peers to connect!");
+ /*
+ if ((num_peers == 3) && (total_other_expected_messages == 2))
+ {
+ GNUNET_SCHEDULER_add_now (sched, &send_other_messages, NULL);
+ }
+ else
+ {
+ GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20), &send_other_messages, NULL);
+ }*/
+ }
+ else if ((total_other_expected_messages > 0) && (total_other_messages == total_other_expected_messages))
+ {
+ GNUNET_SCHEDULER_cancel (sched, die_task);
+ GNUNET_SCHEDULER_add_now (sched, &finish_testing, NULL);
+ }
+ else
+ {
+ pos->disconnect_task = GNUNET_SCHEDULER_add_now(sched, &disconnect_cores, pos);
+ }
+
+ return GNUNET_OK;
+}
+
static size_t
transmit_ready (void *cls, size_t size, void *buf)
{
* Connect to the receiving peer
*/
pos->peer2handle = GNUNET_CORE_connect (sched,
- pos->peer2->cfg,
- TIMEOUT,
- pos,
- &init_notify_peer2,
- NULL,
- NULL,
- NULL,
- GNUNET_YES, NULL, GNUNET_YES, handlers);
+ pos->peer2->cfg,
+ TIMEOUT,
+ pos,
+ &init_notify_peer2,
+ NULL,
+ NULL,
+ NULL, NULL,
+ GNUNET_YES, NULL, GNUNET_YES, handlers);
}
TIMEOUT,
pos,
&init_notify_peer1,
- NULL,
+ NULL, NULL,
NULL,
NULL,
GNUNET_NO, NULL, GNUNET_NO, no_handlers);
#endif
GNUNET_SCHEDULER_add_now (sched, &send_test_messages, other_test_messages);
+ GNUNET_SCHEDULER_cancel(sched, die_task);
die_task = GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 250), &end_badly, "from send_other_messages");
}
{
#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Created %d total connections, which is our target number! Calling send messages.\n",
+ "Created %u total connections, which is our target number! Calling send messages.\n",
total_connections);
#endif
GNUNET_SCHEDULER_cancel (sched, die_task);
die_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_SCHEDULER_add_now (sched, &send_test_messages, test_messages);
- //GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1), &send_test_messages, test_messages);
}
else if (total_connections + failed_connections == expected_connections)
{
GNUNET_SCHEDULER_cancel (sched, die_task);
die_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_SCHEDULER_add_now (sched, &send_test_messages, test_messages);
- //GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1), &send_test_messages, test_messages);
}
else
{
if (second_daemon == NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Couldn't find second peer!\n");
+ GNUNET_free(second_shortname);
return;
}
#if !TEST_ALL
fprintf(dotOutFile, "\tn%s -- n%s [color=brown];\n", d->shortname, second_shortname);
}
GNUNET_free(second_shortname);
+
+ if (temp_total_other_messages == num_additional_messages)
+ {
+ GNUNET_SCHEDULER_add_now (sched, &send_other_messages, NULL);
+ }
}
static void
GNUNET_assert(GNUNET_SYSERR != GNUNET_CONTAINER_multihashmap_put(peer_daemon_hash, &id->hashPubKey, d, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
new_peer = GNUNET_malloc(sizeof(struct PeerContext));
- new_peer->peer_handle = GNUNET_CORE_connect(sched, cfg, GNUNET_TIME_UNIT_FOREVER_REL, d, NULL, &all_connect_handler, NULL, NULL, GNUNET_NO, NULL, GNUNET_NO, no_handlers);
+ new_peer->peer_handle = GNUNET_CORE_connect(sched, cfg, GNUNET_TIME_UNIT_FOREVER_REL, d, NULL, &all_connect_handler, NULL, NULL, NULL, GNUNET_NO, NULL, GNUNET_NO, no_handlers);
new_peer->daemon = d;
new_peer->next = all_peers;
all_peers = new_peer;
&num_peers))
num_peers = DEFAULT_NUM_PEERS;
+ if (GNUNET_SYSERR ==
+ GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "additional_messages",
+ &num_additional_messages))
+ num_additional_messages = DEFAULT_ADDITIONAL_MESSAGES;
+
main_cfg = cfg;
+ GNUNET_assert(num_peers > 0 && num_peers < (unsigned int)-1);
peers_left = num_peers;
/* Set up a task to end testing if peer start fails */
#endif
NULL);
ret = check ();
-
/**
* Need to remove base directory, subdirectories taken care
* of by the testing framework.
return ret;
}
-/* end of test_testing_topology.c */
+/* end of test_transport_api_dv.c */
projects / oweals / gnunet.git / blobdiff