[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r11790 - gnunet/src/dv
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r11790 - gnunet/src/dv |
|
Date: |
Thu, 17 Jun 2010 18:59:24 +0200 |
Author: nevans
Date: 2010-06-17 18:59:24 +0200 (Thu, 17 Jun 2010)
New Revision: 11790
Added:
gnunet/src/dv/test_transport_dv_data.conf
Removed:
gnunet/src/dv/test_dv_topology.c
gnunet/src/dv/test_dv_topology.conf
gnunet/src/dv/test_transport_api_data.conf
gnunet/src/dv/test_transport_api_dv_peer1.conf
gnunet/src/dv/test_transport_api_dv_peer2.conf
gnunet/src/dv/test_transport_api_dv_peer3.conf
gnunet/src/dv/test_transport_api_dv_peer4.conf
Modified:
gnunet/src/dv/Makefile.am
Log:
clean up files
Modified: gnunet/src/dv/Makefile.am
===================================================================
--- gnunet/src/dv/Makefile.am 2010-06-17 16:56:13 UTC (rev 11789)
+++ gnunet/src/dv/Makefile.am 2010-06-17 16:59:24 UTC (rev 11790)
@@ -62,18 +62,5 @@
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testing/libgnunettesting.la
-#test_dv_topology_SOURCES = \
-# test_dv_topology.c
-#test_dv_topology_LDADD = \
-# $(top_builddir)/src/transport/libgnunettransport.la \
-# $(top_builddir)/src/util/libgnunetutil.la \
-# $(top_builddir)/src/testing/libgnunettesting.la
-
-
EXTRA_DIST = \
- test_transport_dv_data.conf \
- test_transport_api_dv_peer1.conf \
- test_transport_api_dv_peer2.conf \
- test_transport_api_dv_peer3.conf
-
-
+ test_transport_dv_data.conf
Deleted: gnunet/src/dv/test_dv_topology.c
===================================================================
--- gnunet/src/dv/test_dv_topology.c 2010-06-17 16:56:13 UTC (rev 11789)
+++ gnunet/src/dv/test_dv_topology.c 2010-06-17 16:59:24 UTC (rev 11790)
@@ -1,753 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2009 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
- by the Free Software Foundation; either version 2, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- 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.
-*/
-/**
- * @file testing/test_testing_topology.c
- * @brief base testcase for testing all the topologies provided
- */
-#include "platform.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_core_service.h"
-
-#define VERBOSE GNUNET_YES
-
-/**
- * How long until we fail the whole testcase?
- */
-#define TEST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
600)
-
-/**
- * How long until we give up on connecting the peers?
- */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
-
-#define DEFAULT_NUM_PEERS 4
-
-#define MAX_OUTSTANDING_CONNECTIONS 300
-
-static float fail_percentage = 0.05;
-
-static int ok;
-
-static unsigned long long num_peers;
-
-static unsigned int total_connections;
-
-static unsigned int failed_connections;
-
-static unsigned int total_server_connections;
-
-static unsigned int total_messages_received;
-
-static unsigned int expected_messages;
-
-static unsigned int expected_connections;
-
-static unsigned long long peers_left;
-
-static struct GNUNET_TESTING_PeerGroup *pg;
-
-static struct GNUNET_SCHEDULER_Handle *sched;
-
-const struct GNUNET_CONFIGURATION_Handle *main_cfg;
-
-GNUNET_SCHEDULER_TaskIdentifier die_task;
-
-static char *dotOutFileName;
-
-static FILE *dotOutFile;
-
-static char *topology_string;
-
-static int transmit_ready_scheduled;
-
-static int transmit_ready_failed;
-
-static int transmit_ready_called;
-
-static enum GNUNET_TESTING_Topology topology;
-
-static char *test_directory;
-
-#define MTYPE 12345
-
-struct GNUNET_TestMessage
-{
- /**
- * Header of the message
- */
- struct GNUNET_MessageHeader header;
-
- /**
- * Unique identifier for this message.
- */
- uint32_t uid;
-};
-
-struct TestMessageContext
-{
- /* This is a linked list */
- struct TestMessageContext *next;
-
- /* Handle to the sending peer core */
- struct GNUNET_CORE_Handle *peer1handle;
-
- /* Handle to the receiving peer core */
- struct GNUNET_CORE_Handle *peer2handle;
-
- /* Handle to the sending peer daemon */
- struct GNUNET_TESTING_Daemon *peer1;
-
- /* Handle to the receiving peer daemon */
- struct GNUNET_TESTING_Daemon *peer2;
-
- /* Identifier for this message, so we don't disconnect other peers! */
- uint32_t uid;
-
- /* Task for disconnecting cores, allow task to be cancelled on shutdown */
- GNUNET_SCHEDULER_TaskIdentifier disconnect_task;
-
-};
-
-static struct TestMessageContext *test_messages;
-
-static void
-finish_testing ()
-{
- GNUNET_assert (pg != NULL);
- struct TestMessageContext *pos;
- struct TestMessageContext *free_pos;
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Called finish testing, stopping daemons.\n");
-#endif
- int count;
- count = 0;
- pos = test_messages;
- while (pos != NULL)
- {
- if (pos->peer1handle != NULL)
- {
- GNUNET_CORE_disconnect(pos->peer1handle);
- pos->peer1handle = NULL;
- }
- if (pos->peer2handle != NULL)
- {
- GNUNET_CORE_disconnect(pos->peer2handle);
- pos->peer2handle = NULL;
- }
- free_pos = pos;
- pos = pos->next;
- if (free_pos->disconnect_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel(sched, free_pos->disconnect_task);
- }
- GNUNET_free(free_pos);
- }
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "transmit_ready's scheduled %d, failed %d,
transmit_ready's called %d\n", transmit_ready_scheduled, transmit_ready_failed,
transmit_ready_called);
-#endif
- sleep(1);
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Calling daemons_stop\n");
-#endif
- GNUNET_TESTING_daemons_stop (pg, TIMEOUT);
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "daemons_stop finished\n");
-#endif
- if (dotOutFile != NULL)
- {
- fprintf(dotOutFile, "}");
- fclose(dotOutFile);
- }
-
- ok = 0;
-}
-
-
-static void
-disconnect_cores (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
-{
- struct TestMessageContext *pos = cls;
-
- /* Disconnect from the respective cores */
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Disconnecting from peer 1 `%4s'\n", GNUNET_i2s
(&pos->peer1->id));
-#endif
- if (pos->peer1handle != NULL)
- GNUNET_CORE_disconnect(pos->peer1handle);
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Disconnecting from peer 2 `%4s'\n", GNUNET_i2s
(&pos->peer2->id));
-#endif
- if (pos->peer2handle != NULL)
- GNUNET_CORE_disconnect(pos->peer2handle);
- /* Set handles to NULL so test case can be ended properly */
- pos->peer1handle = NULL;
- pos->peer2handle = NULL;
- pos->disconnect_task = GNUNET_SCHEDULER_NO_TASK;
- /* Decrement total connections so new can be established */
- total_server_connections -= 2;
-}
-
-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;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received message from `%4s', type %d, distance %u.\n",
GNUNET_i2s (peer), ntohs(message->type), distance);
- if (pos->uid != ntohl(msg->uid))
- return GNUNET_OK;
-
- total_messages_received++;
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received message from `%4s', type %d, distance %u.\n",
GNUNET_i2s (peer), ntohs(message->type), distance);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Total messages received %d, expected %d.\n",
total_messages_received, expected_messages);
-#endif
-
- if (total_messages_received == 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)
-{
- char *msg = cls;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "End badly was called (%s)... stopping daemons.\n", msg);
- struct TestMessageContext *pos;
- struct TestMessageContext *free_pos;
-
- pos = test_messages;
- while (pos != NULL)
- {
- if (pos->peer1handle != NULL)
- {
- GNUNET_CORE_disconnect(pos->peer1handle);
- pos->peer1handle = NULL;
- }
- if (pos->peer2handle != NULL)
- {
- GNUNET_CORE_disconnect(pos->peer2handle);
- pos->peer2handle = NULL;
- }
- free_pos = pos;
- pos = pos->next;
- GNUNET_free(free_pos);
- }
-
- if (pg != NULL)
- {
- GNUNET_TESTING_daemons_stop (pg, TIMEOUT);
- ok = 7331; /* Opposite of leet */
- }
- else
- ok = 401; /* Never got peers started */
-
- if (dotOutFile != NULL)
- {
- fprintf(dotOutFile, "}");
- fclose(dotOutFile);
- }
-}
-
-
-
-static size_t
-transmit_ready (void *cls, size_t size, void *buf)
-{
- struct GNUNET_TestMessage *m;
- struct TestMessageContext *pos = cls;
-
- GNUNET_assert (buf != NULL);
- m = (struct GNUNET_TestMessage *) buf;
- m->header.type = htons (MTYPE);
- m->header.size = htons (sizeof (struct GNUNET_TestMessage));
- m->uid = htonl(pos->uid);
- transmit_ready_called++;
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "transmit ready for peer %s\ntransmit_ready's scheduled %d,
transmit_ready's called %d\n", GNUNET_i2s(&pos->peer1->id),
transmit_ready_scheduled, transmit_ready_called);
-#endif
- return sizeof (struct GNUNET_TestMessage);
-}
-
-
-static struct GNUNET_CORE_MessageHandler no_handlers[] = {
- {NULL, 0, 0}
-};
-
-static struct GNUNET_CORE_MessageHandler handlers[] = {
- {&process_mtype, MTYPE, sizeof (struct GNUNET_TestMessage)},
- {NULL, 0, 0}
-};
-
-static void
-init_notify_peer2 (void *cls,
- struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
-{
- struct TestMessageContext *pos = cls;
-
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Core connection to `%4s' established, scheduling message
send\n",
- GNUNET_i2s (my_identity));
-#endif
- total_server_connections++;
-
- if (NULL == GNUNET_CORE_notify_transmit_ready (pos->peer1handle,
- 0,
- TIMEOUT,
- &pos->peer2->id,
- sizeof (struct
GNUNET_TestMessage),
- &transmit_ready, pos))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "RECEIVED NULL when asking core (1) for transmission to peer
`%4s'\n",
- GNUNET_i2s (&pos->peer2->id));
- transmit_ready_failed++;
- }
- else
- {
- transmit_ready_scheduled++;
- }
-}
-
-
-static void
-init_notify_peer1 (void *cls,
- struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
-{
- struct TestMessageContext *pos = cls;
- total_server_connections++;
-
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Core connection to `%4s' established, setting up handles\n",
- GNUNET_i2s (my_identity));
-#endif
-
- /*
- * 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);
-
-}
-
-
-static void
-send_test_messages (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
-{
- struct TestMessageContext *pos = cls;
-
- if ((tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN) || (cls == NULL))
- return;
-
- if (die_task == GNUNET_SCHEDULER_NO_TASK)
- {
- die_task = GNUNET_SCHEDULER_add_delayed (sched,
- TEST_TIMEOUT,
- &end_badly, "from
send_test_messages (timeout)");
- }
-
- if (total_server_connections >= MAX_OUTSTANDING_CONNECTIONS)
- {
- GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 1),
- &send_test_messages, pos);
- return; /* Otherwise we'll double schedule messages here! */
- }
-
- /*
- * Connect to the sending peer
- */
- pos->peer1handle = GNUNET_CORE_connect (sched,
- pos->peer1->cfg,
- TIMEOUT,
- pos,
- &init_notify_peer1,
- NULL,
- NULL,
- NULL,
- GNUNET_NO, NULL, GNUNET_NO,
no_handlers);
-
- GNUNET_assert(pos->peer1handle != NULL);
-
- if (total_server_connections < MAX_OUTSTANDING_CONNECTIONS)
- {
- GNUNET_SCHEDULER_add_now (sched,
- &send_test_messages, pos->next);
- }
- else
- {
- GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 1),
- &send_test_messages, pos->next);
- }
-}
-
-
-static void
-schedule_dv_messages (void *cls, const struct GNUNET_SCHEDULER_TaskContext *
tc)
-{
- struct TestMessageContext *pos;
- struct TestMessageContext *new_message;
- struct TestMessageContext *last;
- struct TestMessageContext *new_list;
- int i;
- int other;
-
- if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
- return;
-
- pos = test_messages;
- last = NULL;
- while (pos != NULL)
- {
- last = pos;
- pos = pos->next;
- }
-
- new_list = NULL;
- for (i = 0; i < num_peers; i++)
- {
- new_message = GNUNET_malloc(sizeof(struct TestMessageContext));
- other = i + 2;
- if (other >= num_peers)
- other = other - num_peers;
- new_message->peer1 = GNUNET_TESTING_daemon_get(pg, i);
- new_message->peer2 = GNUNET_TESTING_daemon_get(pg, other);
-
- new_message->uid = total_connections + i + 1;
- new_message->next = new_list;
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Scheduled message between `%4s' and `%4s'\n",
- new_message->peer1->shortname,
new_message->peer2->shortname);
-#endif
-
- new_list = new_message;
- expected_messages++;
- }
-
- if (dotOutFile != NULL)
- {
- fprintf(dotOutFile, "}");
- fclose (dotOutFile);
- dotOutFile = NULL;
- }
-
- if (last != NULL)
- last->next = new_list;
- else
- test_messages = new_list;
-
- GNUNET_SCHEDULER_add_delayed (sched,
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1),
&send_test_messages, test_messages);
-}
-
-
-void
-topology_callback (void *cls,
- const struct GNUNET_PeerIdentity *first,
- const struct GNUNET_PeerIdentity *second,
- const struct GNUNET_CONFIGURATION_Handle *first_cfg,
- const struct GNUNET_CONFIGURATION_Handle *second_cfg,
- struct GNUNET_TESTING_Daemon *first_daemon,
- struct GNUNET_TESTING_Daemon *second_daemon,
- const char *emsg)
-{
- //struct TestMessageContext *temp_context;
- if (emsg == NULL)
- {
- total_connections++;
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "connected peer %s to peer %s\n",
- first_daemon->shortname,
- second_daemon->shortname);
-#endif
- /*temp_context = GNUNET_malloc(sizeof(struct TestMessageContext));
- temp_context->peer1 = first_daemon;
- temp_context->peer2 = second_daemon;
- temp_context->next = test_messages;
- temp_context->uid = total_connections;
- temp_context->disconnect_task = GNUNET_SCHEDULER_NO_TASK;
- test_messages = temp_context;
-
- expected_messages++;*/
- if (dotOutFile != NULL)
- fprintf(dotOutFile, "\tn%s -- n%s;\n", first_daemon->shortname,
second_daemon->shortname);
- }
-#if VERBOSE
- else
- {
- failed_connections++;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Failed to connect peer %s to peer
%s with error :\n%s\n",
- first_daemon->shortname,
- second_daemon->shortname, emsg);
- }
-#endif
-
- if (total_connections == expected_connections)
- {
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Created %d 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_delayed (sched,
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1),
&schedule_dv_messages, test_messages);
- }
- else if (total_connections + failed_connections == expected_connections)
- {
- if (failed_connections < (unsigned int)(fail_percentage *
total_connections))
- {
- GNUNET_SCHEDULER_cancel (sched, die_task);
- die_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_SCHEDULER_add_delayed (sched,
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1),
&schedule_dv_messages, test_messages);
- }
- else
- {
- GNUNET_SCHEDULER_cancel (sched, die_task);
- die_task = GNUNET_SCHEDULER_add_now (sched,
- &end_badly, "from
topology_callback (too many failed connections)");
- }
- }
- else
- {
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Have %d total connections, %d failed connections, Want %d
(at least %d)\n",
- total_connections, failed_connections, expected_connections,
expected_connections - (unsigned int)(fail_percentage * expected_connections));
-#endif
- }
-}
-
-
-static void
-create_topology ()
-{
- expected_connections = -1;
- if ((pg != NULL) && (peers_left == 0))
- {
- /* create_topology will read the topology information from
- the config already contained in the peer group, so should
- we have create_topology called from start peers? I think
- maybe this way is best so that the client can know both
- when peers are started, and when they are connected.
- */
- expected_connections = GNUNET_TESTING_create_topology (pg, topology,
GNUNET_TESTING_TOPOLOGY_NONE, "");
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Have %d expected connections\n", expected_connections);
-#endif
- }
-
- GNUNET_SCHEDULER_cancel (sched, die_task);
- if (expected_connections == GNUNET_SYSERR)
- {
- die_task = GNUNET_SCHEDULER_add_now (sched,
- &end_badly, "from create topology
(bad return)");
- }
- die_task = GNUNET_SCHEDULER_add_delayed (sched,
- TEST_TIMEOUT,
- &end_badly, "from create topology
(timeout)");
-}
-
-
-static void
-my_cb (void *cls,
- const struct GNUNET_PeerIdentity *id,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TESTING_Daemon *d, const char *emsg)
-{
- GNUNET_assert (id != NULL);
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Started daemon %llu out of %llu\n",
- (num_peers - peers_left) + 1, num_peers);
-#endif
- peers_left--;
- if (peers_left == 0)
- {
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "All %d daemons started, now creating topology!\n",
- num_peers);
-#endif
- GNUNET_SCHEDULER_cancel (sched, die_task);
- /* Set up task in case topology creation doesn't finish
- * within a reasonable amount of time */
- die_task = GNUNET_SCHEDULER_add_delayed (sched,
- GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_MINUTES, 5),
- &end_badly, "from my_cb");
- create_topology ();
- ok = 0;
- }
-}
-
-
-static void
-run (void *cls,
- struct GNUNET_SCHEDULER_Handle *s,
- char *const *args,
- const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
- unsigned long long topology_num;
- sched = s;
- ok = 1;
-
- dotOutFileName = strdup("topology.dot");
- dotOutFile = fopen (dotOutFileName, "w");
- if (dotOutFile != NULL)
- {
- fprintf (dotOutFile, "strict graph G {\n");
- }
-
-#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Starting daemons based on config file %s\n", cfgfile);
-#endif
-
- if (GNUNET_YES != GNUNET_CONFIGURATION_get_value_string(cfg, "paths",
"servicehome", &test_directory))
- {
- ok = 404;
- return;
- }
-
- if (GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "topology",
- &topology_num))
- topology = topology_num;
-
- if (GNUNET_SYSERR ==
- GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "num_peers",
- &num_peers))
- num_peers = DEFAULT_NUM_PEERS;
-
- main_cfg = cfg;
-
- peers_left = num_peers;
-
- /* Set up a task to end testing if peer start fails */
- die_task = GNUNET_SCHEDULER_add_delayed (sched,
- GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_MINUTES, 5),
- &end_badly, "didn't start all
daemons in reasonable amount of time!!!");
-
- pg = GNUNET_TESTING_daemons_start (sched, cfg,
- peers_left,
- TIMEOUT,
- NULL, NULL,
- &my_cb, NULL,
- &topology_callback, NULL, NULL);
-
-}
-
-static int
-check ()
-{
- char *binary_name;
- char *config_file_name;
- GNUNET_asprintf(&binary_name, "test-dv-topology", topology_string);
- GNUNET_asprintf(&config_file_name, "test_dv_topology.conf", topology_string);
-
- int ret;
- char *const argv[] = {binary_name,
- "-c",
- config_file_name,
-#if VERBOSE
- "-L", "DEBUG",
-#endif
- NULL
- };
- struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_END
- };
- ret = GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
- argv, binary_name, "nohelp",
- options, &run, &ok);
- if (ret != GNUNET_OK)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "`test-dv-topology': Failed with
error code %d\n", ret);
- }
- GNUNET_free(binary_name);
- GNUNET_free(config_file_name);
- return ok;
-}
-
-int
-main (int argc, char *argv[])
-{
- int ret;
-
- GNUNET_log_setup ("test-dv-topology",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
- NULL);
- ret = check ();
-
- /**
- * Need to remove base directory, subdirectories taken care
- * of by the testing framework.
- */
- if (GNUNET_DISK_directory_remove (test_directory) != GNUNET_OK)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Failed to remove testing
directory %s\n", test_directory);
- }
-
- return ret;
-}
-
-/* end of test_testing_group.c */
Deleted: gnunet/src/dv/test_dv_topology.conf
===================================================================
--- gnunet/src/dv/test_dv_topology.conf 2010-06-17 16:56:13 UTC (rev 11789)
+++ gnunet/src/dv/test_dv_topology.conf 2010-06-17 16:59:24 UTC (rev 11790)
@@ -1,68 +0,0 @@
-[PATHS]
-SERVICEHOME = /tmp/test-gnunet-dv/
-DEFAULTCONFIG = test_dv_topology.conf
-
-[resolver]
-PORT = 2564
-
-[topology]
-BINARY = gnunet-daemon-topology
-CONFIG = $DEFAULTCONFIG
-FRIENDS = $SERVICEHOME/friends
-AUTOCONNECT = YES
-FRIENDS-ONLY = YES
-
-
-[transport]
-PORT = 2565
-PLUGINS = tcp dv
-#PREFIX = xterm -e xterm -T transport -e gdb --args
-#BINARY =
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[arm]
-PORT = 2566
-DEFAULTSERVICES = topology core dv statistics
-
-[statistics]
-PORT = 2567
-
-[transport-tcp]
-PORT = 2568
-
-[transport-udp]
-PORT = 2568
-
-[peerinfo]
-PORT = 2569
-#DEBUG = YES
-#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
-#BINARY =
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
-#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
-
-[core]
-PORT = 2570
-#PREFIX = xterm -e xterm -T CORE -e gdb --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[dv]
-DEBUG = NO
-ALLOW_SHUTDOWN = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-dv
-#BINARY =
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/dv/.libs/gnunet-service-dv
-#PREFIX = xterm -T dvservice -e gdb --args
-#PREFIX = valgrind --log-file=dv1-%p --leak-check=full
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2571
-
-[testing]
-NUM_PEERS = 6
-WEAKRANDOM = YES
-TOPOLOGY = 3
-F2F = YES
Deleted: gnunet/src/dv/test_transport_api_data.conf
===================================================================
--- gnunet/src/dv/test_transport_api_data.conf 2010-06-17 16:56:13 UTC (rev
11789)
+++ gnunet/src/dv/test_transport_api_data.conf 2010-06-17 16:59:24 UTC (rev
11790)
@@ -1,125 +0,0 @@
-[PATHS]
-SERVICEHOME = /tmp/test-transport-api/
-DEFAULTCONFIG = test_transport_api_data.conf
-
-[transport-tcp]
-PORT = 2094
-
-[fs]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-fs
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2094
-INDEXDB = $SERVICEHOME/idxinfo.lst
-
-[datastore-sqlite]
-FILENAME = $SERVICEHOME/datastore/sqlite.db
-
-[datastore]
-DATABASE = sqlite
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-QUOTA = 100000000
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-datastore
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2093
-
-[hostlist]
-HTTP-PROXY =
-SERVERS = http://gnunet.org:8080/
-OPTIONS = -b
-BINARY = gnunet-daemon-hostlist
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-HTTPPORT = 8080
-
-[topology]
-BINARY = gnunet-daemon-topology
-CONFIG = $DEFAULTCONFIG
-FRIENDS = $SERVICEHOME/friends
-TARGET-CONNECTION-COUNT = 16
-AUTOCONNECT = YES
-FRIENDS-ONLY = NO
-MINIMUM-FRIENDS = 0
-
-[core]
-TOTAL_QUOTA_OUT = 3932160
-TOTAL_QUOTA_IN = 3932160
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-core
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2092
-DEBUG = YES
-
-[transport]
-plugins = tcp
-DEBUG = NO
-PREFIX =
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-BINARY = gnunet-service-transport
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2091
-
-[peerinfo]
-TRUST = $SERVICEHOME/data/credit/
-HOSTS = $SERVICEHOME/data/hosts/
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-peerinfo
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2090
-
-[resolver]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-resolver
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2089
-
-[statistics]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-statistics
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2088
-
-[arm]
-DEFAULTSERVICES =
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 2087
-
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 2094
-
-[TESTING]
-WEAKRANDOM = NO
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
Deleted: gnunet/src/dv/test_transport_api_dv_peer1.conf
===================================================================
--- gnunet/src/dv/test_transport_api_dv_peer1.conf 2010-06-17 16:56:13 UTC
(rev 11789)
+++ gnunet/src/dv/test_transport_api_dv_peer1.conf 2010-06-17 16:59:24 UTC
(rev 11790)
@@ -1,118 +0,0 @@
-[hostlist]
-HTTP-PROXY =
-SERVERS = http://gnunet.org:8080/
-OPTIONS = -b
-BINARY = gnunet-daemon-hostlist
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-HTTPPORT = 8080
-
-[topology]
-BINARY = gnunet-daemon-topology
-CONFIG = $DEFAULTCONFIG
-FRIENDS = $SERVICEHOME/friends
-TARGET-CONNECTION-COUNT = 16
-AUTOCONNECT = YES
-FRIENDS-ONLY = NO
-MINIMUM-FRIENDS = 0
-
-[transport]
-PLUGINS = tcp dv
-DEBUG = NO
-#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
-#PREFIX = valgrind --leak-check=full
-#BINARY =
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-BINARY = gnunet-service-transport
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12365
-BLACKLIST_FILE = $SERVICEHOME/blacklist
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
-
-[peerinfo]
-TRUST = $SERVICEHOME/data/credit/
-HOSTS = $SERVICEHOME/data/hosts/
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-peerinfo
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12369
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
-
-[resolver]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-resolver
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12364
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
-
-[statistics]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-statistics
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12367
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
-
-[dv]
-DEBUG = NO
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-#BINARY = gnunet-service-dv
-BINARY =
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/dv/.libs/gnunet-service-dv
-#PREFIX = xterm -T dvservice -e gdb --args
-#PREFIX = valgrind --log-file=dv1-%p --leak-check=full
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12370
-
-[core]
-TOTAL_QUOTA_OUT = 3932160
-TOTAL_QUOTA_IN = 3932160
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-core
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12092
-UNIXPATH = /tmp/gnunet-p1-service-core.sock
-
-[arm]
-DEFAULTSERVICES =
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12366
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
-
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 12368
-
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[PATHS]
-DEFAULTCONFIG = test_transport_api_dv_peer1.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
-
Deleted: gnunet/src/dv/test_transport_api_dv_peer2.conf
===================================================================
--- gnunet/src/dv/test_transport_api_dv_peer2.conf 2010-06-17 16:56:13 UTC
(rev 11789)
+++ gnunet/src/dv/test_transport_api_dv_peer2.conf 2010-06-17 16:59:24 UTC
(rev 11790)
@@ -1,118 +0,0 @@
-[core]
-TOTAL_QUOTA_OUT = 3932160
-TOTAL_QUOTA_IN = 3932160
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-core
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 22092
-
-[hostlist]
-HTTP-PROXY =
-SERVERS = http://gnunet.org:8080/
-OPTIONS = -b
-BINARY = gnunet-daemon-hostlist
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-HTTPPORT = 8080
-
-[topology]
-BINARY = gnunet-daemon-topology
-CONFIG = $DEFAULTCONFIG
-FRIENDS = $SERVICEHOME/friends
-TARGET-CONNECTION-COUNT = 16
-AUTOCONNECT = YES
-FRIENDS-ONLY = NO
-MINIMUM-FRIENDS = 0
-
-[transport]
-PLUGINS = tcp dv
-DEBUG = NO
-# PREFIX =
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-#BINARY = gnunet-service-transport
-#BINARY =
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 22365
-#PREFIX = xterm -T transport1 -e gdb --command=cmd --args
-#PREFIX = valgrind --leak-check=full
-BLACKLIST_FILE = $SERVICEHOME/blacklist
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
-
-[peerinfo]
-TRUST = $SERVICEHOME/data/credit/
-HOSTS = $SERVICEHOME/data/hosts/
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-peerinfo
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 22369
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
-
-[resolver]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-resolver
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 22364
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
-
-[statistics]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-statistics
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 22367
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
-
-[dv]
-DEBUG = NO
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-#BINARY = gnunet-service-dv
-BINARY =
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/dv/.libs/gnunet-service-dv
-#PREFIX = xterm -T dvservice2 -e gdb --args
-#PREFIX = valgrind --log-file=dv2-%p --leak-check=full
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 22370
-
-[arm]
-DEFAULTSERVICES =
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 22366
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
-
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 22368
-
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[PATHS]
-DEFAULTCONFIG = test_transport_api_dv_peer2.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/
-
Deleted: gnunet/src/dv/test_transport_api_dv_peer3.conf
===================================================================
--- gnunet/src/dv/test_transport_api_dv_peer3.conf 2010-06-17 16:56:13 UTC
(rev 11789)
+++ gnunet/src/dv/test_transport_api_dv_peer3.conf 2010-06-17 16:59:24 UTC
(rev 11790)
@@ -1,118 +0,0 @@
-[hostlist]
-HTTP-PROXY =
-SERVERS = http://gnunet.org:8080/
-OPTIONS = -b
-BINARY = gnunet-daemon-hostlist
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-HTTPPORT = 8080
-
-[topology]
-BINARY = gnunet-daemon-topology
-CONFIG = $DEFAULTCONFIG
-FRIENDS = $SERVICEHOME/friends
-TARGET-CONNECTION-COUNT = 16
-AUTOCONNECT = YES
-FRIENDS-ONLY = NO
-MINIMUM-FRIENDS = 0
-
-[transport]
-PLUGINS = tcp dv
-DEBUG = NO
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-#BINARY =
/root/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-BINARY = gnunet-service-transport
-#BINARY =
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 32365
-#PREFIX = xterm -T transport1 -e gdb --args
-#PREFIX = valgrind --leak-check=full
-BLACKLIST_FILE = $SERVICEHOME/blacklist
-UNIXPATH = /tmp/gnunet-p3-service-transport.sock
-
-[peerinfo]
-TRUST = $SERVICEHOME/data/credit/
-HOSTS = $SERVICEHOME/data/hosts/
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-peerinfo
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 32369
-
-[resolver]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-resolver
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 32364
-UNIXPATH = /tmp/gnunet-p3-service-resolver.sock
-
-[core]
-TOTAL_QUOTA_OUT = 3932160
-TOTAL_QUOTA_IN = 3932160
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-core
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 32092
-UNIXPATH = /tmp/gnunet-p3-service-core.sock
-
-[statistics]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-statistics
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 32367
-UNIXPATH = /tmp/gnunet-p3-service-statistics.sock
-
-[dv]
-DEBUG = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-dv
-BINARY =
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/dv/.libs/gnunet-service-dv
-#PREFIX = xterm -T dvservice3 -e gdb --args
-#PREFIX = valgrind --log-file=dv3-%p --leak-check=full --show-reachable=yes
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 32370
-
-[arm]
-DEFAULTSERVICES =
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 32366
-UNIXPATH = /tmp/gnunet-p3-service-arm.sock
-
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 32368
-
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[PATHS]
-DEFAULTCONFIG = test_transport_api_dv_peer3.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-3/
-
Deleted: gnunet/src/dv/test_transport_api_dv_peer4.conf
===================================================================
--- gnunet/src/dv/test_transport_api_dv_peer4.conf 2010-06-17 16:56:13 UTC
(rev 11789)
+++ gnunet/src/dv/test_transport_api_dv_peer4.conf 2010-06-17 16:59:24 UTC
(rev 11790)
@@ -1,117 +0,0 @@
-[topology]
-BINARY = gnunet-daemon-topology
-CONFIG = $DEFAULTCONFIG
-FRIENDS = $SERVICEHOME/friends
-TARGET-CONNECTION-COUNT = 16
-AUTOCONNECT = YES
-FRIENDS-ONLY = NO
-MINIMUM-FRIENDS = 0
-
-[transport]
-PLUGINS = tcp dv
-DEBUG = NO
-ALLOW_SHUTDOWN = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-#BINARY =
/root/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-BINARY = gnunet-service-transport
-#BINARY =
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 42365
-#PREFIX = xterm -T transport1 -e gdb --args
-#PREFIX = valgrind --leak-check=full
-BLACKLIST_FILE = $SERVICEHOME/blacklist
-UNIXPATH = /tmp/gnunet-p4-service-transport.sock
-
-[peerinfo]
-TRUST = $SERVICEHOME/data/credit/
-HOSTS = $SERVICEHOME/data/hosts/
-ALLOW_SHUTDOWN = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-peerinfo
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 42369
-UNIXPATH = /tmp/gnunet-p4-service-peerinfo.sock
-
-[resolver]
-ALLOW_SHUTDOWN = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-resolver
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 42364
-UNIXPATH = /tmp/gnunet-p4-service-resolver.sock
-
-[core]
-TOTAL_QUOTA_OUT = 3932160
-TOTAL_QUOTA_IN = 3932160
-ALLOW_SHUTDOWN = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-core
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 42092
-UNIXPATH = /tmp/gnunet-p4-service-core.sock
-
-[statistics]
-ALLOW_SHUTDOWN = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-statistics
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 42367
-UNIXPATH = /tmp/gnunet-p4-service-statistics.sock
-
-[dv]
-DEBUG = NO
-ALLOW_SHUTDOWN = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-dv
-#BINARY =
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/dv/.libs/gnunet-service-dv
-#PREFIX = xterm -T dvservice4 -e gdb --args
-#PREFIX = valgrind --log-file=dv4-%p --leak-check=full --show-reachable=yes
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 42370
-
-[arm]
-DEFAULTSERVICES =
-ALLOW_SHUTDOWN = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 42366
-UNIXPATH = /tmp/gnunet-p4-service-arm.sock
-
-[transport-tcp]
-ALLOW_SHUTDOWN = NO
-TIMEOUT = 300000
-PORT = 42368
-
-[TESTING]
-WEAKRANDOM = YES
-
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
-[PATHS]
-DEFAULTCONFIG = test_transport_api_dv_peer4.conf
-SERVICEHOME = /tmp/test-gnunetd-transport-peer-4/
-
Added: gnunet/src/dv/test_transport_dv_data.conf
===================================================================
--- gnunet/src/dv/test_transport_dv_data.conf (rev 0)
+++ gnunet/src/dv/test_transport_dv_data.conf 2010-06-17 16:59:24 UTC (rev
11790)
@@ -0,0 +1,72 @@
+[PATHS]
+SERVICEHOME = /tmp/test-gnunet-dv-testing/
+DEFAULTCONFIG = test_transport_dv_data.conf
+
+[resolver]
+PORT = 2564
+
+[transport]
+DEBUG = NO
+PORT = 2565
+PLUGINS = tcp dv
+BLACKLIST_FILE = $SERVICEHOME/blacklist
+#PREFIX = xterm -e xterm -T transport -e gdb --args
+#BINARY =
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
+#PREFIX = valgrind --tool=memcheck --log-file=logs%p
+#DEBUG = YES
+
+[arm]
+PORT = 2566
+DEFAULTSERVICES =
+
+[statistics]
+PORT = 2567
+
+[transport-tcp]
+PORT = 2568
+
+[transport-udp]
+PORT = 2568
+
+[peerinfo]
+PORT = 2569
+#DEBUG = YES
+#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
+#BINARY =
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
+#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
+
+[core]
+PORT = 2570
+#PREFIX = xterm -e xterm -T CORE -e gdb --args
+#PREFIX = valgrind --tool=memcheck --log-file=logs%p
+#DEBUG = YES
+
+[dv]
+AUTOSTART = YES
+DEBUG = NO
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+BINARY = gnunet-service-dv
+#BINARY =
/root/documents/research/gnunet/gnunet-ng/src/dv/.libs/gnunet-service-dv
+#BINARY =
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/dv/.libs/gnunet-service-dv
+#PREFIX = xterm -T dvservice -e gdb --args
+#PREFIX = valgrind --log-file=dv-%p --leak-check=full
+CONFIG = $DEFAULTCONFIG
+HOME = $SERVICEHOME
+HOSTNAME = localhost
+PORT = 2571
+
+[testing]
+NUM_PEERS = 5
+DEBUG = YES
+WEAKRANDOM = YES
+TOPOLOGY = CLIQUE
+CONNECT_TOPOLOGY = RING
+BLACKLIST_TOPOLOGY = RING
+BLACKLIST_TRANSPORTS = tcp
+F2F = YES
+
+[fs]
+AUTOSTART = NO
+
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r11790 - gnunet/src/dv,
gnunet <=