#include "gnunet_testing_lib.h"
#include "gnunet_dht_service.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
-
#define REMOVE_DIR GNUNET_YES
/**
*/
static int ok;
-/**
- * Be verbose
- */
-static int verbose;
-
/**
* Total number of peers in the test.
*/
static char *topology_file;
-struct GNUNET_TESTING_Daemon *d1;
+static struct GNUNET_DHT_Handle **hs;
-struct GNUNET_TESTING_Daemon *d2;
+static struct GNUNET_DHT_GetHandle *get_h;
-struct GNUNET_DHT_Handle **hs;
+static struct GNUNET_DHT_GetHandle *get_h_2;
-struct GNUNET_DHT_GetHandle *get_h;
+static struct GNUNET_DHT_GetHandle *get_h_far;
-struct GNUNET_DHT_GetHandle *get_h_2;
+static int found_1;
-struct GNUNET_DHT_GetHandle *get_h_far;
+static int found_2;
-unsigned int found;
+static int found_far;
/**
* Which topology are we to run
*/
static int test_topology;
+
/**
* Check whether peers successfully shut down.
*/
{
if (emsg != NULL)
{
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Shutdown of peers failed!\n");
-#endif
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Shutdown of peers failed!\n");
ok++;
}
else
{
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: All peers successfully shut down!\n");
-#endif
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "All peers successfully shut down!\n");
}
GNUNET_CONFIGURATION_destroy (testing_cfg);
}
static void
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Ending test.\n");
-#endif
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Ending test.\n");
if (disconnect_task != GNUNET_SCHEDULER_NO_TASK)
{
{
unsigned int i;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: disconnecting peers\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "disconnecting peers\n");
disconnect_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_SCHEDULER_cancel (put_task);
if (NULL != get_h)
shutdown_handle = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
}
+
static void
dht_get_id_handler (void *cls, struct GNUNET_TIME_Absolute exp,
const GNUNET_HashCode * key,
{
int i;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "test: ************* FOUND!!! ***********\n");
if (sizeof (GNUNET_HashCode) == size)
{
const GNUNET_HashCode *h = data;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Contents: %s\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " Contents: %s\n",
GNUNET_h2s_full (h));
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: PATH: (get %u, put %u)\n",
+ else
+ {
+ GNUNET_break(0);
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "PATH: (get %u, put %u)\n",
get_path_length, put_path_length);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: LOCAL\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " LOCAL\n");
for (i = get_path_length - 1; i >= 0; i--)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: %s\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " %s\n",
GNUNET_i2s (&get_path[i]));
}
for (i = put_path_length - 1; i >= 0; i--)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: %s\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " %s\n",
GNUNET_i2s (&put_path[i]));
}
- found++;
- if (TORUS == test_topology && found < 3)
+ switch ((long)cls)
+ {
+ case 1:
+ found_1++;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "FOUND 1!\n");
+ break;
+ case 2:
+ found_2++;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "FOUND 2!\n");
+ break;
+ case 3:
+ found_far++;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "FOUND FAR!\n");
+ break;
+ default:
+ GNUNET_break(0);
+ }
+ if ( (TORUS == test_topology) &&
+ ( (found_1 == 0) || (found_2 == 0) || (found_far == 0)) )
return;
ok = 0;
GNUNET_SCHEDULER_cancel (disconnect_task);
disconnect_task = GNUNET_SCHEDULER_add_now (&disconnect_peers, NULL);
}
+
static void
do_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
unsigned int i;
d = d2 = d_far = o = NULL;
+ found_1 = found_2 = found_far = 0;
if (LINE == test_topology)
{
o = GNUNET_TESTING_daemon_get (pg, 0);
if ((NULL == o) || (NULL == d) || (NULL == d2) || (NULL == d_far))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "test: Peers not found (hostkey file changed?)\n");
+ "Peers not found (hostkey file changed?)\n");
GNUNET_SCHEDULER_cancel (disconnect_task);
disconnect_task = GNUNET_SCHEDULER_add_now (&disconnect_peers, NULL);
return;
{
GNUNET_assert (0);
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: test_task\ntest: from %s\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test_task\nfrom %s\n",
GNUNET_h2s_full (&o->id.hashPubKey));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: looking for %s\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " looking for %s\n",
GNUNET_h2s_full (&d->id.hashPubKey));
- found = 0;
- get_h = GNUNET_DHT_get_start (hs[0], GNUNET_TIME_UNIT_FOREVER_REL, /* timeout */
+ get_h = GNUNET_DHT_get_start (hs[0],
GNUNET_BLOCK_TYPE_TEST, /* type */
&d->id.hashPubKey, /*key to search */
4U, /* replication level */
GNUNET_DHT_RO_RECORD_ROUTE | GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, NULL, /* xquery */
0, /* xquery bits */
- &dht_get_id_handler, NULL);
+ &dht_get_id_handler, (void *)1);
if (TORUS == test_topology)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: looking for %s\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " looking for %s\n",
GNUNET_h2s_full (&d2->id.hashPubKey));
- get_h_2 = GNUNET_DHT_get_start (hs[0], GNUNET_TIME_UNIT_FOREVER_REL, /* timeout */
+ get_h_2 = GNUNET_DHT_get_start (hs[0],
GNUNET_BLOCK_TYPE_TEST, /* type */
&d2->id.hashPubKey, /*key to search */
4U, /* replication level */
GNUNET_DHT_RO_RECORD_ROUTE | GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, NULL, /* xquery */
0, /* xquery bits */
- &dht_get_id_handler, NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: looking for %s\n",
+ &dht_get_id_handler, (void *)2);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " looking for %s\n",
GNUNET_h2s_full (&d_far->id.hashPubKey));
- get_h_far = GNUNET_DHT_get_start (hs[0], GNUNET_TIME_UNIT_FOREVER_REL, /* timeout */
+ get_h_far = GNUNET_DHT_get_start (hs[0],
GNUNET_BLOCK_TYPE_TEST, /* type */
&d_far->id.hashPubKey, /*key to search */
4U, /* replication level */
GNUNET_DHT_RO_RECORD_ROUTE | GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, NULL, /* xquery */
0, /* xquery bits */
- &dht_get_id_handler, NULL);
+ &dht_get_id_handler, (void *)3);
}
GNUNET_SCHEDULER_cancel (disconnect_task);
disconnect_task =
struct GNUNET_TESTING_Daemon *d;
unsigned int i;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: putting id's in DHT\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "putting id's in DHT\n");
for (i = 0; i < num_peers; i++)
{
d = GNUNET_TESTING_daemon_get (pg, i);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: putting into DHT: %s\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " putting into DHT: %s\n",
GNUNET_h2s_full (&d->id.hashPubKey));
GNUNET_DHT_put (hs[i], &d->id.hashPubKey, 10U,
GNUNET_DHT_RO_RECORD_ROUTE |
if (emsg != NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: Peergroup callback called with error, aborting test!\n");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Error from testing: `%s'\n",
+ "Peergroup callback called with error, aborting test!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Error from testing: `%s'\n",
emsg);
ok++;
GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
return;
}
-#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "************************************************************\n");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: Peer Group started successfully!\n");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Have %u connections\n",
+ "Peer Group started successfully with %u connections\n",
total_connections);
-#endif
-
if (data_file != NULL)
{
buf = NULL;
struct GNUNET_TESTING_Daemon *first_daemon,
struct GNUNET_TESTING_Daemon *second_daemon, const char *emsg)
{
-
if (emsg == NULL)
{
total_connections++;
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "test: Problem with new connection (%s)\n", emsg);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Problem with new connection (%s)\n", emsg);
}
-
}
testing_cfg = GNUNET_CONFIGURATION_dup (cfg);
GNUNET_log_setup ("test_dht_topo",
-#if VERBOSE
- "DEBUG",
-#else
"WARNING",
-#endif
NULL);
-
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Starting daemons.\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemons.\n");
GNUNET_CONFIGURATION_set_value_string (testing_cfg, "testing",
"use_progressbars", "YES");
-#endif
-
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (testing_cfg, "testing",
"num_peers", &num_peers))
}
-
-/**
- * test_dht_2d command line options
- */
-static struct GNUNET_GETOPT_CommandLineOption options[] = {
- {'V', "verbose", NULL,
- gettext_noop ("be verbose (print progress information)"),
- 0, &GNUNET_GETOPT_set_one, &verbose},
- GNUNET_GETOPT_OPTION_END
-};
-
-
/**
* Main: start test
*/
int
main (int xargc, char *xargv[])
{
- char *const argv_torus[] = { "test-dht-2dtorus",
+ static struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_OPTION_END
+ };
+ static char *const argv_torus[] = { "test-dht-2dtorus",
"-c",
"test_dht_2dtorus.conf",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
NULL
};
- char *const argv_line[] = { "test-dht-line",
+ static char *const argv_line[] = { "test-dht-line",
"-c",
"test_dht_line.conf",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
NULL
};
char *const *argv;
#if REMOVE_DIR
GNUNET_DISK_directory_remove ("/tmp/test_dht_topo");
#endif
- if (0 != ok)
+ if (0 == found_1)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "ID 1 not found!\n");
+ }
+ if (TORUS == test_topology)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "test: FAILED!\n");
+ if (0 == found_2)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "ID 2 not found!\n");
+ }
+ if (0 == found_far)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "ID far not found!\n");
+ }
}
return ok;
}
projects / oweals / gnunet.git / blobdiff