static enum GNUNET_TESTING_Topology topology;
-static enum GNUNET_TESTING_Topology blacklist_topology = GNUNET_TESTING_TOPOLOGY_NONE; /* Don't do any blacklisting */
+static enum GNUNET_TESTING_Topology blacklist_topology = GNUNET_TESTING_TOPOLOGY_NONE; /* Don't do any blacklisting */
static enum GNUNET_TESTING_Topology connection_topology = GNUNET_TESTING_TOPOLOGY_NONE; /* NONE actually means connect all allowed peers */
-static enum GNUNET_TESTING_TopologyOption connect_topology_option = GNUNET_TESTING_TOPOLOGY_OPTION_ALL;
+static enum GNUNET_TESTING_TopologyOption connect_topology_option =
+ GNUNET_TESTING_TOPOLOGY_OPTION_ALL;
static double connect_topology_option_modifier = 0.0;
/**
* Check whether peers successfully shut down.
*/
-void shutdown_callback (void *cls,
- const char *emsg)
+void
+shutdown_callback (void *cls, const char *emsg)
{
if (emsg != NULL)
{
#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Shutdown of peers failed!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown of peers failed!\n");
#endif
if (ok == 0)
ok = 666;
}
#if DELAY_FOR_LOGGING
-static void gather_log_data ()
+static void
+gather_log_data ()
{
char *peer_number;
char *connect_number;
struct GNUNET_OS_Process *mem_process;
- GNUNET_asprintf(&peer_number, "%llu", num_peers);
- GNUNET_asprintf(&connect_number, "%llu", expected_connections);
+ GNUNET_asprintf (&peer_number, "%llu", num_peers);
+ GNUNET_asprintf (&connect_number, "%llu", expected_connections);
mem_process = GNUNET_OS_start_process (NULL, NULL, "./memsize.pl",
- "memsize.pl", "totals.txt", peer_number, connect_number, NULL);
+ "memsize.pl", "totals.txt",
+ peer_number, connect_number, NULL);
GNUNET_OS_process_wait (mem_process);
GNUNET_OS_process_close (mem_process);
mem_process = NULL;
{
if (pos->peer1handle != NULL)
{
- GNUNET_CORE_disconnect(pos->peer1handle);
+ GNUNET_CORE_disconnect (pos->peer1handle);
pos->peer1handle = NULL;
}
if (pos->peer2handle != NULL)
{
- GNUNET_CORE_disconnect(pos->peer2handle);
+ 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(free_pos->disconnect_task);
+ GNUNET_SCHEDULER_cancel (free_pos->disconnect_task);
}
- GNUNET_free(free_pos);
+ 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);
+ 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
#if VERBOSE
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Calling daemons_stop\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Calling daemons_stop\n");
#endif
GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
if (dotOutFile != NULL)
{
- fprintf(dotOutFile, "}");
- fclose(dotOutFile);
+ fprintf (dotOutFile, "}");
+ fclose (dotOutFile);
}
ok = 0;
static void
-disconnect_cores (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+disconnect_cores (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct TestMessageContext *pos = cls;
/* Disconnect from the respective cores */
#if VERBOSE > 1
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Disconnecting from peer 1 `%4s'\n", GNUNET_i2s (&pos->peer1->id));
+ "Disconnecting from peer 1 `%4s'\n",
+ GNUNET_i2s (&pos->peer1->id));
#endif
if (pos->peer1handle != NULL)
- GNUNET_CORE_disconnect(pos->peer1handle);
+ GNUNET_CORE_disconnect (pos->peer1handle);
#if VERBOSE > 1
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Disconnecting from peer 2 `%4s'\n", GNUNET_i2s (&pos->peer2->id));
+ "Disconnecting from peer 2 `%4s'\n",
+ GNUNET_i2s (&pos->peer2->id));
#endif
if (pos->peer2handle != NULL)
- GNUNET_CORE_disconnect(pos->peer2handle);
+ GNUNET_CORE_disconnect (pos->peer2handle);
/* Set handles to NULL so test case can be ended properly */
pos->peer1handle = NULL;
pos->peer2handle = NULL;
total_server_connections -= 2;
}
-static void stats_finished (void *cls, int result)
+static void
+stats_finished (void *cls, int result)
{
GNUNET_SCHEDULER_add_now (&finish_testing, NULL);
}
* @param is_persistent GNUNET_YES if the value is persistent, GNUNET_NO if not
* @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration
*/
-static int stats_print (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- const char *subsystem,
- const char *name,
- uint64_t value,
- int is_persistent)
+static int
+stats_print (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const char *subsystem,
+ const char *name, uint64_t value, int is_persistent)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "%s:%s:%s -- %llu\n", GNUNET_i2s(peer), subsystem, name, value);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s:%s:%s -- %llu\n",
+ GNUNET_i2s (peer), subsystem, name, value);
return GNUNET_OK;
}
-static void topology_cb (void *cls,
- const struct GNUNET_PeerIdentity *first,
- const struct GNUNET_PeerIdentity *second,
- const char *emsg)
+static void
+topology_cb (void *cls,
+ const struct GNUNET_PeerIdentity *first,
+ const struct GNUNET_PeerIdentity *second, const char *emsg)
{
FILE *outfile = cls;
if (first != NULL)
- {
- if (outfile != NULL)
{
- fprintf(outfile, "\t\"%s\" -- ", GNUNET_i2s(first));
- fprintf(outfile, "\"%s\";\n", GNUNET_i2s(second));
+ if (outfile != NULL)
+ {
+ fprintf (outfile, "\t\"%s\" -- ", GNUNET_i2s (first));
+ fprintf (outfile, "\"%s\";\n", GNUNET_i2s (second));
+ }
+ topology_connections++;
}
- topology_connections++;
- }
else
{
- fprintf(stderr, "Finished iterating over topology, %d total connections!\n", topology_connections);
+ fprintf (stderr,
+ "Finished iterating over topology, %d total connections!\n",
+ topology_connections);
if (outfile != NULL)
- {
- fprintf(outfile, "}\n");
- fclose(outfile);
- GNUNET_TESTING_get_statistics(pg, &stats_finished, &stats_print, NULL);
- //GNUNET_SCHEDULER_add_now (&finish_testing, NULL);
- }
+ {
+ fprintf (outfile, "}\n");
+ fclose (outfile);
+ GNUNET_TESTING_get_statistics (pg, &stats_finished, &stats_print,
+ NULL);
+ //GNUNET_SCHEDULER_add_now (&finish_testing, NULL);
+ }
}
}
process_mtype (void *cls,
const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ const struct GNUNET_TRANSPORT_ATS_Information *atsi)
{
char *dotOutFileNameFinished;
FILE *dotOutFileFinished;
struct TestMessageContext *pos = cls;
- struct GNUNET_TestMessage *msg = (struct GNUNET_TestMessage *)message;
- if (pos->uid != ntohl(msg->uid))
+ struct GNUNET_TestMessage *msg = (struct GNUNET_TestMessage *) message;
+ if (pos->uid != ntohl (msg->uid))
return GNUNET_OK;
#if VERBOSE
- if ((total_messages_received) % modnum == 0)
- {
- if (total_messages_received == 0)
- fprintf (stdout, "0%%");
- else
- fprintf (stdout, "%d%%",
- (int) (((float) total_messages_received /
- expected_messages) * 100));
-
- }
- else if (total_messages_received % dotnum == 0)
- {
- fprintf (stdout, ".");
- }
- fflush (stdout);
+ if ((total_messages_received) % modnum == 0)
+ {
+ if (total_messages_received == 0)
+ fprintf (stdout, "0%%");
+ else
+ fprintf (stdout, "%d%%",
+ (int) (((float) total_messages_received /
+ expected_messages) * 100));
+
+ }
+ else if (total_messages_received % dotnum == 0)
+ {
+ fprintf (stdout, ".");
+ }
+ fflush (stdout);
#endif
total_messages_received++;
#if VERBOSE > 1
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received message from `%4s', type %d.\n", GNUNET_i2s (peer), ntohs(message->type));
+ "Received message from `%4s', type %d.\n", GNUNET_i2s (peer),
+ ntohs (message->type));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Total messages received %d, expected %d.\n", total_messages_received, expected_messages);
+ "Total messages received %d, expected %d.\n",
+ total_messages_received, expected_messages);
#endif
if (total_messages_received == expected_messages)
{
#if VERBOSE
- fprintf(stdout, "100%%]\n");
+ fprintf (stdout, "100%%]\n");
#endif
GNUNET_SCHEDULER_cancel (die_task);
- GNUNET_asprintf(&dotOutFileNameFinished, "%s.dot", "final_topology");
+ GNUNET_asprintf (&dotOutFileNameFinished, "%s.dot", "final_topology");
dotOutFileFinished = fopen (dotOutFileNameFinished, "w");
- GNUNET_free(dotOutFileNameFinished);
+ GNUNET_free (dotOutFileNameFinished);
if (dotOutFileFinished != NULL)
- {
- fprintf(dotOutFileFinished, "strict graph G {\n");
- }
+ {
+ fprintf (dotOutFileFinished, "strict graph G {\n");
+ }
topology_connections = 0;
GNUNET_TESTING_get_topology (pg, &topology_cb, dotOutFileFinished);
//GNUNET_SCHEDULER_add_now (&finish_testing, NULL);
}
else
{
- pos->disconnect_task = GNUNET_SCHEDULER_add_now(&disconnect_cores, pos);
+ pos->disconnect_task =
+ GNUNET_SCHEDULER_add_now (&disconnect_cores, pos);
}
return GNUNET_OK;
}
static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
char *msg = cls;
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
{
if (pos->peer1handle != NULL)
{
- GNUNET_CORE_disconnect(pos->peer1handle);
+ GNUNET_CORE_disconnect (pos->peer1handle);
pos->peer1handle = NULL;
}
if (pos->peer2handle != NULL)
{
- GNUNET_CORE_disconnect(pos->peer2handle);
+ GNUNET_CORE_disconnect (pos->peer2handle);
pos->peer2handle = NULL;
}
free_pos = pos;
pos = pos->next;
- GNUNET_free(free_pos);
+ 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);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Total messages received %d, expected %d.\n", total_messages_received, expected_messages);
+ 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);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Total messages received %d, expected %d.\n",
+ total_messages_received, expected_messages);
#endif
if (pg != NULL)
if (dotOutFile != NULL)
{
- fprintf(dotOutFile, "}");
- fclose(dotOutFile);
+ fprintf (dotOutFile, "}");
+ fclose (dotOutFile);
}
}
m = (struct GNUNET_TestMessage *) buf;
m->header.type = htons (MTYPE);
m->header.size = htons (sizeof (struct GNUNET_TestMessage));
- m->uid = htonl(pos->uid);
+ m->uid = htonl (pos->uid);
transmit_ready_called++;
#if VERBOSE > 1
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);
+ "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 void
init_notify_peer2 (void *cls,
- struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+ struct GNUNET_CORE_Handle *server,
+ const struct GNUNET_PeerIdentity *my_identity,
+ const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded
+ *publicKey)
{
struct TestMessageContext *pos = cls;
0,
TIMEOUT,
&pos->peer2->id,
- sizeof (struct GNUNET_TestMessage),
+ sizeof (struct
+ GNUNET_TestMessage),
&transmit_ready, pos))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
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 GNUNET_CORE_Handle *server,
+ const struct GNUNET_PeerIdentity *my_identity,
+ const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded
+ *publicKey)
{
struct TestMessageContext *pos = cls;
total_server_connections++;
* Connect to the receiving peer
*/
pos->peer2handle = GNUNET_CORE_connect (pos->peer2->cfg,
- 1,
- pos,
- &init_notify_peer2,
- NULL,
- NULL,
- NULL, NULL,
- GNUNET_YES, NULL, GNUNET_YES, handlers);
+ 1,
+ pos,
+ &init_notify_peer2,
+ NULL,
+ NULL,
+ NULL, NULL,
+ GNUNET_YES, NULL, GNUNET_YES,
+ handlers);
}
static void
-send_test_messages (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+send_test_messages (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct TestMessageContext *pos = cls;
if (die_task == GNUNET_SCHEDULER_NO_TASK)
{
die_task = GNUNET_SCHEDULER_add_delayed (TEST_TIMEOUT,
- &end_badly, "from send test messages (timeout)");
+ &end_badly,
+ "from send test messages (timeout)");
}
if (total_server_connections >= MAX_OUTSTANDING_CONNECTIONS)
{
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1),
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 1),
&send_test_messages, pos);
- return; /* Otherwise we'll double schedule messages here! */
+ return; /* Otherwise we'll double schedule messages here! */
}
/*
* Connect to the sending peer
*/
pos->peer1handle = GNUNET_CORE_connect (pos->peer1->cfg,
- 1,
+ 1,
pos,
&init_notify_peer1,
NULL, NULL,
NULL,
NULL,
- GNUNET_NO, NULL, GNUNET_NO, no_handlers);
+ GNUNET_NO, NULL, GNUNET_NO,
+ no_handlers);
- GNUNET_assert(pos->peer1handle != NULL);
+ GNUNET_assert (pos->peer1handle != NULL);
if (total_server_connections < MAX_OUTSTANDING_CONNECTIONS)
{
}
else
{
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1),
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 1),
&send_test_messages, pos->next);
}
}
if (emsg == NULL)
{
#if VERBOSE
- if ((total_connections) % modnum == 0)
- {
- if (total_connections == 0)
- fprintf (stdout, "0%%");
- else
- fprintf (stdout, "%d%%",
- (int) (((float) total_connections /
- expected_connections) * 100));
-
- }
- else if (total_connections % dotnum == 0)
- {
- fprintf (stdout, ".");
- }
- fflush (stdout);
+ if ((total_connections) % modnum == 0)
+ {
+ if (total_connections == 0)
+ fprintf (stdout, "0%%");
+ else
+ fprintf (stdout, "%d%%",
+ (int) (((float) total_connections /
+ expected_connections) * 100));
+
+ }
+ else if (total_connections % dotnum == 0)
+ {
+ fprintf (stdout, ".");
+ }
+ fflush (stdout);
#endif
total_connections++;
#if VERBOSE > 1
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "connected peer %s to peer %s\n",
- first_daemon->shortname,
- second_daemon->shortname);
+ first_daemon->shortname, second_daemon->shortname);
#endif
- temp_context = GNUNET_malloc(sizeof(struct TestMessageContext));
+ temp_context = GNUNET_malloc (sizeof (struct TestMessageContext));
temp_context->peer1 = first_daemon;
temp_context->peer2 = second_daemon;
temp_context->next = test_messages;
expected_messages++;
if (dotOutFile != NULL)
- fprintf(dotOutFile, "\tn%s -- n%s;\n", first_daemon->shortname, second_daemon->shortname);
+ 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);
+ 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
- fprintf(stdout, "100%%]\n");
+ fprintf (stdout, "100%%]\n");
#endif
#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_NO_TASK;
#if DELAY_FOR_LOGGING
- fprintf(stdout, "Sending test messages in 10 seconds.\n");
+ fprintf (stdout, "Sending test messages in 10 seconds.\n");
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 10),
&send_test_messages, test_messages);
- gather_log_data();
+ gather_log_data ();
#else
if (settle_time.rel_value > 0)
{
GNUNET_TESTING_get_topology (pg, &topology_cb, NULL);
}
- GNUNET_SCHEDULER_add_delayed (settle_time, &send_test_messages, test_messages);
+ GNUNET_SCHEDULER_add_delayed (settle_time, &send_test_messages,
+ test_messages);
#endif
#if VERBOSE
- fprintf(stdout, "Test message progress: [");
+ fprintf (stdout, "Test message progress: [");
#endif
}
else if (total_connections + failed_connections == expected_connections)
{
- if (failed_connections < (unsigned int)(fail_percentage * total_connections))
+ if (failed_connections <
+ (unsigned int) (fail_percentage * total_connections))
{
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_NO_TASK;
else
{
GNUNET_SCHEDULER_cancel (die_task);
- die_task = GNUNET_SCHEDULER_add_now (&end_badly, "from topology_callback (too many failed connections)");
+ die_task =
+ GNUNET_SCHEDULER_add_now (&end_badly,
+ "from topology_callback (too many failed connections)");
}
}
else
#if VERBOSE > 1
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));
+ total_connections, failed_connections, expected_connections,
+ expected_connections -
+ (unsigned int) (fail_percentage * expected_connections));
#endif
}
}
-static void topology_creation_finished (void *cls,
- const char *emsg)
+static void
+topology_creation_finished (void *cls, const char *emsg)
{
#if VERBOSE
if (emsg == NULL)
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "All topology connections created successfully!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "All topology connections created successfully!\n");
#endif
}
expected_connections = -1;
if ((pg != NULL) && (peers_left == 0))
{
- expected_connections = GNUNET_TESTING_connect_topology (pg, connection_topology, connect_topology_option, connect_topology_option_modifier, &topology_creation_finished, NULL);
+ expected_connections =
+ GNUNET_TESTING_connect_topology (pg, connection_topology,
+ connect_topology_option,
+ connect_topology_option_modifier,
+ &topology_creation_finished, NULL);
#if VERBOSE > 1
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Have %d expected connections\n", expected_connections);
GNUNET_SCHEDULER_cancel (die_task);
if (expected_connections == GNUNET_SYSERR)
{
- die_task = GNUNET_SCHEDULER_add_now (&end_badly, "from connect topology (bad return)");
+ die_task =
+ GNUNET_SCHEDULER_add_now (&end_badly,
+ "from connect topology (bad return)");
}
die_task = GNUNET_SCHEDULER_add_delayed (TEST_TIMEOUT,
- &end_badly, "from connect topology (timeout)");
+ &end_badly,
+ "from connect topology (timeout)");
modnum = expected_connections / 4;
dotnum = (expected_connections / 50) + 1;
#if VERBOSE
- fprintf(stdout, "Peer connection progress: [");
+ fprintf (stdout, "Peer connection progress: [");
#endif
}
static void
create_topology ()
{
- peers_left = num_peers; /* Reset counter */
- if (GNUNET_TESTING_create_topology (pg, topology, blacklist_topology, blacklist_transports) != GNUNET_SYSERR)
+ peers_left = num_peers; /* Reset counter */
+ if (GNUNET_TESTING_create_topology
+ (pg, topology, blacklist_topology,
+ blacklist_transports) != GNUNET_SYSERR)
{
#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Topology set up, now starting peers!\n");
- fprintf(stdout, "Daemon start progress [");
+ fprintf (stdout, "Daemon start progress [");
#endif
- GNUNET_TESTING_daemons_continue_startup(pg);
+ GNUNET_TESTING_daemons_continue_startup (pg);
}
else
{
GNUNET_SCHEDULER_cancel (die_task);
- die_task = GNUNET_SCHEDULER_add_now (&end_badly, "from create topology (bad return)");
+ die_task =
+ GNUNET_SCHEDULER_add_now (&end_badly,
+ "from create topology (bad return)");
}
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_add_delayed (TEST_TIMEOUT,
- &end_badly, "from continue startup (timeout)");
+ &end_badly,
+ "from continue startup (timeout)");
}
static void
peers_started_callback (void *cls,
- const struct GNUNET_PeerIdentity *id,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TESTING_Daemon *d, const char *emsg)
+ const struct GNUNET_PeerIdentity *id,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_Daemon *d, const char *emsg)
{
if (emsg != NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Failed to start daemon with error: `%s'\n",
- emsg);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Failed to start daemon with error: `%s'\n", emsg);
return;
}
GNUNET_assert (id != NULL);
(num_peers - peers_left) + 1, num_peers);
#endif
#if VERBOSE
- if ((num_peers - peers_left) % modnum == 0)
- {
- if (num_peers - peers_left == 0)
- fprintf (stdout, "0%%");
- else
- fprintf (stdout, "%d%%",
- (int) (((float) (num_peers - peers_left) /
- num_peers) * 100));
-
- }
- else if ((num_peers - peers_left) % dotnum == 0)
- {
- fprintf (stdout, ".");
- }
- fflush (stdout);
+ if ((num_peers - peers_left) % modnum == 0)
+ {
+ if (num_peers - peers_left == 0)
+ fprintf (stdout, "0%%");
+ else
+ fprintf (stdout, "%d%%",
+ (int) (((float) (num_peers - peers_left) /
+ num_peers) * 100));
+
+ }
+ else if ((num_peers - peers_left) % dotnum == 0)
+ {
+ fprintf (stdout, ".");
+ }
+ fflush (stdout);
#endif
peers_left--;
if (peers_left == 0)
{
#if VERBOSE
- fprintf(stdout, "100%%]\n");
+ fprintf (stdout, "100%%]\n");
#endif
#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
* within a reasonable amount of time */
die_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_MINUTES, 8),
- &end_badly, "from peers_started_callback");
+ &end_badly,
+ "from peers_started_callback");
#if DELAY_FOR_LOGGING
- fprintf(stdout, "Connecting topology in 10 seconds\n");
- gather_log_data();
+ fprintf (stdout, "Connecting topology in 10 seconds\n");
+ gather_log_data ();
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 10),
&connect_topology, NULL);
* @param d the daemon handle (pretty useless at this point, remove?)
* @param emsg non-null on failure
*/
-void hostkey_callback (void *cls,
- const struct GNUNET_PeerIdentity *id,
- struct GNUNET_TESTING_Daemon *d,
- const char *emsg)
+void
+hostkey_callback (void *cls,
+ const struct GNUNET_PeerIdentity *id,
+ struct GNUNET_TESTING_Daemon *d, const char *emsg)
{
if (emsg != NULL)
{
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Hostkey callback received error: %s\n", emsg);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Hostkey callback received error: %s\n", emsg);
}
#if VERBOSE > 1
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Hostkey (%d/%d) created for peer `%s'\n",
- num_peers - peers_left, num_peers, GNUNET_i2s(id));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Hostkey (%d/%d) created for peer `%s'\n",
+ num_peers - peers_left, num_peers, GNUNET_i2s (id));
#endif
#if VERBOSE
- if ((num_peers - peers_left) % modnum == 0)
- {
- if (num_peers - peers_left == 0)
- fprintf (stdout, "0%%");
- else
- fprintf (stdout, "%d%%",
- (int) (((float) (num_peers - peers_left) /
- num_peers) * 100));
-
- }
- else if ((num_peers - peers_left) % dotnum == 0)
- {
- fprintf (stdout, ".");
- }
- fflush (stdout);
+ if ((num_peers - peers_left) % modnum == 0)
+ {
+ if (num_peers - peers_left == 0)
+ fprintf (stdout, "0%%");
+ else
+ fprintf (stdout, "%d%%",
+ (int) (((float) (num_peers - peers_left) /
+ num_peers) * 100));
+
+ }
+ else if ((num_peers - peers_left) % dotnum == 0)
+ {
+ fprintf (stdout, ".");
+ }
+ fflush (stdout);
#endif
- peers_left--;
- if (peers_left == 0)
- {
+ peers_left--;
+ if (peers_left == 0)
+ {
#if VERBOSE
- fprintf(stdout, "100%%]\n");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "All %d hostkeys created, now creating topology!\n",
- num_peers);
+ fprintf (stdout, "100%%]\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "All %d hostkeys created, now creating topology!\n",
+ num_peers);
#endif
- GNUNET_SCHEDULER_cancel (die_task);
- /* Set up task in case topology creation doesn't finish
- * within a reasonable amount of time */
- die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
- &end_badly, "from create_topology");
- GNUNET_SCHEDULER_add_now(&create_topology, NULL);
- ok = 0;
- }
+ GNUNET_SCHEDULER_cancel (die_task);
+ /* Set up task in case topology creation doesn't finish
+ * within a reasonable amount of time */
+ die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+ &end_badly,
+ "from create_topology");
+ GNUNET_SCHEDULER_add_now (&create_topology, NULL);
+ ok = 0;
+ }
}
static void
char *const *args,
const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- char * topology_str;
- char * connect_topology_str;
- char * blacklist_topology_str;
- char * connect_topology_option_str;
- char * connect_topology_option_modifier_string;
+ char *topology_str;
+ char *connect_topology_str;
+ char *blacklist_topology_str;
+ char *connect_topology_option_str;
+ char *connect_topology_option_modifier_string;
unsigned long long temp_settle;
ok = 1;
"Starting daemons based on config file %s\n", cfgfile);
#endif
- if (GNUNET_YES != GNUNET_CONFIGURATION_get_value_string(cfg, "paths", "servicehome", &test_directory))
+ if (GNUNET_YES !=
+ GNUNET_CONFIGURATION_get_value_string (cfg, "paths", "servicehome",
+ &test_directory))
{
ok = 404;
return;
}
if ((GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_string(cfg, "testing", "topology",
- &topology_str)) && (GNUNET_NO == GNUNET_TESTING_topology_get(&topology, topology_str)))
+ GNUNET_CONFIGURATION_get_value_string (cfg, "testing", "topology",
+ &topology_str))
+ && (GNUNET_NO == GNUNET_TESTING_topology_get (&topology, topology_str)))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Invalid topology `%s' given for section %s option %s\n", topology_str, "TESTING", "TOPOLOGY");
- topology = GNUNET_TESTING_TOPOLOGY_CLIQUE; /* Defaults to NONE, so set better default here */
+ "Invalid topology `%s' given for section %s option %s\n",
+ topology_str, "TESTING", "TOPOLOGY");
+ topology = GNUNET_TESTING_TOPOLOGY_CLIQUE; /* Defaults to NONE, so set better default here */
}
if ((GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_string(cfg, "testing", "connect_topology",
- &connect_topology_str)) && (GNUNET_NO == GNUNET_TESTING_topology_get(&connection_topology, connect_topology_str)))
+ GNUNET_CONFIGURATION_get_value_string (cfg, "testing",
+ "connect_topology",
+ &connect_topology_str))
+ && (GNUNET_NO ==
+ GNUNET_TESTING_topology_get (&connection_topology,
+ connect_topology_str)))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Invalid connect topology `%s' given for section %s option %s\n", connect_topology_str, "TESTING", "CONNECT_TOPOLOGY");
+ "Invalid connect topology `%s' given for section %s option %s\n",
+ connect_topology_str, "TESTING", "CONNECT_TOPOLOGY");
}
- GNUNET_free_non_null(connect_topology_str);
+ GNUNET_free_non_null (connect_topology_str);
if ((GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_string(cfg, "testing", "connect_topology_option",
- &connect_topology_option_str)) && (GNUNET_NO == GNUNET_TESTING_topology_option_get(&connect_topology_option, connect_topology_option_str)))
+ GNUNET_CONFIGURATION_get_value_string (cfg, "testing",
+ "connect_topology_option",
+ &connect_topology_option_str))
+ && (GNUNET_NO ==
+ GNUNET_TESTING_topology_option_get (&connect_topology_option,
+ connect_topology_option_str)))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Invalid connect topology option `%s' given for section %s option %s\n", connect_topology_option_str, "TESTING", "CONNECT_TOPOLOGY_OPTION");
- connect_topology_option = GNUNET_TESTING_TOPOLOGY_OPTION_ALL; /* Defaults to NONE, set to ALL */
+ "Invalid connect topology option `%s' given for section %s option %s\n",
+ connect_topology_option_str, "TESTING",
+ "CONNECT_TOPOLOGY_OPTION");
+ connect_topology_option = GNUNET_TESTING_TOPOLOGY_OPTION_ALL; /* Defaults to NONE, set to ALL */
}
- GNUNET_free_non_null(connect_topology_option_str);
+ GNUNET_free_non_null (connect_topology_option_str);
if (GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_string (cfg, "testing", "connect_topology_option_modifier",
- &connect_topology_option_modifier_string))
+ GNUNET_CONFIGURATION_get_value_string (cfg, "testing",
+ "connect_topology_option_modifier",
+ &connect_topology_option_modifier_string))
{
- if (sscanf(connect_topology_option_modifier_string, "%lf", &connect_topology_option_modifier) != 1)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Invalid value `%s' for option `%s' in section `%s': expected float\n"),
- connect_topology_option_modifier_string,
- "connect_topology_option_modifier",
- "TESTING");
- }
+ if (sscanf
+ (connect_topology_option_modifier_string, "%lf",
+ &connect_topology_option_modifier) != 1)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _
+ ("Invalid value `%s' for option `%s' in section `%s': expected float\n"),
+ connect_topology_option_modifier_string,
+ "connect_topology_option_modifier", "TESTING");
+ }
GNUNET_free (connect_topology_option_modifier_string);
}
- if (GNUNET_YES != GNUNET_CONFIGURATION_get_value_string (cfg, "testing", "blacklist_transports",
- &blacklist_transports))
+ if (GNUNET_YES !=
+ GNUNET_CONFIGURATION_get_value_string (cfg, "testing",
+ "blacklist_transports",
+ &blacklist_transports))
blacklist_transports = NULL;
if ((GNUNET_YES ==
- GNUNET_CONFIGURATION_get_value_string(cfg, "testing", "blacklist_topology",
- &blacklist_topology_str)) && (GNUNET_NO == GNUNET_TESTING_topology_get(&blacklist_topology, blacklist_topology_str)))
+ GNUNET_CONFIGURATION_get_value_string (cfg, "testing",
+ "blacklist_topology",
+ &blacklist_topology_str))
+ && (GNUNET_NO ==
+ GNUNET_TESTING_topology_get (&blacklist_topology,
+ blacklist_topology_str)))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Invalid topology `%s' given for section %s option %s\n", topology_str, "TESTING", "BLACKLIST_TOPOLOGY");
+ "Invalid topology `%s' given for section %s option %s\n",
+ topology_str, "TESTING", "BLACKLIST_TOPOLOGY");
}
- GNUNET_free_non_null(topology_str);
- GNUNET_free_non_null(blacklist_topology_str);
+ GNUNET_free_non_null (topology_str);
+ GNUNET_free_non_null (blacklist_topology_str);
if (GNUNET_OK ==
GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "settle_time",
&temp_settle))
- settle_time = GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, temp_settle);
+ settle_time =
+ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_settle);
if (GNUNET_SYSERR ==
GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "num_peers",
fprintf (stdout, "Hostkey generation progress: [");
#endif
/* Set up a task to end testing if peer start fails */
- die_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, SECONDS_PER_PEER_START * num_peers),
- &end_badly, "didn't generate all hostkeys within a reasonable amount of time!!!");
-
- GNUNET_assert(num_peers > 0 && num_peers < (unsigned int)-1);
+ die_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS,
+ SECONDS_PER_PEER_START * num_peers),
+ &end_badly,
+ "didn't generate all hostkeys within a reasonable amount of time!!!");
+
+ GNUNET_assert (num_peers > 0 && num_peers < (unsigned int) -1);
pg = GNUNET_TESTING_daemons_start (cfg,
- peers_left, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, SECONDS_PER_PEER_START * num_peers), &hostkey_callback, NULL, &peers_started_callback, NULL,
+ peers_left,
+ GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS,
+ SECONDS_PER_PEER_START * num_peers),
+ &hostkey_callback, NULL,
+ &peers_started_callback, NULL,
&topology_callback, NULL, NULL);
}
{
char *binary_name;
char *config_file_name;
- GNUNET_asprintf(&binary_name, "test-testing-topology-%s", topology_string);
- GNUNET_asprintf(&config_file_name, "test_testing_data_topology_%s.conf", topology_string);
+ GNUNET_asprintf (&binary_name, "test-testing-topology-%s", topology_string);
+ GNUNET_asprintf (&config_file_name, "test_testing_data_topology_%s.conf",
+ topology_string);
int ret;
- char *const argv[] = {binary_name,
+ char *const argv[] = { binary_name,
"-c",
config_file_name,
#if VERBOSE
GNUNET_GETOPT_OPTION_END
};
ret = GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
- argv, binary_name, "nohelp",
- options, &run, &ok);
+ argv, binary_name, "nohelp", options, &run, &ok);
if (ret != GNUNET_OK)
{
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "`test-testing-topology-%s': Failed with error code %d\n", topology_string, ret);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "`test-testing-topology-%s': Failed with error code %d\n",
+ topology_string, ret);
}
- GNUNET_free(binary_name);
- GNUNET_free(config_file_name);
+ GNUNET_free (binary_name);
+ GNUNET_free (config_file_name);
return ok;
}
char *binary_start_pos;
char *our_binary_name;
- binary_start_pos = rindex(argv[0], '/');
- GNUNET_assert(binary_start_pos != NULL);
- topology_string = strstr (binary_start_pos,
- "_topology");
+ binary_start_pos = rindex (argv[0], '/');
+ GNUNET_assert (binary_start_pos != NULL);
+ topology_string = strstr (binary_start_pos, "_topology");
GNUNET_assert (topology_string != NULL);
topology_string++;
topology_string = strstr (topology_string, "_");
GNUNET_assert (topology_string != NULL);
topology_string++;
- GNUNET_asprintf(&our_binary_name, "test-testing-topology_%s", topology_string);
- GNUNET_asprintf(&dotOutFileName, "topology_%s.dot", topology_string);
+ GNUNET_asprintf (&our_binary_name, "test-testing-topology_%s",
+ topology_string);
+ GNUNET_asprintf (&dotOutFileName, "topology_%s.dot", topology_string);
GNUNET_log_setup (our_binary_name,
#if VERBOSE
*/
if (GNUNET_DISK_directory_remove (test_directory) != GNUNET_OK)
{
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Failed to remove testing directory %s\n", test_directory);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Failed to remove testing directory %s\n", test_directory);
}
- GNUNET_free(our_binary_name);
+ GNUNET_free (our_binary_name);
return ret;
}
#include "gnunet_transport_service.h"
#include "gnunet_hello_lib.h"
-#define DEBUG_TESTING GNUNET_NO
-#define DEBUG_TESTING_RECONNECT GNUNET_NO
+#define DEBUG_TESTING GNUNET_YES
+#define DEBUG_TESTING_RECONNECT GNUNET_YES
/**
* How long do we wait after starting gnunet-service-arm
if (daemon->server != NULL)
{
- GNUNET_CORE_disconnect(daemon->server);
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s' from transport service of `%4s', disconnecting core!\n",
+ "HELLO", GNUNET_i2s (&daemon->id));
+#endif
+ GNUNET_CORE_disconnect (daemon->server);
daemon->server = NULL;
}
GNUNET_assert (message != NULL);
- msize = ntohs(message->size);
+ msize = ntohs (message->size);
if (msize < 1)
{
return;
}
if (daemon->th != NULL)
{
- GNUNET_TRANSPORT_get_hello_cancel(daemon->th, &process_hello, daemon);
+ GNUNET_TRANSPORT_get_hello_cancel (daemon->th, &process_hello, daemon);
}
#if DEBUG_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"HELLO", GNUNET_i2s (&daemon->id));
#endif
+ GNUNET_free_non_null (daemon->hello);
+ daemon->hello = GNUNET_malloc (msize);
+ memcpy (daemon->hello, message, msize);
-
+ if (daemon->th != NULL)
{
- GNUNET_free_non_null(daemon->hello);
- daemon->hello = GNUNET_malloc(msize);
- memcpy(daemon->hello, message, msize);
-
- if (daemon->th != NULL)
- {
- GNUNET_TRANSPORT_disconnect(daemon->th);
- daemon->th = NULL;
- }
+ GNUNET_TRANSPORT_disconnect (daemon->th);
+ daemon->th = NULL;
}
}
{
d->server = NULL;
if (GNUNET_YES == d->dead)
- GNUNET_TESTING_daemon_stop (d, GNUNET_TIME_absolute_get_remaining(d->max_timeout), d->dead_cb, d->dead_cb_cls, GNUNET_YES, GNUNET_NO);
+ GNUNET_TESTING_daemon_stop (d,
+ GNUNET_TIME_absolute_get_remaining
+ (d->max_timeout), d->dead_cb,
+ d->dead_cb_cls, GNUNET_YES, GNUNET_NO);
else if (NULL != cb)
cb (d->cb_cls, NULL, d->cfg, d,
_("Failed to connect to core service\n"));
d->shortname = strdup (GNUNET_i2s (my_identity));
d->server = server;
d->running = GNUNET_YES;
- if (GNUNET_YES == d->dead)
- GNUNET_TESTING_daemon_stop (d, GNUNET_TIME_absolute_get_remaining(d->max_timeout), d->dead_cb, d->dead_cb_cls, GNUNET_YES, GNUNET_NO);
- else if (NULL != cb)
+
+ if (NULL != cb) /* FIXME: what happens when this callback calls GNUNET_TESTING_daemon_stop? */
cb (d->cb_cls, my_identity, d->cfg, d, NULL);
+
+ if (GNUNET_NO == d->running)
+ {
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer is dead (d->running == GNUNET_NO)\n");
+#endif
+ return;
+ }
#if DEBUG_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Successfully started peer `%4s'.\n", GNUNET_i2s (my_identity));
+ "Successfully started peer `%4s', connecting to transport service.\n",
+ GNUNET_i2s (my_identity));
#endif
-
- d->th = GNUNET_TRANSPORT_connect (d->cfg,
- &d->id,
- d, NULL, NULL, NULL);
+ d->th = GNUNET_TRANSPORT_connect (d->cfg, &d->id, d, NULL, NULL, NULL);
if (d->th == NULL)
{
if (GNUNET_YES == d->dead)
- GNUNET_TESTING_daemon_stop (d, GNUNET_TIME_absolute_get_remaining(d->max_timeout), d->dead_cb, d->dead_cb_cls, GNUNET_YES, GNUNET_NO);
+ GNUNET_TESTING_daemon_stop (d,
+ GNUNET_TIME_absolute_get_remaining
+ (d->max_timeout), d->dead_cb,
+ d->dead_cb_cls, GNUNET_YES, GNUNET_NO);
else if (NULL != d->cb)
d->cb (d->cb_cls, &d->id, d->cfg, d,
- _("Failed to connect to transport service!\n"));
+ _("Failed to connect to transport service!\n"));
return;
}
+#if DEBUG_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Connected to transport service `%s', getting HELLO\n",
+ GNUNET_i2s (my_identity));
+#endif
GNUNET_TRANSPORT_get_hello (d->th, &process_hello, d);
}
* @param tc unused
*/
static void
-start_fsm (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+start_fsm (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_TESTING_Daemon *d = cls;
GNUNET_TESTING_NotifyDaemonRunning cb;
/* confirm copying complete */
if (GNUNET_OK != GNUNET_OS_process_status (d->proc, &type, &code))
{
- if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).rel_value == 0)
+ if (GNUNET_TIME_absolute_get_remaining (d->max_timeout).rel_value ==
+ 0)
{
cb = d->cb;
d->cb = NULL;
if (NULL != cb)
cb (d->cb_cls,
NULL,
- d->cfg, d, _("`scp' does not seem to terminate (timeout copying config).\n"));
+ d->cfg, d,
+ _
+ ("`scp' does not seem to terminate (timeout copying config).\n"));
return;
}
/* wait some more */
"gnunet-peerinfo", "gnunet-peerinfo", "-c", d->cfgfile,
"-sq");
#endif
- d->proc = GNUNET_OS_start_process (NULL, d->pipe_stdout, "gnunet-peerinfo",
- "gnunet-peerinfo",
- "-c", d->cfgfile,
- "-sq", NULL);
- GNUNET_DISK_pipe_close_end(d->pipe_stdout, GNUNET_DISK_PIPE_END_WRITE);
+ d->proc =
+ GNUNET_OS_start_process (NULL, d->pipe_stdout, "gnunet-peerinfo",
+ "gnunet-peerinfo", "-c", d->cfgfile,
+ "-sq", NULL);
+ GNUNET_DISK_pipe_close_end (d->pipe_stdout,
+ GNUNET_DISK_PIPE_END_WRITE);
}
else
{
#if DEBUG_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Starting `%s', with command `%s %s %s %s %s %s'.\n",
- "gnunet-peerinfo", "ssh", dst, "gnunet-peerinfo", "-c", d->cfgfile,
- "-sq");
+ "gnunet-peerinfo", "ssh", dst, "gnunet-peerinfo", "-c",
+ d->cfgfile, "-sq");
#endif
if (d->ssh_port_str == NULL)
{
d->proc = GNUNET_OS_start_process (NULL, d->pipe_stdout, "ssh",
- "ssh",
+ "ssh",
#if !DEBUG_TESTING
- "-q",
+ "-q",
#endif
- dst,
- "gnunet-peerinfo",
- "-c", d->cfgfile, "-sq", NULL);
+ dst,
+ "gnunet-peerinfo",
+ "-c", d->cfgfile, "-sq",
+ NULL);
}
else
{
d->proc = GNUNET_OS_start_process (NULL, d->pipe_stdout, "ssh",
- "ssh", "-p", d->ssh_port_str,
+ "ssh", "-p", d->ssh_port_str,
#if !DEBUG_TESTING
- "-q",
+ "-q",
#endif
- dst,
- "gnunet-peerinfo",
- "-c", d->cfgfile, "-sq", NULL);
+ dst,
+ "gnunet-peerinfo",
+ "-c", d->cfgfile, "-sq",
+ NULL);
}
- GNUNET_DISK_pipe_close_end(d->pipe_stdout, GNUNET_DISK_PIPE_END_WRITE);
+ GNUNET_DISK_pipe_close_end (d->pipe_stdout,
+ GNUNET_DISK_PIPE_END_WRITE);
GNUNET_free (dst);
}
if (NULL == d->proc)
(NULL == d->hostname)
? _("Failed to start `gnunet-peerinfo' process.\n")
: _("Failed to start `ssh' process.\n"));
- GNUNET_DISK_pipe_close(d->pipe_stdout);
+ GNUNET_DISK_pipe_close (d->pipe_stdout);
return;
}
#if DEBUG_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Started `%s', waiting for hostkey.\n",
- "gnunet-peerinfo");
+ "Started `%s', waiting for hostkey.\n", "gnunet-peerinfo");
#endif
d->phase = SP_HOSTKEY_CREATE;
d->task
- = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_absolute_get_remaining(d->max_timeout),
- GNUNET_DISK_pipe_handle(d->pipe_stdout,
- GNUNET_DISK_PIPE_END_READ),
- &start_fsm,
- d);
+ =
+ GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_absolute_get_remaining
+ (d->max_timeout),
+ GNUNET_DISK_pipe_handle
+ (d->pipe_stdout,
+ GNUNET_DISK_PIPE_END_READ),
+ &start_fsm, d);
break;
case SP_HOSTKEY_CREATE:
- bytes_read = GNUNET_DISK_file_read(GNUNET_DISK_pipe_handle(d->pipe_stdout,
- GNUNET_DISK_PIPE_END_READ),
- &d->hostkeybuf[d->hostkeybufpos],
- sizeof(d->hostkeybuf) - d->hostkeybufpos);
+ bytes_read =
+ GNUNET_DISK_file_read (GNUNET_DISK_pipe_handle
+ (d->pipe_stdout, GNUNET_DISK_PIPE_END_READ),
+ &d->hostkeybuf[d->hostkeybufpos],
+ sizeof (d->hostkeybuf) - d->hostkeybufpos);
if (bytes_read > 0)
- d->hostkeybufpos += bytes_read;
+ d->hostkeybufpos += bytes_read;
- if ( (d->hostkeybufpos < 104) &&
- (bytes_read > 0) )
- {
- /* keep reading */
+ if ((d->hostkeybufpos < 104) && (bytes_read > 0))
+ {
+ /* keep reading */
d->task
- = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_absolute_get_remaining(d->max_timeout),
- GNUNET_DISK_pipe_handle(d->pipe_stdout,
- GNUNET_DISK_PIPE_END_READ),
- &start_fsm,
- d);
+ =
+ GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_absolute_get_remaining
+ (d->max_timeout),
+ GNUNET_DISK_pipe_handle
+ (d->pipe_stdout,
+ GNUNET_DISK_PIPE_END_READ),
+ &start_fsm, d);
return;
- }
+ }
d->hostkeybuf[103] = '\0';
- if ( (bytes_read < 0) ||
- (GNUNET_OK != GNUNET_CRYPTO_hash_from_string (d->hostkeybuf,
- &d->id.hashPubKey)) )
- {
- /* error */
- if (bytes_read < 0)
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
- _("Error reading from gnunet-peerinfo: %s\n"),
- STRERROR (errno));
- else
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
- _("Malformed output from gnunet-peerinfo!\n"));
+ if ((bytes_read < 0) ||
+ (GNUNET_OK != GNUNET_CRYPTO_hash_from_string (d->hostkeybuf,
+ &d->id.hashPubKey)))
+ {
+ /* error */
+ if (bytes_read < 0)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Error reading from gnunet-peerinfo: %s\n"),
+ STRERROR (errno));
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Malformed output from gnunet-peerinfo!\n"));
cb = d->cb;
d->cb = NULL;
- GNUNET_DISK_pipe_close(d->pipe_stdout);
- d->pipe_stdout = NULL;
- (void) GNUNET_OS_process_kill (d->proc, SIGKILL);
- GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (d->proc));
- GNUNET_OS_process_close (d->proc);
- d->proc = NULL;
+ GNUNET_DISK_pipe_close (d->pipe_stdout);
+ d->pipe_stdout = NULL;
+ (void) GNUNET_OS_process_kill (d->proc, SIGKILL);
+ GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (d->proc));
+ GNUNET_OS_process_close (d->proc);
+ d->proc = NULL;
if (NULL != cb)
- cb (d->cb_cls,
- NULL,
- d->cfg,
- d,
- _("`Failed to get hostkey!\n"));
- return;
- }
- GNUNET_DISK_pipe_close(d->pipe_stdout);
+ cb (d->cb_cls, NULL, d->cfg, d, _("`Failed to get hostkey!\n"));
+ return;
+ }
+ GNUNET_DISK_pipe_close (d->pipe_stdout);
d->pipe_stdout = NULL;
(void) GNUNET_OS_process_kill (d->proc, SIGKILL);
GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (d->proc));
GNUNET_OS_process_close (d->proc);
d->proc = NULL;
#if DEBUG_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Successfully got hostkey!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Successfully got hostkey!\n");
#endif
if (d->hostkey_callback != NULL)
{
- d->hostkey_callback(d->hostkey_cls, &d->id, d, NULL);
+ d->hostkey_callback (d->hostkey_cls, &d->id, d, NULL);
d->phase = SP_HOSTKEY_CREATED;
}
else
/* Fall through */
case SP_HOSTKEY_CREATED:
/* wait for topology finished */
- if ((GNUNET_YES == d->dead) || (GNUNET_TIME_absolute_get_remaining(d->max_timeout).rel_value == 0))
+ if ((GNUNET_YES == d->dead)
+ || (GNUNET_TIME_absolute_get_remaining (d->max_timeout).rel_value ==
+ 0))
{
cb = d->cb;
d->cb = NULL;
if (NULL != cb)
cb (d->cb_cls,
NULL,
- d->cfg,
- d,
- _("`Failed while waiting for topology setup!\n"));
+ d->cfg, d, _("`Failed while waiting for topology setup!\n"));
return;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Starting `%s', with command `%s %s %s %s %s %s'.\n",
"gnunet-arm", "gnunet-arm", "-c", d->cfgfile,
- "-L", "DEBUG",
- "-s");
+ "-L", "DEBUG", "-s");
#endif
d->proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-arm",
- "gnunet-arm",
- "-c", d->cfgfile,
+ "gnunet-arm", "-c", d->cfgfile,
#if DEBUG_TESTING
- "-L", "DEBUG",
+ "-L", "DEBUG",
#endif
- "-s", "-q", NULL);
+ "-s", "-q", NULL);
}
else
{
#if DEBUG_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Starting `%s', with command `%s %s %s %s %s %s %s %s'.\n",
- "gnunet-arm", "ssh", dst, "gnunet-arm", "-c", d->cfgfile,
- "-L", "DEBUG", "-s", "-q");
+ "gnunet-arm", "ssh", dst, "gnunet-arm", "-c",
+ d->cfgfile, "-L", "DEBUG", "-s", "-q");
#endif
if (d->ssh_port_str == NULL)
{
- d->proc = GNUNET_OS_start_process (NULL, NULL, "ssh",
- "ssh",
+ d->proc = GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh",
#if !DEBUG_TESTING
- "-q",
+ "-q",
#endif
- dst,
- "gnunet-arm",
+ dst, "gnunet-arm",
#if DEBUG_TESTING
- "-L", "DEBUG",
+ "-L", "DEBUG",
#endif
- "-c", d->cfgfile, "-s", "-q", NULL);
+ "-c", d->cfgfile, "-s", "-q",
+ NULL);
}
else
{
d->proc = GNUNET_OS_start_process (NULL, NULL, "ssh",
- "ssh", "-p", d->ssh_port_str,
+ "ssh", "-p", d->ssh_port_str,
#if !DEBUG_TESTING
- "-q",
+ "-q",
#endif
- dst,
- "gnunet-arm",
+ dst, "gnunet-arm",
#if DEBUG_TESTING
- "-L", "DEBUG",
+ "-L", "DEBUG",
#endif
- "-c", d->cfgfile, "-s", "-q", NULL);
+ "-c", d->cfgfile, "-s", "-q",
+ NULL);
}
GNUNET_free (dst);
}
case SP_START_ARMING:
if (GNUNET_OK != GNUNET_OS_process_status (d->proc, &type, &code))
{
- if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).rel_value == 0)
+ if (GNUNET_TIME_absolute_get_remaining (d->max_timeout).rel_value ==
+ 0)
{
cb = d->cb;
d->cb = NULL;
"Successfully started `%s'.\n", "gnunet-arm");
#endif
d->phase = SP_START_CORE;
- d->server = GNUNET_CORE_connect (d->cfg,
- 1,
+ d->server = GNUNET_CORE_connect (d->cfg, 1,
#if NO_MORE_TIMEOUT_FIXME
ARM_START_WAIT,
#endif
/* confirm copying complete */
if (GNUNET_OK != GNUNET_OS_process_status (d->proc, &type, &code))
{
- if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).rel_value == 0)
+ if (GNUNET_TIME_absolute_get_remaining (d->max_timeout).rel_value ==
+ 0)
{
if (NULL != d->dead_cb)
d->dead_cb (d->dead_cb_cls,
- _("either `gnunet-arm' or `ssh' does not seem to terminate.\n"));
+ _
+ ("either `gnunet-arm' or `ssh' does not seem to terminate.\n"));
if (d->th != NULL)
{
- GNUNET_TRANSPORT_get_hello_cancel(d->th, &process_hello, d);
- GNUNET_TRANSPORT_disconnect(d->th);
+ GNUNET_TRANSPORT_get_hello_cancel (d->th, &process_hello,
+ d);
+ GNUNET_TRANSPORT_disconnect (d->th);
d->th = NULL;
}
GNUNET_CONFIGURATION_destroy (d->cfg);
GNUNET_free (d->cfgfile);
- GNUNET_free_non_null(d->hello);
+ GNUNET_free_non_null (d->hello);
GNUNET_free_non_null (d->hostname);
GNUNET_free_non_null (d->username);
GNUNET_free_non_null (d->shortname);
{
if (NULL != d->dead_cb)
d->dead_cb (d->dead_cb_cls,
- _("shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"));
+ _
+ ("shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"));
if (d->th != NULL)
{
- GNUNET_TRANSPORT_get_hello_cancel(d->th, &process_hello, d);
- GNUNET_TRANSPORT_disconnect(d->th);
+ GNUNET_TRANSPORT_get_hello_cancel (d->th, &process_hello, d);
+ GNUNET_TRANSPORT_disconnect (d->th);
d->th = NULL;
}
+ if (d->server != NULL)
+ {
+ GNUNET_CORE_disconnect (d->server);
+ d->server = NULL;
+ }
GNUNET_CONFIGURATION_destroy (d->cfg);
GNUNET_free (d->cfgfile);
- GNUNET_free_non_null(d->hello);
+ GNUNET_free_non_null (d->hello);
GNUNET_free_non_null (d->hostname);
GNUNET_free_non_null (d->username);
GNUNET_free_non_null (d->shortname);
#if DEBUG_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer shutdown complete.\n");
#endif
+ if (d->server != NULL)
+ {
+ GNUNET_CORE_disconnect (d->server);
+ d->server = NULL;
+ }
+
if (d->th != NULL)
{
- GNUNET_TRANSPORT_get_hello_cancel(d->th, &process_hello, d);
- GNUNET_TRANSPORT_disconnect(d->th);
+ GNUNET_TRANSPORT_get_hello_cancel (d->th, &process_hello, d);
+ GNUNET_TRANSPORT_disconnect (d->th);
d->th = NULL;
}
/* state clean up and notifications */
GNUNET_free_non_null (d->username);
}
- GNUNET_free_non_null(d->hello);
+ GNUNET_free_non_null (d->hello);
d->hello = NULL;
GNUNET_free_non_null (d->shortname);
d->shortname = NULL;
/* confirm copying complete */
if (GNUNET_OK != GNUNET_OS_process_status (d->proc, &type, &code))
{
- if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).rel_value == 0) /* FIXME: config update should take timeout parameter! */
+ if (GNUNET_TIME_absolute_get_remaining (d->max_timeout).rel_value == 0) /* FIXME: config update should take timeout parameter! */
{
cb = d->cb;
d->cb = NULL;
* @param daemon the daemon to finish starting
*/
void
-GNUNET_TESTING_daemon_continue_startup(struct GNUNET_TESTING_Daemon *daemon)
+GNUNET_TESTING_daemon_continue_startup (struct GNUNET_TESTING_Daemon *daemon)
{
- GNUNET_assert(daemon->phase == SP_HOSTKEY_CREATED);
+ GNUNET_assert (daemon->phase == SP_HOSTKEY_CREATED);
daemon->phase = SP_TOPOLOGY_SETUP;
}
void *cb_cls)
{
if (daemon->running == GNUNET_YES)
- {
- cb(cb_cls, &daemon->id, daemon->cfg, daemon, "Daemon already running, can't restart!");
- return;
- }
+ {
+ cb (cb_cls, &daemon->id, daemon->cfg, daemon,
+ "Daemon already running, can't restart!");
+ return;
+ }
daemon->cb = cb;
daemon->cb_cls = cb_cls;
daemon->phase = SP_TOPOLOGY_SETUP;
- daemon->max_timeout = GNUNET_TIME_relative_to_absolute(timeout);
+ daemon->max_timeout = GNUNET_TIME_relative_to_absolute (timeout);
GNUNET_SCHEDULER_add_continuation (&start_fsm,
daemon,
const char *hostname,
const char *ssh_username,
uint16_t sshport,
- GNUNET_TESTING_NotifyHostkeyCreated hostkey_callback,
- void *hostkey_cls,
+ GNUNET_TESTING_NotifyHostkeyCreated
+ hostkey_callback, void *hostkey_cls,
GNUNET_TESTING_NotifyDaemonRunning cb,
void *cb_cls)
{
ret->hostname = (hostname == NULL) ? NULL : GNUNET_strdup (hostname);
if (sshport != 0)
{
- GNUNET_asprintf(&ret->ssh_port_str, "%d", sshport);
+ GNUNET_asprintf (&ret->ssh_port_str, "%d", sshport);
}
else
ret->ssh_port_str = NULL;
ret->hostkey_cls = hostkey_cls;
ret->cb = cb;
ret->cb_cls = cb_cls;
- ret->max_timeout = GNUNET_TIME_relative_to_absolute(timeout);
+ ret->max_timeout = GNUNET_TIME_relative_to_absolute (timeout);
ret->cfg = GNUNET_CONFIGURATION_dup (cfg);
GNUNET_CONFIGURATION_set_value_string (ret->cfg,
"PATHS",
return NULL;
}
if (ssh_username != NULL)
- username = GNUNET_strdup(ssh_username);
+ username = GNUNET_strdup (ssh_username);
if ((ssh_username == NULL) && (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (cfg,
- "TESTING",
- "USERNAME", &username)))
+ GNUNET_CONFIGURATION_get_value_string (cfg,
+ "TESTING",
+ "USERNAME",
+ &username)))
{
if (NULL != getenv ("USER"))
username = GNUNET_strdup (getenv ("USER"));
if (ret->ssh_port_str == NULL)
{
- ret->proc = GNUNET_OS_start_process (NULL, NULL, "scp",
- "scp",
+ ret->proc = GNUNET_OS_start_process (NULL, NULL, "scp", "scp",
#if !DEBUG_TESTING
- "-q",
+ "-q",
#endif
- ret->cfgfile, arg, NULL);
+ ret->cfgfile, arg, NULL);
}
else
{
ret->proc = GNUNET_OS_start_process (NULL, NULL, "scp",
- "scp", "-P", ret->ssh_port_str,
+ "scp", "-P", ret->ssh_port_str,
#if !DEBUG_TESTING
- "-q",
+ "-q",
#endif
- ret->cfgfile, arg, NULL);
+ ret->cfgfile, arg, NULL);
}
GNUNET_free (arg);
if (NULL == ret->proc)
*/
void
GNUNET_TESTING_daemon_restart (struct GNUNET_TESTING_Daemon *d,
- GNUNET_TESTING_NotifyDaemonRunning cb, void *cb_cls)
+ GNUNET_TESTING_NotifyDaemonRunning cb,
+ void *cb_cls)
{
char *arg;
char *del_arg;
if (d->th != NULL)
{
- GNUNET_TRANSPORT_get_hello_cancel(d->th, &process_hello, d);
- GNUNET_TRANSPORT_disconnect(d->th);
+ GNUNET_TRANSPORT_get_hello_cancel (d->th, &process_hello, d);
+ GNUNET_TRANSPORT_disconnect (d->th);
d->th = NULL;
}
/* state clean up and notifications */
- GNUNET_free_non_null(d->hello);
+ GNUNET_free_non_null (d->hello);
#if DEBUG_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Terminating peer `%4s'\n"), GNUNET_i2s (&d->id));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Terminating peer `%4s'\n"), GNUNET_i2s (&d->id));
#endif
- d->phase = SP_START_ARMING;
+ d->phase = SP_START_ARMING;
- /* Check if this is a local or remote process */
+ /* Check if this is a local or remote process */
if (NULL != d->hostname)
{
#if DEBUG_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Stopping gnunet-arm with config `%s' on host `%s'.\n", d->cfgfile, d->hostname);
+ "Stopping gnunet-arm with config `%s' on host `%s'.\n",
+ d->cfgfile, d->hostname);
#endif
if (d->username != NULL)
d->proc = GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh",
#if !DEBUG_TESTING
- "-q",
+ "-q",
#endif
- arg, "gnunet-arm",
+ arg, "gnunet-arm",
#if DEBUG_TESTING
- "-L", "DEBUG",
+ "-L", "DEBUG",
#endif
- "-c", d->cfgfile, "-e", "-r", NULL);
+ "-c", d->cfgfile, "-e", "-r", NULL);
/* Use -r to restart arm and all services */
GNUNET_free (arg);
{
#if DEBUG_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Stopping gnunet-arm with config `%s' locally.\n", d->cfgfile);
+ "Stopping gnunet-arm with config `%s' locally.\n",
+ d->cfgfile);
#endif
d->proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-arm",
- "gnunet-arm",
+ "gnunet-arm",
#if DEBUG_TESTING
- "-L", "DEBUG",
+ "-L", "DEBUG",
#endif
- "-c", d->cfgfile, "-e", "-r", NULL);
+ "-c", d->cfgfile, "-e", "-r", NULL);
}
- GNUNET_free_non_null(del_arg);
- d->task
- = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_EXEC_WAIT,
- &start_fsm, d);
+ GNUNET_free_non_null (del_arg);
+ d->task
+ = GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_EXEC_WAIT,
+ &start_fsm, d);
}
GNUNET_TESTING_daemon_stop (struct GNUNET_TESTING_Daemon *d,
struct GNUNET_TIME_Relative timeout,
GNUNET_TESTING_NotifyCompletion cb, void *cb_cls,
- int delete_files,
- int allow_restart)
+ int delete_files, int allow_restart)
{
char *arg;
char *del_arg;
{
#if DEBUG_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Setting d->dead on peer `%4s'\n"), GNUNET_i2s (&d->id));
+ _("Setting d->dead on peer `%4s'\n"), GNUNET_i2s (&d->id));
#endif
d->dead = GNUNET_YES;
return;
}
- if ((d->running == GNUNET_NO) && (d->churn == GNUNET_YES)) /* Peer has already been stopped in churn context! */
+ if ((d->running == GNUNET_NO) && (d->churn == GNUNET_YES)) /* Peer has already been stopped in churn context! */
{
/* Free what was left from churning! */
- GNUNET_assert(d->cfg != NULL);
+ GNUNET_assert (d->cfg != NULL);
GNUNET_CONFIGURATION_destroy (d->cfg);
if (delete_files == GNUNET_YES)
{
- if (0 != UNLINK(d->cfgfile))
+ if (0 != UNLINK (d->cfgfile))
{
- GNUNET_log_strerror(GNUNET_ERROR_TYPE_WARNING, "unlink");
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "unlink");
}
}
GNUNET_free (d->cfgfile);
GNUNET_free_non_null (d->username);
if (NULL != d->dead_cb)
d->dead_cb (d->dead_cb_cls, NULL);
- GNUNET_free(d);
+ GNUNET_free (d);
return;
}
del_arg = NULL;
if (delete_files == GNUNET_YES)
{
- GNUNET_asprintf(&del_arg, "-d");
+ GNUNET_asprintf (&del_arg, "-d");
}
if (d->phase == SP_CONFIG_UPDATE)
GNUNET_SCHEDULER_cancel (d->task);
d->phase = SP_START_DONE;
}
+ /** Move this call to scheduled shutdown as fix for CORE_connect calling daemon_stop?
if (d->server != NULL)
{
GNUNET_CORE_disconnect (d->server);
d->server = NULL;
}
+ */
/* shutdown ARM process (will terminate others) */
#if DEBUG_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
d->churn = GNUNET_YES;
if (d->th != NULL)
{
- GNUNET_TRANSPORT_get_hello_cancel(d->th, &process_hello, d);
- GNUNET_TRANSPORT_disconnect(d->th);
+ GNUNET_TRANSPORT_get_hello_cancel (d->th, &process_hello, d);
+ GNUNET_TRANSPORT_disconnect (d->th);
d->th = NULL;
}
/* Check if this is a local or remote process */
{
#if DEBUG_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Stopping gnunet-arm with config `%s' on host `%s'.\n", d->cfgfile, d->hostname);
+ "Stopping gnunet-arm with config `%s' on host `%s'.\n",
+ d->cfgfile, d->hostname);
#endif
if (d->username != NULL)
d->proc = GNUNET_OS_start_process (NULL, NULL, "ssh", "ssh",
#if !DEBUG_TESTING
- "-q",
+ "-q",
#endif
- arg, "gnunet-arm",
+ arg, "gnunet-arm",
#if DEBUG_TESTING
- "-L", "DEBUG",
+ "-L", "DEBUG",
#endif
- "-c", d->cfgfile, "-e", "-q", del_arg, NULL);
+ "-c", d->cfgfile, "-e", "-q",
+ del_arg, NULL);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Stopping gnunet-arm with command ssh %s gnunet-arm -c %s -e -q %s\n", arg, "gnunet-arm", d->cfgfile, del_arg);
+ "Stopping gnunet-arm with command ssh %s gnunet-arm -c %s -e -q %s\n",
+ arg, "gnunet-arm", d->cfgfile, del_arg);
/* Use -e to end arm, and -d to remove temp files */
GNUNET_free (arg);
}
{
#if DEBUG_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Stopping gnunet-arm with config `%s' locally.\n", d->cfgfile);
+ "Stopping gnunet-arm with config `%s' locally.\n",
+ d->cfgfile);
#endif
d->proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-arm",
- "gnunet-arm",
+ "gnunet-arm",
#if DEBUG_TESTING
- "-L", "DEBUG",
+ "-L", "DEBUG",
#endif
- "-c", d->cfgfile, "-e", "-q", del_arg, NULL);
+ "-c", d->cfgfile, "-e", "-q",
+ del_arg, NULL);
}
- GNUNET_free_non_null(del_arg);
- d->max_timeout = GNUNET_TIME_relative_to_absolute(timeout);
- d->task
- = GNUNET_SCHEDULER_add_now (&start_fsm, d);
+ GNUNET_free_non_null (del_arg);
+ d->max_timeout = GNUNET_TIME_relative_to_absolute (timeout);
+ d->task = GNUNET_SCHEDULER_add_now (&start_fsm, d);
}
GNUNET_asprintf (&arg, "%s:%s", d->hostname, d->cfgfile);
d->proc = GNUNET_OS_start_process (NULL, NULL, "scp", "scp",
#if !DEBUG_TESTING
- "-q",
+ "-q",
#endif
- d->cfgfile, arg, NULL);
+ d->cfgfile, arg, NULL);
GNUNET_free (arg);
if (NULL == d->proc)
{
/**
* Handle to core of first daemon (to check connect)
*/
- struct GNUNET_CORE_Handle * d1core;
+ struct GNUNET_CORE_Handle *d1core;
/**
* Testing handle to the second daemon.
struct GNUNET_CORE_PeerRequestHandle *connect_request_handle;
/**
- * Transport handle to the second daemon.
+ * Transport handle to the first daemon (to offer the HELLO of the second daemon to).
*/
- struct GNUNET_TRANSPORT_Handle *d2th;
+ struct GNUNET_TRANSPORT_Handle *d1th;
/**
* Function to call once we are done (or have timed out).
/** Forward declaration **/
static void
-reattempt_daemons_connect(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+reattempt_daemons_connect (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc);
/**
ctx->timeout_task = GNUNET_SCHEDULER_NO_TASK;
if (ctx->hello_send_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel(ctx->hello_send_task);
+ GNUNET_SCHEDULER_cancel (ctx->hello_send_task);
ctx->hello_send_task = GNUNET_SCHEDULER_NO_TASK;
}
}
if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
{
- if (ctx->d2th != NULL)
- GNUNET_TRANSPORT_disconnect (ctx->d2th);
- ctx->d2th = NULL;
+ if (ctx->d1th != NULL)
+ GNUNET_TRANSPORT_disconnect (ctx->d1th);
+ ctx->d1th = NULL;
if (ctx->d1core != NULL)
GNUNET_CORE_disconnect (ctx->d1core);
#if CONNECT_CORE2
return;
}
- remaining = GNUNET_TIME_absolute_get_remaining(ctx->timeout);
+ remaining = GNUNET_TIME_absolute_get_remaining (ctx->timeout);
if (ctx->connected == GNUNET_YES)
{
if (ctx->cb != NULL)
{
- ctx->cb (ctx->cb_cls,
- &ctx->d1->id,
- &ctx->d2->id,
- ctx->distance,
- ctx->d1->cfg,
- ctx->d2->cfg,
- ctx->d1,
- ctx->d2,
- NULL);
+ ctx->cb (ctx->cb_cls,
+ &ctx->d1->id,
+ &ctx->d2->id,
+ ctx->distance,
+ ctx->d1->cfg, ctx->d2->cfg, ctx->d1, ctx->d2, NULL);
}
}
else if (remaining.rel_value > 0)
{
if (ctx->d1core != NULL)
{
- GNUNET_CORE_disconnect(ctx->d1core);
+ GNUNET_CORE_disconnect (ctx->d1core);
ctx->d1core = NULL;
}
#if CONNECT_CORE2
if (ctx->d2core != NULL)
{
- GNUNET_CORE_disconnect(ctx->d2core);
+ GNUNET_CORE_disconnect (ctx->d2core);
ctx->d2core = NULL;
}
#endif
- if (ctx->d2th != NULL)
+ if (ctx->d1th != NULL)
{
- GNUNET_TRANSPORT_disconnect(ctx->d2th);
- ctx->d2th = NULL;
+ GNUNET_TRANSPORT_disconnect (ctx->d1th);
+ ctx->d1th = NULL;
}
- GNUNET_SCHEDULER_add_now(&reattempt_daemons_connect, ctx);
+ GNUNET_SCHEDULER_add_now (&reattempt_daemons_connect, ctx);
return;
}
else
}
}
- GNUNET_TRANSPORT_disconnect (ctx->d2th);
- ctx->d2th = NULL;
+ GNUNET_TRANSPORT_disconnect (ctx->d1th);
+ ctx->d1th = NULL;
GNUNET_CORE_disconnect (ctx->d1core);
ctx->d1core = NULL;
GNUNET_free (ctx);
*
*/
static void
-connect_notify (void *cls,
- const struct GNUNET_PeerIdentity * peer,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+connect_notify (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_TRANSPORT_ATS_Information *atsi)
{
struct ConnectContext *ctx = cls;
- if (memcmp(&ctx->d2->id, peer, sizeof(struct GNUNET_PeerIdentity)) == 0)
+ if (memcmp (&ctx->d2->id, peer, sizeof (struct GNUNET_PeerIdentity)) == 0)
{
ctx->connected = GNUNET_YES;
- ctx->distance = 0; /* FIXME: distance */
- GNUNET_SCHEDULER_cancel(ctx->timeout_task);
+ ctx->distance = 0; /* FIXME: distance */
+ GNUNET_SCHEDULER_cancel (ctx->timeout_task);
ctx->timeout_task = GNUNET_SCHEDULER_add_now (¬ify_connect_result,
- ctx);
+ ctx);
}
}
*
*/
static void
-connect_notify_core2 (void *cls,
- const struct GNUNET_PeerIdentity * peer,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+connect_notify_core2 (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_TRANSPORT_ATS_Information *atsi)
{
struct ConnectContext *ctx = cls;
- if (memcmp(&ctx->d2->id, peer, sizeof(struct GNUNET_PeerIdentity)) == 0)
+ if (memcmp (&ctx->d2->id, peer, sizeof (struct GNUNET_PeerIdentity)) == 0)
{
ctx->connected = GNUNET_YES;
- ctx->distance = 0; /* FIXME: distance */
- GNUNET_SCHEDULER_cancel(ctx->timeout_task);
+ ctx->distance = 0; /* FIXME: distance */
+ GNUNET_SCHEDULER_cancel (ctx->timeout_task);
ctx->timeout_task = GNUNET_SCHEDULER_add_now (¬ify_connect_result,
ctx);
}
* @param cls struct ConnectContext
* @param tc context information (why was this task triggered now)
*/
-void core_connect_request_cont (void *cls,
- const struct
- GNUNET_SCHEDULER_TaskContext * tc)
+void
+core_connect_request_cont (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct ConnectContext *ctx = cls;
}
static void
-send_hello(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+send_hello (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct ConnectContext *ctx = cls;
struct GNUNET_MessageHeader *hello;
ctx->hello_send_task = GNUNET_SCHEDULER_NO_TASK;
if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
return;
- if ((ctx->d2->hello != NULL) && (NULL != GNUNET_HELLO_get_header(ctx->d2->hello)))
+ if ((ctx->d2->hello != NULL)
+ && (NULL != GNUNET_HELLO_get_header (ctx->d2->hello)))
{
- hello = GNUNET_HELLO_get_header(ctx->d2->hello);
- GNUNET_assert(hello != NULL);
- /* FIXME: if this works, change d2th to d1th */
- GNUNET_TRANSPORT_offer_hello (ctx->d2th, hello);
- GNUNET_assert(ctx->d1core != NULL);
- ctx->connect_request_handle = GNUNET_CORE_peer_request_connect (ctx->d1core,
- GNUNET_TIME_relative_divide(ctx->relative_timeout,
- ctx->max_connect_attempts + 1),
- &ctx->d1->id,
- &core_connect_request_cont,
- ctx);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Sending connect request to core for peer %s\n", GNUNET_i2s(&ctx->d1->id));
- ctx->timeout_hello = GNUNET_TIME_relative_add(ctx->timeout_hello,
- GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS,
- 500));
+ hello = GNUNET_HELLO_get_header (ctx->d2->hello);
+ GNUNET_assert (hello != NULL);
+ GNUNET_TRANSPORT_offer_hello (ctx->d1th, hello);
+ GNUNET_assert (ctx->d1core != NULL);
+ ctx->connect_request_handle =
+ GNUNET_CORE_peer_request_connect (ctx->d1core,
+ GNUNET_TIME_relative_divide
+ (ctx->relative_timeout,
+ ctx->max_connect_attempts + 1),
+ &ctx->d2->id,
+ &core_connect_request_cont, ctx);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Sending connect request to CORE of %s for peer %s\n",
+ GNUNET_i2s (&ctx->d1->id),
+ GNUNET_h2s (&ctx->d2->id.hashPubKey));
+ ctx->timeout_hello =
+ GNUNET_TIME_relative_add (ctx->timeout_hello,
+ GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_MILLISECONDS, 500));
}
- ctx->hello_send_task = GNUNET_SCHEDULER_add_delayed(ctx->timeout_hello,
- &send_hello, ctx);
+ ctx->hello_send_task = GNUNET_SCHEDULER_add_delayed (ctx->timeout_hello,
+ &send_hello, ctx);
}
/**
ctx->d1 = d1;
ctx->d2 = d2;
ctx->timeout = GNUNET_TIME_relative_to_absolute (timeout);
- ctx->timeout_hello = GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 500);
+ ctx->timeout_hello =
+ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 500);
ctx->relative_timeout = timeout;
ctx->cb = cb;
ctx->cb_cls = cb_cls;
d1->shortname, d2->shortname);
#endif
- ctx->d1core = GNUNET_CORE_connect (d1->cfg,
- 1,
+ ctx->d1core = GNUNET_CORE_connect (d1->cfg, 1,
#if NO_MORE_TIMEOUT_FIXME
timeout,
#endif
}
#if CONNECT_CORE2
- ctx->d2core = GNUNET_CORE_connect (d2->cfg,
- 1,
+ ctx->d2core = GNUNET_CORE_connect (d2->cfg, 1,
#if NO_MORE_TIMEOUT_FIXME
timeout,
#endif
#endif
- ctx->d2th = GNUNET_TRANSPORT_connect (d1->cfg,
- &d1->id,
- d1, NULL, NULL, NULL);
- if (ctx->d2th == NULL)
+ ctx->d1th = GNUNET_TRANSPORT_connect (d1->cfg,
+ &d1->id, d1, NULL, NULL, NULL);
+ if (ctx->d1th == NULL)
{
- GNUNET_CORE_disconnect(ctx->d1core);
+ GNUNET_CORE_disconnect (ctx->d1core);
GNUNET_free (ctx);
if (NULL != cb)
cb (cb_cls, &d1->id, &d2->id, 0, d1->cfg, d2->cfg, d1, d2,
return;
}
- ctx->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_divide(ctx->relative_timeout,
- ctx->max_connect_attempts),
- ¬ify_connect_result, ctx);
+ ctx->timeout_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_divide
+ (ctx->relative_timeout,
+ ctx->max_connect_attempts),
+ ¬ify_connect_result, ctx);
- ctx->hello_send_task = GNUNET_SCHEDULER_add_now(&send_hello, ctx);
+ ctx->hello_send_task = GNUNET_SCHEDULER_add_now (&send_hello, ctx);
}
static void
-reattempt_daemons_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+reattempt_daemons_connect (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct ConnectContext *ctx = cls;
return;
}
#if DEBUG_TESTING_RECONNECT
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "re-attempting connect of peer %s to peer %s\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "re-attempting connect of peer %s to peer %s\n",
ctx->d1->shortname, ctx->d2->shortname);
#endif
- GNUNET_assert(ctx->d1core == NULL);
+ GNUNET_assert (ctx->d1core == NULL);
- ctx->d1core = GNUNET_CORE_connect (ctx->d1->cfg,
- 1,
+ ctx->d1core = GNUNET_CORE_connect (ctx->d1->cfg, 1,
#if NO_MORE_TIMEOUT_FIXME
- GNUNET_TIME_absolute_get_remaining(ctx->timeout),
+ GNUNET_TIME_absolute_get_remaining
+ (ctx->timeout),
#endif
ctx,
NULL,
if (ctx->d1core == NULL)
{
if (NULL != ctx->cb)
- ctx->cb (ctx->cb_cls, &ctx->d1->id, &ctx->d2->id, 0, ctx->d1->cfg, ctx->d2->cfg, ctx->d1, ctx->d2,
+ ctx->cb (ctx->cb_cls, &ctx->d1->id, &ctx->d2->id, 0, ctx->d1->cfg,
+ ctx->d2->cfg, ctx->d1, ctx->d2,
_("Failed to connect to core service of first peer!\n"));
GNUNET_free (ctx);
return;
}
- ctx->d2th = GNUNET_TRANSPORT_connect (ctx->d1->cfg,
- &ctx->d1->id,
- ctx->d1, NULL, NULL, NULL);
- if (ctx->d2th == NULL)
+ ctx->d1th = GNUNET_TRANSPORT_connect (ctx->d1->cfg,
+ &ctx->d1->id,
+ ctx->d1, NULL, NULL, NULL);
+ if (ctx->d1th == NULL)
{
- GNUNET_CORE_disconnect(ctx->d1core);
+ GNUNET_CORE_disconnect (ctx->d1core);
GNUNET_free (ctx);
if (NULL != ctx->cb)
- ctx->cb (ctx->cb_cls, &ctx->d1->id, &ctx->d2->id, 0, ctx->d1->cfg, ctx->d2->cfg, ctx->d1, ctx->d2,
- _("Failed to connect to transport service!\n"));
+ ctx->cb (ctx->cb_cls, &ctx->d1->id, &ctx->d2->id, 0, ctx->d1->cfg,
+ ctx->d2->cfg, ctx->d1, ctx->d2,
+ _("Failed to connect to transport service!\n"));
return;
}
- ctx->timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_divide(ctx->relative_timeout, ctx->max_connect_attempts),
- ¬ify_connect_result, ctx);
+ ctx->timeout_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_divide
+ (ctx->relative_timeout,
+ ctx->max_connect_attempts),
+ ¬ify_connect_result, ctx);
- ctx->hello_send_task = GNUNET_SCHEDULER_add_now(&send_hello, ctx);
+ ctx->hello_send_task = GNUNET_SCHEDULER_add_now (&send_hello, ctx);
}
/* end of testing.c */
* Prototype of a function called whenever two peers would be connected
* in a certain topology.
*/
-typedef unsigned int (*GNUNET_TESTING_ConnectionProcessor)(struct GNUNET_TESTING_PeerGroup *pg,
- unsigned int first,
- unsigned int second);
+typedef unsigned int (*GNUNET_TESTING_ConnectionProcessor) (struct
+ GNUNET_TESTING_PeerGroup
+ * pg,
+ unsigned int
+ first,
+ unsigned int
+ second);
/**
* Number of peers that still need to be stopped
*/
unsigned int num_to_stop;
-
+
/**
* Number of peers that failed to start
*/
* @param hash set to uid (extended with zeros)
*/
static void
-hash_from_uid (uint32_t uid,
- GNUNET_HashCode *hash)
+hash_from_uid (uint32_t uid, GNUNET_HashCode * hash)
{
- memset (hash, 0, sizeof(GNUNET_HashCode));
- *((uint32_t*)hash) = uid;
+ memset (hash, 0, sizeof (GNUNET_HashCode));
+ *((uint32_t *) hash) = uid;
}
/**
* @param hash set to uid (extended with zeros)
*/
static void
-uid_from_hash (const GNUNET_HashCode *hash, uint32_t *uid)
+uid_from_hash (const GNUNET_HashCode * hash, uint32_t * uid)
{
- memcpy (uid, hash, sizeof(uint32_t));
+ memcpy (uid, hash, sizeof (uint32_t));
}
/**
* known topology, GNUNET_NO if not
*/
int
-GNUNET_TESTING_topology_get(enum GNUNET_TESTING_Topology *topology, const char * topology_string)
+GNUNET_TESTING_topology_get (enum GNUNET_TESTING_Topology *topology,
+ const char *topology_string)
{
/**
* Strings representing topologies in enum
*/
- static const char * topology_strings[] =
- {
+ static const char *topology_strings[] = {
/**
* A clique (everyone connected to everyone else).
*/
- "CLIQUE",
-
+ "CLIQUE",
+
/**
* Small-world network (2d torus plus random links).
*/
- "SMALL_WORLD",
-
+ "SMALL_WORLD",
+
/**
* Small-world network (ring plus random links).
*/
- "SMALL_WORLD_RING",
-
+ "SMALL_WORLD_RING",
+
/**
* Ring topology.
*/
- "RING",
-
+ "RING",
+
/**
* 2-d torus.
*/
- "2D_TORUS",
-
+ "2D_TORUS",
+
/**
* Random graph.
*/
- "ERDOS_RENYI",
-
+ "ERDOS_RENYI",
+
/**
* Certain percentage of peers are unable to communicate directly
* replicating NAT conditions
*/
- "INTERNAT",
-
+ "INTERNAT",
+
/**
* Scale free topology.
*/
- "SCALE_FREE",
-
+ "SCALE_FREE",
+
/**
* Straight line topology.
*/
- "LINE",
-
+ "LINE",
+
/**
* All peers are disconnected.
*/
- "NONE",
+ "NONE",
- NULL
- };
+ NULL
+ };
int curr = 0;
if (topology_string == NULL)
return GNUNET_NO;
while (topology_strings[curr] != NULL)
{
- if (strcasecmp(topology_strings[curr], topology_string) == 0)
- {
- *topology = curr;
- return GNUNET_YES;
- }
+ if (strcasecmp (topology_strings[curr], topology_string) == 0)
+ {
+ *topology = curr;
+ return GNUNET_YES;
+ }
curr++;
}
*topology = GNUNET_TESTING_TOPOLOGY_NONE;
* topology option, GNUNET_NO if not
*/
int
-GNUNET_TESTING_topology_option_get (enum GNUNET_TESTING_TopologyOption *topology_option,
- const char * topology_string)
+GNUNET_TESTING_topology_option_get (enum GNUNET_TESTING_TopologyOption
+ *topology_option,
+ const char *topology_string)
{
/**
* Options for connecting a topology as strings.
*/
- static const char * topology_option_strings[] =
- {
+ static const char *topology_option_strings[] = {
/**
* Try to connect all peers specified in the topology.
*/
- "CONNECT_ALL",
-
+ "CONNECT_ALL",
+
/**
* Choose a random subset of connections to create.
*/
- "CONNECT_RANDOM_SUBSET",
-
+ "CONNECT_RANDOM_SUBSET",
+
/**
* Create at least X connections for each peer.
*/
- "CONNECT_MINIMUM",
-
+ "CONNECT_MINIMUM",
+
/**
* Using a depth first search, create one connection
* per peer. If any are missed (graph disconnected)
* start over at those peers until all have at least one
* connection.
*/
- "CONNECT_DFS",
-
+ "CONNECT_DFS",
+
/**
* Find the N closest peers to each allowed peer in the
* topology and make sure a connection to those peers
* exists in the connect topology.
*/
- "CONNECT_CLOSEST",
+ "CONNECT_CLOSEST",
/**
* No options specified.
*/
- "CONNECT_NONE",
+ "CONNECT_NONE",
- NULL
- };
+ NULL
+ };
int curr = 0;
if (topology_string == NULL)
return GNUNET_NO;
while (NULL != topology_option_strings[curr])
{
- if (strcasecmp(topology_option_strings[curr], topology_string) == 0)
- {
- *topology_option = curr;
- return GNUNET_YES;
- }
+ if (strcasecmp (topology_option_strings[curr], topology_string) == 0)
+ {
+ *topology_option = curr;
+ return GNUNET_YES;
+ }
curr++;
- }
+ }
*topology_option = GNUNET_TESTING_TOPOLOGY_OPTION_NONE;
return GNUNET_NO;
}
if ((0 == strcmp (option, "PORT")) && (1 == sscanf (value, "%u", &ival)))
{
- GNUNET_asprintf(&single_variable, "single_%s_per_host", section);
- if ((ival != 0) && (GNUNET_YES != GNUNET_CONFIGURATION_get_value_yesno(ctx->orig, "testing", single_variable)))
- {
- GNUNET_snprintf (cval, sizeof (cval), "%u", ctx->nport++);
- value = cval;
- }
+ GNUNET_asprintf (&single_variable, "single_%s_per_host", section);
+ if ((ival != 0)
+ && (GNUNET_YES !=
+ GNUNET_CONFIGURATION_get_value_yesno (ctx->orig, "testing",
+ single_variable)))
+ {
+ GNUNET_snprintf (cval, sizeof (cval), "%u", ctx->nport++);
+ value = cval;
+ }
- GNUNET_free(single_variable);
+ GNUNET_free (single_variable);
}
if (0 == strcmp (option, "UNIXPATH"))
{
- GNUNET_asprintf(&single_variable, "single_%s_per_host", section);
- GNUNET_asprintf(&per_host_variable, "num_%s_per_host", section);
- if (GNUNET_YES != GNUNET_CONFIGURATION_get_value_yesno(ctx->orig, "testing", single_variable))
+ GNUNET_asprintf (&single_variable, "single_%s_per_host", section);
+ GNUNET_asprintf (&per_host_variable, "num_%s_per_host", section);
+ if (GNUNET_YES !=
+ GNUNET_CONFIGURATION_get_value_yesno (ctx->orig, "testing",
+ single_variable))
{
GNUNET_snprintf (uval,
sizeof (uval),
- "/tmp/test-service-%s-%u",
- section,
- ctx->upnum++);
+ "/tmp/test-service-%s-%u", section, ctx->upnum++);
value = uval;
}
- else if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_number(ctx->orig, "testing", per_host_variable, &num_per_host))
+ else if (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_number (ctx->orig, "testing",
+ per_host_variable,
+ &num_per_host))
{
GNUNET_snprintf (uval,
sizeof (uval),
"/tmp/test-service-%s-%u",
- section,
- ctx->fdnum % num_per_host);
+ section, ctx->fdnum % num_per_host);
value = uval;
}
- GNUNET_free(single_variable);
- GNUNET_free(per_host_variable);
+ GNUNET_free (single_variable);
+ GNUNET_free (per_host_variable);
}
* @return new configuration, NULL on error
*/
static struct GNUNET_CONFIGURATION_Handle *
-make_config (const struct GNUNET_CONFIGURATION_Handle *cfg,
- uint16_t * port,
- uint32_t * upnum,
- const char *hostname, uint32_t * fdnum)
+make_config (const struct GNUNET_CONFIGURATION_Handle *cfg,
+ uint16_t * port,
+ uint32_t * upnum, const char *hostname, uint32_t * fdnum)
{
struct UpdateContext uc;
uint16_t orig;
return NULL;
}
- if (GNUNET_CONFIGURATION_get_value_string(cfg, "testing", "control_host", &control_host) == GNUNET_OK)
+ if (GNUNET_CONFIGURATION_get_value_string
+ (cfg, "testing", "control_host", &control_host) == GNUNET_OK)
{
if (hostname != NULL)
- GNUNET_asprintf(&allowed_hosts, "%s; 127.0.0.1; %s;", control_host, hostname);
+ GNUNET_asprintf (&allowed_hosts, "%s; 127.0.0.1; %s;", control_host,
+ hostname);
else
- GNUNET_asprintf(&allowed_hosts, "%s; 127.0.0.1;", control_host);
-
- GNUNET_CONFIGURATION_set_value_string(uc.ret, "core", "ACCEPT_FROM", allowed_hosts);
- GNUNET_CONFIGURATION_set_value_string(uc.ret, "transport", "ACCEPT_FROM", allowed_hosts);
- GNUNET_CONFIGURATION_set_value_string(uc.ret, "dht", "ACCEPT_FROM", allowed_hosts);
- GNUNET_CONFIGURATION_set_value_string(uc.ret, "statistics", "ACCEPT_FROM", allowed_hosts);
- GNUNET_free_non_null(control_host);
- GNUNET_free(allowed_hosts);
+ GNUNET_asprintf (&allowed_hosts, "%s; 127.0.0.1;", control_host);
+
+ GNUNET_CONFIGURATION_set_value_string (uc.ret, "core", "ACCEPT_FROM",
+ allowed_hosts);
+ GNUNET_CONFIGURATION_set_value_string (uc.ret, "transport",
+ "ACCEPT_FROM", allowed_hosts);
+ GNUNET_CONFIGURATION_set_value_string (uc.ret, "dht", "ACCEPT_FROM",
+ allowed_hosts);
+ GNUNET_CONFIGURATION_set_value_string (uc.ret, "statistics",
+ "ACCEPT_FROM", allowed_hosts);
+ GNUNET_free_non_null (control_host);
+ GNUNET_free (allowed_hosts);
}
* otherwise gnunet-arm is unable to connect to it in some instances */
if (hostname != NULL)
{
- GNUNET_asprintf(&allowed_hosts, "%s; 127.0.0.1;", hostname);
- GNUNET_CONFIGURATION_set_value_string(uc.ret, "transport-udp", "BINDTO", hostname);
- GNUNET_CONFIGURATION_set_value_string(uc.ret, "transport-tcp", "BINDTO", hostname);
- GNUNET_CONFIGURATION_set_value_string(uc.ret, "arm", "ACCEPT_FROM", allowed_hosts);
- GNUNET_free(allowed_hosts);
+ GNUNET_asprintf (&allowed_hosts, "%s; 127.0.0.1;", hostname);
+ GNUNET_CONFIGURATION_set_value_string (uc.ret, "transport-udp",
+ "BINDTO", hostname);
+ GNUNET_CONFIGURATION_set_value_string (uc.ret, "transport-tcp",
+ "BINDTO", hostname);
+ GNUNET_CONFIGURATION_set_value_string (uc.ret, "arm", "ACCEPT_FROM",
+ allowed_hosts);
+ GNUNET_free (allowed_hosts);
}
else
{
- GNUNET_CONFIGURATION_set_value_string(uc.ret, "transport-tcp", "BINDTO", "127.0.0.1");
- GNUNET_CONFIGURATION_set_value_string(uc.ret, "transport-udp", "BINDTO", "127.0.0.1");
+ GNUNET_CONFIGURATION_set_value_string (uc.ret, "transport-tcp",
+ "BINDTO", "127.0.0.1");
+ GNUNET_CONFIGURATION_set_value_string (uc.ret, "transport-udp",
+ "BINDTO", "127.0.0.1");
}
*port = (uint16_t) uc.nport;
*
*/
static unsigned int
-add_actual_connections(struct GNUNET_TESTING_PeerGroup *pg, unsigned int first, unsigned int second)
+add_actual_connections (struct GNUNET_TESTING_PeerGroup *pg,
+ unsigned int first, unsigned int second)
{
int added;
int add_first;
GNUNET_HashCode hash_first;
GNUNET_HashCode hash_second;
- hash_from_uid(first, &hash_first);
- hash_from_uid(second, &hash_second);
+ hash_from_uid (first, &hash_first);
+ hash_from_uid (second, &hash_second);
add_first = GNUNET_NO;
- if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains(pg->peers[first].connect_peers, &hash_second))
+ if (GNUNET_NO ==
+ GNUNET_CONTAINER_multihashmap_contains (pg->peers[first].connect_peers,
+ &hash_second))
{
add_first = GNUNET_YES;
}
add_second = GNUNET_NO;
- if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains(pg->peers[second].connect_peers, &hash_first))
+ if (GNUNET_NO ==
+ GNUNET_CONTAINER_multihashmap_contains (pg->peers[second].connect_peers,
+ &hash_first))
{
add_second = GNUNET_YES;
}
added = 0;
if (add_first)
{
- GNUNET_assert(GNUNET_OK == GNUNET_CONTAINER_multihashmap_put(pg->peers[first].connect_peers, &hash_second, pg->peers[second].daemon, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (pg->
+ peers
+ [first].connect_peers,
+ &hash_second,
+ pg->
+ peers[second].daemon,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
pg->peers[first].num_connections++;
added++;
}
if (add_second)
{
- GNUNET_assert(GNUNET_OK == GNUNET_CONTAINER_multihashmap_put(pg->peers[second].connect_peers, &hash_first, pg->peers[first].daemon, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (pg->
+ peers
+ [second].connect_peers,
+ &hash_first,
+ pg->
+ peers[first].daemon,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
pg->peers[second].num_connections++;
added++;
}
*
*/
static unsigned int
-add_allowed_connections(struct GNUNET_TESTING_PeerGroup *pg, unsigned int first, unsigned int second)
+add_allowed_connections (struct GNUNET_TESTING_PeerGroup *pg,
+ unsigned int first, unsigned int second)
{
int added;
#if OLD
GNUNET_HashCode hash_first;
GNUNET_HashCode hash_second;
- hash_from_uid(first, &hash_first);
- hash_from_uid(second, &hash_second);
+ hash_from_uid (first, &hash_first);
+ hash_from_uid (second, &hash_second);
add_first = GNUNET_NO;
- if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains(pg->peers[first].allowed_peers, &hash_second))
+ if (GNUNET_NO ==
+ GNUNET_CONTAINER_multihashmap_contains (pg->peers[first].allowed_peers,
+ &hash_second))
{
add_first = GNUNET_YES;
}
add_second = GNUNET_NO;
- if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains(pg->peers[second].allowed_peers, &hash_first))
+ if (GNUNET_NO ==
+ GNUNET_CONTAINER_multihashmap_contains (pg->peers[second].allowed_peers,
+ &hash_first))
{
add_second = GNUNET_YES;
}
added = 0;
if (add_first)
{
- GNUNET_assert(GNUNET_OK == GNUNET_CONTAINER_multihashmap_put(pg->peers[first].allowed_peers, &hash_second, pg->peers[second].daemon, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (pg->
+ peers
+ [first].allowed_peers,
+ &hash_second,
+ pg->
+ peers[second].daemon,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
#if OLD
- new_first = GNUNET_malloc(sizeof(struct PeerConnection));
+ new_first = GNUNET_malloc (sizeof (struct PeerConnection));
new_first->daemon = pg->peers[second].daemon;
new_first->next = pg->peers[first].connected_peers;
pg->peers[first].connected_peers = new_first;
if (add_second)
{
- GNUNET_assert(GNUNET_OK == GNUNET_CONTAINER_multihashmap_put(pg->peers[second].allowed_peers, &hash_first, pg->peers[first].daemon, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (pg->
+ peers
+ [second].allowed_peers,
+ &hash_first,
+ pg->
+ peers[first].daemon,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
#if OLD
- new_second = GNUNET_malloc(sizeof(struct PeerConnection));
+ new_second = GNUNET_malloc (sizeof (struct PeerConnection));
new_second->daemon = pg->peers[first].daemon;
new_second->next = pg->peers[second].connected_peers;
pg->peers[second].connected_peers = new_second;
*
*/
static unsigned int
-blacklist_connections(struct GNUNET_TESTING_PeerGroup *pg, unsigned int first, unsigned int second)
+blacklist_connections (struct GNUNET_TESTING_PeerGroup *pg,
+ unsigned int first, unsigned int second)
{
int added;
int add_first;
GNUNET_HashCode hash_first;
GNUNET_HashCode hash_second;
- hash_from_uid(first, &hash_first);
- hash_from_uid(second, &hash_second);
+ hash_from_uid (first, &hash_first);
+ hash_from_uid (second, &hash_second);
add_first = GNUNET_NO;
- if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains(pg->peers[first].blacklisted_peers, &hash_second))
+ if (GNUNET_NO ==
+ GNUNET_CONTAINER_multihashmap_contains (pg->
+ peers[first].blacklisted_peers,
+ &hash_second))
{
add_first = GNUNET_YES;
}
add_second = GNUNET_NO;
- if (GNUNET_NO == GNUNET_CONTAINER_multihashmap_contains(pg->peers[second].blacklisted_peers, &hash_first))
+ if (GNUNET_NO ==
+ GNUNET_CONTAINER_multihashmap_contains (pg->
+ peers[second].blacklisted_peers,
+ &hash_first))
{
add_second = GNUNET_YES;
}
added = 0;
if (add_first)
{
- GNUNET_assert(GNUNET_OK == GNUNET_CONTAINER_multihashmap_put(pg->peers[first].blacklisted_peers, &hash_second, pg->peers[second].daemon, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (pg->
+ peers
+ [first].blacklisted_peers,
+ &hash_second,
+ pg->
+ peers[second].daemon,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
pg->peers[first].num_connections++;
added++;
}
if (add_second)
{
- GNUNET_assert(GNUNET_OK == GNUNET_CONTAINER_multihashmap_put(pg->peers[second].blacklisted_peers, &hash_first, pg->peers[first].daemon, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (pg->
+ peers
+ [second].blacklisted_peers,
+ &hash_first,
+ pg->
+ peers[first].daemon,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
pg->peers[second].num_connections++;
added++;
}
*
*/
static unsigned int
-unblacklist_connections(struct GNUNET_TESTING_PeerGroup *pg, unsigned int first, unsigned int second)
+unblacklist_connections (struct GNUNET_TESTING_PeerGroup *pg,
+ unsigned int first, unsigned int second)
{
int removed;
int remove_first;
GNUNET_HashCode hash_first;
GNUNET_HashCode hash_second;
- hash_from_uid(first, &hash_first);
- hash_from_uid(second, &hash_second);
+ hash_from_uid (first, &hash_first);
+ hash_from_uid (second, &hash_second);
- remove_first = GNUNET_CONTAINER_multihashmap_contains(pg->peers[first].blacklisted_peers, &hash_second);
- remove_second = GNUNET_CONTAINER_multihashmap_contains(pg->peers[second].blacklisted_peers, &hash_first);
+ remove_first =
+ GNUNET_CONTAINER_multihashmap_contains (pg->
+ peers[first].blacklisted_peers,
+ &hash_second);
+ remove_second =
+ GNUNET_CONTAINER_multihashmap_contains (pg->
+ peers[second].blacklisted_peers,
+ &hash_first);
removed = 0;
if (remove_first)
{
- GNUNET_assert(GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove(pg->peers[first].blacklisted_peers, &hash_second, pg->peers[second].daemon));
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (pg->
+ peers
+ [first].blacklisted_peers,
+ &hash_second,
+ pg->
+ peers
+ [second].daemon));
removed++;
}
if (remove_second)
{
- GNUNET_assert(GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove(pg->peers[second].blacklisted_peers, &hash_first, pg->peers[first].daemon));
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (pg->
+ peers
+ [second].blacklisted_peers,
+ &hash_first,
+ pg->
+ peers
+ [first].daemon));
removed++;
}
* @return the number of connections created
*/
static unsigned int
-create_scale_free (struct GNUNET_TESTING_PeerGroup *pg, GNUNET_TESTING_ConnectionProcessor proc)
+create_scale_free (struct GNUNET_TESTING_PeerGroup *pg,
+ GNUNET_TESTING_ConnectionProcessor proc)
{
unsigned int total_connections;
double random;
double probability;
- GNUNET_assert(pg->total > 1);
+ GNUNET_assert (pg->total > 1);
/* Add a connection between the first two nodes */
- total_connections = proc(pg, 0, 1);
+ total_connections = proc (pg, 0, 1);
for (outer_count = 1; outer_count < pg->total; outer_count++)
{
previous_total_connections = total_connections;
for (i = 0; i < outer_count; i++)
{
- probability = pg->peers[i].num_connections / (double)previous_total_connections;
- random = ((double) GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_WEAK,
- UINT64_MAX)) / ( (double) UINT64_MAX);
+ probability =
+ pg->peers[i].num_connections /
+ (double) previous_total_connections;
+ random =
+ ((double)
+ GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
+ UINT64_MAX)) / ((double) UINT64_MAX);
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Considering connecting peer %d to peer %d\n",
{
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Connecting peer %d to peer %d\n",
- outer_count, i);
+ "Connecting peer %d to peer %d\n", outer_count, i);
#endif
- total_connections += proc(pg, outer_count, i);
+ total_connections += proc (pg, outer_count, i);
}
}
}
*
*/
static unsigned int
-create_small_world_ring(struct GNUNET_TESTING_PeerGroup *pg, GNUNET_TESTING_ConnectionProcessor proc)
+create_small_world_ring (struct GNUNET_TESTING_PeerGroup *pg,
+ GNUNET_TESTING_ConnectionProcessor proc)
{
unsigned int i, j;
int nodeToConnect;
unsigned int useAnd;
int connect_attempts;
- logNModifier = 0.5; /* FIXME: default value? */
- if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(pg->cfg,
- "TESTING",
- "LOGNMODIFIER",
- &p_string))
- {
- if (sscanf(p_string, "%lf", &logNModifier) != 1)
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Invalid value `%s' for option `%s' in section `%s': expected float\n"),
- p_string,
- "LOGNMODIFIER",
- "TESTING");
+ logNModifier = 0.5; /* FIXME: default value? */
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (pg->cfg,
+ "TESTING",
+ "LOGNMODIFIER",
+ &p_string))
+ {
+ if (sscanf (p_string, "%lf", &logNModifier) != 1)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _
+ ("Invalid value `%s' for option `%s' in section `%s': expected float\n"),
+ p_string, "LOGNMODIFIER", "TESTING");
GNUNET_free (p_string);
}
- percentage = 0.5; /* FIXME: default percentage? */
- if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(pg->cfg,
- "TESTING",
- "PERCENTAGE",
- &p_string))
- {
- if (sscanf(p_string, "%lf", &percentage) != 1)
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Invalid value `%s' for option `%s' in section `%s': expected float\n"),
- p_string,
- "PERCENTAGE",
- "TESTING");
+ percentage = 0.5; /* FIXME: default percentage? */
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (pg->cfg,
+ "TESTING",
+ "PERCENTAGE",
+ &p_string))
+ {
+ if (sscanf (p_string, "%lf", &percentage) != 1)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _
+ ("Invalid value `%s' for option `%s' in section `%s': expected float\n"),
+ p_string, "PERCENTAGE", "TESTING");
GNUNET_free (p_string);
}
natLog = log (pg->total);
for (j = 0; j < connsPerPeer / 2; j++)
{
- random = ((double) GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_WEAK,
- UINT64_MAX) / ( (double) UINT64_MAX));
+ random =
+ ((double)
+ GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
+ UINT64_MAX) / ((double) UINT64_MAX));
if (random < percentage)
{
/* Connect to uniformly selected random peer */
randomPeer =
GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
- pg->total);
+ pg->total);
while ((((randomPeer < max) && (randomPeer > min))
&& (useAnd == 0)) || (((randomPeer > min)
|| (randomPeer < max))
&& (useAnd == 1)))
{
randomPeer =
- GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
- pg->total);
+ GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+ pg->total);
}
- smallWorldConnections +=
- proc (pg, i, randomPeer);
+ smallWorldConnections += proc (pg, i, randomPeer);
}
else
{
{
nodeToConnect = nodeToConnect - pg->total;
}
- connect_attempts +=
- proc (pg, i, nodeToConnect);
+ connect_attempts += proc (pg, i, nodeToConnect);
}
}
*
*/
static unsigned int
-create_nated_internet (struct GNUNET_TESTING_PeerGroup *pg, GNUNET_TESTING_ConnectionProcessor proc)
+create_nated_internet (struct GNUNET_TESTING_PeerGroup *pg,
+ GNUNET_TESTING_ConnectionProcessor proc)
{
unsigned int outer_count, inner_count;
unsigned int cutoff;
double nat_percentage;
char *p_string;
- nat_percentage = 0.6; /* FIXME: default percentage? */
- if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(pg->cfg,
- "TESTING",
- "NATPERCENTAGE",
- &p_string))
- {
- if (sscanf(p_string, "%lf", &nat_percentage) != 1)
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Invalid value `%s' for option `%s' in section `%s': expected float\n"),
- p_string,
- "NATPERCENTAGE",
- "TESTING");
+ nat_percentage = 0.6; /* FIXME: default percentage? */
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (pg->cfg,
+ "TESTING",
+ "NATPERCENTAGE",
+ &p_string))
+ {
+ if (sscanf (p_string, "%lf", &nat_percentage) != 1)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _
+ ("Invalid value `%s' for option `%s' in section `%s': expected float\n"),
+ p_string, "NATPERCENTAGE", "TESTING");
GNUNET_free (p_string);
}
"Connecting peer %d to peer %d\n",
outer_count, inner_count);
#endif
- connect_attempts += proc(pg, outer_count, inner_count);
+ connect_attempts += proc (pg, outer_count, inner_count);
}
}
}
*
*/
static unsigned int
-create_small_world (struct GNUNET_TESTING_PeerGroup *pg, GNUNET_TESTING_ConnectionProcessor proc)
+create_small_world (struct GNUNET_TESTING_PeerGroup *pg,
+ GNUNET_TESTING_ConnectionProcessor proc)
{
unsigned int i, j, k;
unsigned int square;
rows = square;
cols = square;
- percentage = 0.5; /* FIXME: default percentage? */
- if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(pg->cfg,
- "TESTING",
- "PERCENTAGE",
- &p_string))
- {
- if (sscanf(p_string, "%lf", &percentage) != 1)
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Invalid value `%s' for option `%s' in section `%s': expected float\n"),
- p_string,
- "PERCENTAGE",
- "TESTING");
+ percentage = 0.5; /* FIXME: default percentage? */
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (pg->cfg,
+ "TESTING",
+ "PERCENTAGE",
+ &p_string))
+ {
+ if (sscanf (p_string, "%lf", &percentage) != 1)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _
+ ("Invalid value `%s' for option `%s' in section `%s': expected float\n"),
+ p_string, "PERCENTAGE", "TESTING");
GNUNET_free (p_string);
}
if (percentage < 0.0)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Invalid value `%s' for option `%s' in section `%s': got %f, needed value greater than 0\n"),
+ _
+ ("Invalid value `%s' for option `%s' in section `%s': got %f, needed value greater than 0\n"),
"PERCENTAGE", "TESTING", percentage);
percentage = 0.5;
}
- probability = 0.5; /* FIXME: default percentage? */
- if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(pg->cfg,
- "TESTING",
- "PROBABILITY",
- &p_string))
- {
- if (sscanf(p_string, "%lf", &probability) != 1)
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Invalid value `%s' for option `%s' in section `%s': expected float\n"),
- p_string,
- "PROBABILITY",
- "TESTING");
+ probability = 0.5; /* FIXME: default percentage? */
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (pg->cfg,
+ "TESTING",
+ "PROBABILITY",
+ &p_string))
+ {
+ if (sscanf (p_string, "%lf", &probability) != 1)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _
+ ("Invalid value `%s' for option `%s' in section `%s': expected float\n"),
+ p_string, "PROBABILITY", "TESTING");
GNUNET_free (p_string);
}
if (square * square != pg->total)
}
}
#if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Connecting nodes in 2d torus topology: %u rows %u columns\n"),
- rows, cols);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _
+ ("Connecting nodes in 2d torus topology: %u rows %u columns\n"),
+ rows, cols);
#endif
connect_attempts = 0;
#if VERBOSE_TESTING > 2
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("natural log of %d is %d, will run %d iterations\n"),
- pg->total, natLog, (int) (natLog * percentage));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Total connections added thus far: %u!\n"), connect_attempts);
+ pg->total, natLog, (int) (natLog * percentage));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Total connections added thus far: %u!\n"), connect_attempts);
#endif
smallWorldConnections = 0;
- small_world_it = (unsigned int)(natLog * percentage);
+ small_world_it = (unsigned int) (natLog * percentage);
if (small_world_it < 1)
small_world_it = 1;
- GNUNET_assert(small_world_it > 0 && small_world_it < (unsigned int)-1);
+ GNUNET_assert (small_world_it > 0 && small_world_it < (unsigned int) -1);
for (i = 0; i < small_world_it; i++)
{
for (j = 0; j < pg->total; j++)
node2Row = k / cols;
node2Col = k - (node2Row * cols);
/* Simple Cartesian distance */
- distance = abs (node1Row - node2Row) + abs (node1Col - node2Col);
+ distance =
+ abs (node1Row - node2Row) + abs (node1Col - node2Col);
if (distance > 1)
{
/* Calculate probability as 1 over the square of the distance */
probability = 1.0 / (distance * distance);
/* Choose a random value between 0 and 1 */
- random = ((double) GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_WEAK,
- UINT64_MAX)) / ( (double) UINT64_MAX);
+ random =
+ ((double)
+ GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
+ UINT64_MAX)) /
+ ((double) UINT64_MAX);
/* If random < probability, then connect the two nodes */
if (random < probability)
smallWorldConnections += proc (pg, j, k);
}
connect_attempts += smallWorldConnections;
#if VERBOSE_TESTING > 2
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Total connections added for small world: %d!\n"),
- smallWorldConnections);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Total connections added for small world: %d!\n"),
+ smallWorldConnections);
#endif
return connect_attempts;
}
*
*/
static unsigned int
-create_erdos_renyi (struct GNUNET_TESTING_PeerGroup *pg, GNUNET_TESTING_ConnectionProcessor proc)
+create_erdos_renyi (struct GNUNET_TESTING_PeerGroup *pg,
+ GNUNET_TESTING_ConnectionProcessor proc)
{
double temp_rand;
unsigned int outer_count;
double probability;
char *p_string;
- probability = 0.5; /* FIXME: default percentage? */
- if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(pg->cfg,
- "TESTING",
- "PROBABILITY",
- &p_string))
- {
- if (sscanf(p_string, "%lf", &probability) != 1)
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Invalid value `%s' for option `%s' in section `%s': expected float\n"),
- p_string,
- "PROBABILITY",
- "TESTING");
+ probability = 0.5; /* FIXME: default percentage? */
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (pg->cfg,
+ "TESTING",
+ "PROBABILITY",
+ &p_string))
+ {
+ if (sscanf (p_string, "%lf", &probability) != 1)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _
+ ("Invalid value `%s' for option `%s' in section `%s': expected float\n"),
+ p_string, "PROBABILITY", "TESTING");
GNUNET_free (p_string);
}
connect_attempts = 0;
for (inner_count = outer_count + 1; inner_count < pg->total;
inner_count++)
{
- temp_rand = ((double) GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_WEAK,
- UINT64_MAX)) / ( (double) UINT64_MAX);
+ temp_rand =
+ ((double)
+ GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
+ UINT64_MAX)) / ((double) UINT64_MAX);
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("rand is %f probability is %f\n"), temp_rand,
*
*/
static unsigned int
-create_2d_torus (struct GNUNET_TESTING_PeerGroup *pg, GNUNET_TESTING_ConnectionProcessor proc)
+create_2d_torus (struct GNUNET_TESTING_PeerGroup *pg,
+ GNUNET_TESTING_ConnectionProcessor proc)
{
unsigned int i;
unsigned int square;
}
}
#if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Connecting nodes in 2d torus topology: %u rows %u columns\n"),
- rows, cols);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _
+ ("Connecting nodes in 2d torus topology: %u rows %u columns\n"),
+ rows, cols);
#endif
/* Rows and columns are all sorted out, now iterate over all nodes and connect each
* to the node to its right and above. Once this is over, we'll have our torus!
else
nodeToConnect = i - cols + 1;
#if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Connecting peer %d to peer %d\n",
- i, nodeToConnect);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Connecting peer %d to peer %d\n", i, nodeToConnect);
#endif
- connect_attempts += proc(pg, i, nodeToConnect);
+ connect_attempts += proc (pg, i, nodeToConnect);
/* Second connect to the node immediately above */
if (i < cols)
{
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Connecting peer %d to peer %d\n",
- i, nodeToConnect);
+ "Connecting peer %d to peer %d\n", i, nodeToConnect);
#endif
- connect_attempts += proc(pg, i, nodeToConnect);
+ connect_attempts += proc (pg, i, nodeToConnect);
}
}
*
*/
static unsigned int
-create_clique (struct GNUNET_TESTING_PeerGroup *pg, GNUNET_TESTING_ConnectionProcessor proc)
+create_clique (struct GNUNET_TESTING_PeerGroup *pg,
+ GNUNET_TESTING_ConnectionProcessor proc)
{
unsigned int outer_count;
unsigned int inner_count;
"Connecting peer %d to peer %d\n",
outer_count, inner_count);
#endif
- connect_attempts += proc(pg, outer_count, inner_count);
+ connect_attempts += proc (pg, outer_count, inner_count);
}
}
*
*/
static unsigned int
-create_line (struct GNUNET_TESTING_PeerGroup *pg, GNUNET_TESTING_ConnectionProcessor proc)
+create_line (struct GNUNET_TESTING_PeerGroup *pg,
+ GNUNET_TESTING_ConnectionProcessor proc)
{
unsigned int count;
int connect_attempts;
for (count = 0; count < pg->total - 1; count++)
{
#if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Connecting peer %d to peer %d\n",
- count, count + 1);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Connecting peer %d to peer %d\n", count, count + 1);
#endif
- connect_attempts += proc(pg, count, count + 1);
+ connect_attempts += proc (pg, count, count + 1);
}
return connect_attempts;
*
*/
static unsigned int
-create_ring (struct GNUNET_TESTING_PeerGroup *pg, GNUNET_TESTING_ConnectionProcessor proc)
+create_ring (struct GNUNET_TESTING_PeerGroup *pg,
+ GNUNET_TESTING_ConnectionProcessor proc)
{
unsigned int count;
int connect_attempts;
for (count = 0; count < pg->total - 1; count++)
{
#if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Connecting peer %d to peer %d\n",
- count, count + 1);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Connecting peer %d to peer %d\n", count, count + 1);
#endif
- connect_attempts += proc(pg, count, count + 1);
+ connect_attempts += proc (pg, count, count + 1);
}
/* Connect the last peer to the first peer */
- connect_attempts += proc(pg, pg->total - 1, 0);
+ connect_attempts += proc (pg, pg->total - 1, 0);
return connect_attempts;
}
* "fixing" now.
*/
static int
-friend_file_iterator (void *cls,
- const GNUNET_HashCode * key,
- void *value)
+friend_file_iterator (void *cls, const GNUNET_HashCode * key, void *value)
{
FILE *temp_friend_handle = cls;
struct GNUNET_TESTING_Daemon *peer = value;
struct GNUNET_CRYPTO_HashAsciiEncoded peer_enc;
temppeer = &peer->id;
- GNUNET_CRYPTO_hash_to_enc(&temppeer->hashPubKey, &peer_enc);
- fprintf(temp_friend_handle, "%s\n", (char *)&peer_enc);
+ GNUNET_CRYPTO_hash_to_enc (&temppeer->hashPubKey, &peer_enc);
+ fprintf (temp_friend_handle, "%s\n", (char *) &peer_enc);
return GNUNET_YES;
}
* @return GNUNET_YES to continue iteration
*/
static int
-blacklist_file_iterator (void *cls,
- const GNUNET_HashCode * key,
- void *value)
+blacklist_file_iterator (void *cls, const GNUNET_HashCode * key, void *value)
{
struct BlacklistContext *blacklist_ctx = cls;
//FILE *temp_blacklist_handle = cls;
struct GNUNET_CRYPTO_HashAsciiEncoded peer_enc;
temppeer = &peer->id;
- GNUNET_CRYPTO_hash_to_enc(&temppeer->hashPubKey, &peer_enc);
- fprintf(blacklist_ctx->temp_file_handle, "%s:%s\n", blacklist_ctx->transport, (char *)&peer_enc);
+ GNUNET_CRYPTO_hash_to_enc (&temppeer->hashPubKey, &peer_enc);
+ fprintf (blacklist_ctx->temp_file_handle, "%s:%s\n",
+ blacklist_ctx->transport, (char *) &peer_enc);
return GNUNET_YES;
}
char *temp_service_path;
struct GNUNET_OS_Process **procarr;
char *arg;
- char * mytemp;
+ char *mytemp;
enum GNUNET_OS_ProcessStatusType type;
unsigned long return_code;
int count;
int ret;
int max_wait = 10;
- procarr = GNUNET_malloc(sizeof(struct GNUNET_OS_Process *) * pg->total);
+ procarr = GNUNET_malloc (sizeof (struct GNUNET_OS_Process *) * pg->total);
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
- mytemp = GNUNET_DISK_mktemp("friends");
- GNUNET_assert(mytemp != NULL);
+ mytemp = GNUNET_DISK_mktemp ("friends");
+ GNUNET_assert (mytemp != NULL);
temp_friend_handle = fopen (mytemp, "wt");
- GNUNET_assert(temp_friend_handle != NULL);
- GNUNET_CONTAINER_multihashmap_iterate(pg->peers[pg_iter].allowed_peers, &friend_file_iterator, temp_friend_handle);
- fclose(temp_friend_handle);
+ GNUNET_assert (temp_friend_handle != NULL);
+ GNUNET_CONTAINER_multihashmap_iterate (pg->peers[pg_iter].allowed_peers,
+ &friend_file_iterator,
+ temp_friend_handle);
+ fclose (temp_friend_handle);
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string(pg->peers[pg_iter].daemon->cfg, "PATHS", "SERVICEHOME", &temp_service_path))
- {
+ GNUNET_CONFIGURATION_get_value_string (pg->peers[pg_iter].
+ daemon->cfg, "PATHS",
+ "SERVICEHOME",
+ &temp_service_path))
+ {
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("No `%s' specified in peer configuration in section `%s', cannot copy friends file!\n"),
- "SERVICEHOME",
- "PATHS");
+ _
+ ("No `%s' specified in peer configuration in section `%s', cannot copy friends file!\n"),
+ "SERVICEHOME", "PATHS");
if (UNLINK (mytemp) != 0)
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", mytemp);
- GNUNET_free (mytemp);
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink",
+ mytemp);
+ GNUNET_free (mytemp);
break;
}
- if (pg->peers[pg_iter].daemon->hostname == NULL) /* Local, just copy the file */
+ if (pg->peers[pg_iter].daemon->hostname == NULL) /* Local, just copy the file */
{
GNUNET_asprintf (&arg, "%s/friends", temp_service_path);
procarr[pg_iter] = GNUNET_OS_start_process (NULL, NULL, "mv",
- "mv", mytemp, arg, NULL);
+ "mv", mytemp, arg,
+ NULL);
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Copying file with command cp %s %s\n"), mytemp, arg);
#endif
- GNUNET_free(arg);
+ GNUNET_free (arg);
}
- else /* Remote, scp the file to the correct place */
+ else /* Remote, scp the file to the correct place */
{
if (NULL != pg->peers[pg_iter].daemon->username)
- GNUNET_asprintf (&arg, "%s@%s:%s/friends", pg->peers[pg_iter].daemon->username, pg->peers[pg_iter].daemon->hostname, temp_service_path);
+ GNUNET_asprintf (&arg, "%s@%s:%s/friends",
+ pg->peers[pg_iter].daemon->username,
+ pg->peers[pg_iter].daemon->hostname,
+ temp_service_path);
else
- GNUNET_asprintf (&arg, "%s:%s/friends", pg->peers[pg_iter].daemon->hostname, temp_service_path);
- procarr[pg_iter] = GNUNET_OS_start_process (NULL, NULL, "scp",
- "scp", mytemp, arg, NULL);
+ GNUNET_asprintf (&arg, "%s:%s/friends",
+ pg->peers[pg_iter].daemon->hostname,
+ temp_service_path);
+ procarr[pg_iter] =
+ GNUNET_OS_start_process (NULL, NULL, "scp", "scp", mytemp, arg,
+ NULL);
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Copying file with command scp %s %s\n"), mytemp, arg);
+ _("Copying file with command scp %s %s\n"), mytemp,
+ arg);
#endif
- GNUNET_free(arg);
+ GNUNET_free (arg);
}
GNUNET_free (temp_service_path);
GNUNET_free (mytemp);
#endif
if (procarr[pg_iter] != NULL) /* Check for already completed! */
{
- if (GNUNET_OS_process_status(procarr[pg_iter], &type, &return_code) != GNUNET_OK)
+ if (GNUNET_OS_process_status
+ (procarr[pg_iter], &type, &return_code) != GNUNET_OK)
{
ret = GNUNET_SYSERR;
}
- else if ((type != GNUNET_OS_PROCESS_EXITED) || (return_code != 0))
+ else if ((type != GNUNET_OS_PROCESS_EXITED)
+ || (return_code != 0))
{
ret = GNUNET_SYSERR;
}
GNUNET_OS_process_close (procarr[pg_iter]);
procarr[pg_iter] = NULL;
#if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("File %d copied\n"), pg_iter);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("File %d copied\n"), pg_iter);
#endif
}
}
count++;
if (ret == GNUNET_SYSERR)
{
- /* FIXME: why sleep here? -CG */
- sleep(1);
+ /* FIXME: why sleep here? -CG */
+ sleep (1);
}
}
#if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Finished copying all friend files!\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Finished copying all friend files!\n"));
#endif
- GNUNET_free(procarr);
+ GNUNET_free (procarr);
return ret;
}
* @param transports space delimited list of transports to blacklist
*/
static int
-create_and_copy_blacklist_files (struct GNUNET_TESTING_PeerGroup *pg, const char *transports)
+create_and_copy_blacklist_files (struct GNUNET_TESTING_PeerGroup *pg,
+ const char *transports)
{
FILE *temp_file_handle;
static struct BlacklistContext blacklist_ctx;
char *pos;
char *temp_transports;
- procarr = GNUNET_malloc(sizeof(struct GNUNET_OS_Process *) * pg->total);
+ procarr = GNUNET_malloc (sizeof (struct GNUNET_OS_Process *) * pg->total);
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
- mytemp = GNUNET_DISK_mktemp("blacklist");
- GNUNET_assert(mytemp != NULL);
+ mytemp = GNUNET_DISK_mktemp ("blacklist");
+ GNUNET_assert (mytemp != NULL);
temp_file_handle = fopen (mytemp, "wt");
- GNUNET_assert(temp_file_handle != NULL);
- temp_transports = GNUNET_strdup(transports);
+ GNUNET_assert (temp_file_handle != NULL);
+ temp_transports = GNUNET_strdup (transports);
blacklist_ctx.temp_file_handle = temp_file_handle;
- transport_len = strlen(temp_transports) + 1;
+ transport_len = strlen (temp_transports) + 1;
pos = NULL;
for (i = 0; i < transport_len; i++)
- {
- if ((temp_transports[i] == ' ') && (pos == NULL))
- continue; /* At start of string (whitespace) */
- else if ((temp_transports[i] == ' ') || (temp_transports[i] == '\0')) /* At end of string */
- {
- temp_transports[i] = '\0';
- blacklist_ctx.transport = pos;
- GNUNET_CONTAINER_multihashmap_iterate(pg->peers[pg_iter].blacklisted_peers, &blacklist_file_iterator, &blacklist_ctx);
- pos = NULL;
- } /* At beginning of actual string */
- else if (pos == NULL)
{
- pos = &temp_transports[i];
+ if ((temp_transports[i] == ' ') && (pos == NULL))
+ continue; /* At start of string (whitespace) */
+ else if ((temp_transports[i] == ' ') || (temp_transports[i] == '\0')) /* At end of string */
+ {
+ temp_transports[i] = '\0';
+ blacklist_ctx.transport = pos;
+ GNUNET_CONTAINER_multihashmap_iterate (pg->
+ peers
+ [pg_iter].blacklisted_peers,
+ &blacklist_file_iterator,
+ &blacklist_ctx);
+ pos = NULL;
+ } /* At beginning of actual string */
+ else if (pos == NULL)
+ {
+ pos = &temp_transports[i];
+ }
}
- }
GNUNET_free (temp_transports);
- fclose(temp_file_handle);
+ fclose (temp_file_handle);
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string(pg->peers[pg_iter].daemon->cfg, "PATHS", "SERVICEHOME", &temp_service_path))
+ GNUNET_CONFIGURATION_get_value_string (pg->peers[pg_iter].
+ daemon->cfg, "PATHS",
+ "SERVICEHOME",
+ &temp_service_path))
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("No `%s' specified in peer configuration in section `%s', cannot copy friends file!\n"),
- "SERVICEHOME",
- "PATHS");
+ _
+ ("No `%s' specified in peer configuration in section `%s', cannot copy friends file!\n"),
+ "SERVICEHOME", "PATHS");
if (UNLINK (mytemp) != 0)
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", mytemp);
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink",
+ mytemp);
GNUNET_free (mytemp);
break;
}
- if (pg->peers[pg_iter].daemon->hostname == NULL) /* Local, just copy the file */
+ if (pg->peers[pg_iter].daemon->hostname == NULL) /* Local, just copy the file */
{
GNUNET_asprintf (&arg, "%s/blacklist", temp_service_path);
procarr[pg_iter] = GNUNET_OS_start_process (NULL, NULL, "mv",
- "mv", mytemp, arg, NULL);
+ "mv", mytemp, arg,
+ NULL);
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Copying file with command cp %s %s\n"), mytemp, arg);
#endif
- GNUNET_free(arg);
+ GNUNET_free (arg);
}
- else /* Remote, scp the file to the correct place */
+ else /* Remote, scp the file to the correct place */
{
if (NULL != pg->peers[pg_iter].daemon->username)
- GNUNET_asprintf (&arg, "%s@%s:%s/blacklist", pg->peers[pg_iter].daemon->username, pg->peers[pg_iter].daemon->hostname, temp_service_path);
+ GNUNET_asprintf (&arg, "%s@%s:%s/blacklist",
+ pg->peers[pg_iter].daemon->username,
+ pg->peers[pg_iter].daemon->hostname,
+ temp_service_path);
else
- GNUNET_asprintf (&arg, "%s:%s/blacklist", pg->peers[pg_iter].daemon->hostname, temp_service_path);
- procarr[pg_iter] = GNUNET_OS_start_process (NULL, NULL, "scp",
- "scp", mytemp, arg, NULL);
+ GNUNET_asprintf (&arg, "%s:%s/blacklist",
+ pg->peers[pg_iter].daemon->hostname,
+ temp_service_path);
+ procarr[pg_iter] =
+ GNUNET_OS_start_process (NULL, NULL, "scp", "scp", mytemp, arg,
+ NULL);
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Copying file with command scp %s %s\n"), mytemp, arg);
+ _("Copying file with command scp %s %s\n"), mytemp,
+ arg);
#endif
- GNUNET_free(arg);
+ GNUNET_free (arg);
}
GNUNET_free (temp_service_path);
GNUNET_free (mytemp);
#endif
if (procarr[pg_iter] != NULL) /* Check for already completed! */
{
- if (GNUNET_OS_process_status(procarr[pg_iter], &type, &return_code) != GNUNET_OK)
+ if (GNUNET_OS_process_status
+ (procarr[pg_iter], &type, &return_code) != GNUNET_OK)
{
ret = GNUNET_SYSERR;
}
- else if ((type != GNUNET_OS_PROCESS_EXITED) || (return_code != 0))
+ else if ((type != GNUNET_OS_PROCESS_EXITED)
+ || (return_code != 0))
{
ret = GNUNET_SYSERR;
}
GNUNET_OS_process_close (procarr[pg_iter]);
procarr[pg_iter] = NULL;
#if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("File %d copied\n"), pg_iter);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("File %d copied\n"), pg_iter);
#endif
}
}
count++;
if (ret == GNUNET_SYSERR)
{
- /* FIXME: why sleep here? -CG */
- sleep(1);
+ /* FIXME: why sleep here? -CG */
+ sleep (1);
}
}
#if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Finished copying all blacklist files!\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Finished copying all blacklist files!\n"));
#endif
- GNUNET_free(procarr);
+ GNUNET_free (procarr);
return ret;
}
* Internal notification of a connection, kept so that we can ensure some connections
* happen instead of flooding all testing daemons with requests to connect.
*/
-static void internal_connect_notify (void *cls,
- const struct GNUNET_PeerIdentity *first,
- const struct GNUNET_PeerIdentity *second,
- uint32_t distance,
- 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)
+static void
+internal_connect_notify (void *cls,
+ const struct GNUNET_PeerIdentity *first,
+ const struct GNUNET_PeerIdentity *second,
+ uint32_t distance,
+ 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 ConnectTopologyContext *ct_ctx = cls;
struct GNUNET_TESTING_PeerGroup *pg = ct_ctx->pg;
if (ct_ctx->remaining_connections == 0)
{
if (ct_ctx->notify_connections_done != NULL)
- ct_ctx->notify_connections_done(ct_ctx->notify_cls, NULL);
- GNUNET_free(ct_ctx);
+ ct_ctx->notify_connections_done (ct_ctx->notify_cls, NULL);
+ GNUNET_free (ct_ctx);
}
if (pg->notify_connection != NULL)
- pg->notify_connection (pg->notify_connection_cls, first, second, distance, first_cfg, second_cfg, first_daemon, second_daemon, emsg);
+ pg->notify_connection (pg->notify_connection_cls, first, second, distance,
+ first_cfg, second_cfg, first_daemon, second_daemon,
+ emsg);
}
* @param cls a connection context
* @param tc the task runtime context
*/
-static void schedule_connect(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+static void
+schedule_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct ConnectContext *connect_context = cls;
if (outstanding_connects > MAX_OUTSTANDING_CONNECTIONS)
{
#if VERBOSE_TESTING > 2
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Delaying connect, we have too many outstanding connections!\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _
+ ("Delaying connect, we have too many outstanding connections!\n"));
#endif
- GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 100), &schedule_connect, connect_context);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_MILLISECONDS, 100),
+ &schedule_connect, connect_context);
}
else
{
#if VERBOSE_TESTING > 2
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Creating connection, outstanding_connections is %d\n"), outstanding_connects);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Creating connection, outstanding_connections is %d\n"),
+ outstanding_connects);
#endif
outstanding_connects++;
GNUNET_TESTING_daemons_connect (connect_context->first,
CONNECT_ATTEMPTS,
&internal_connect_notify,
connect_context->ct_ctx);
- GNUNET_free(connect_context);
+ GNUNET_free (connect_context);
}
}
* @return GNUNET_YES to continue iteration
*/
static int
-connect_iterator (void *cls,
- const GNUNET_HashCode * key,
- void *value)
+connect_iterator (void *cls, const GNUNET_HashCode * key, void *value)
{
struct ConnectTopologyContext *ct_ctx = cls;
struct PeerData *first = ct_ctx->first;
struct GNUNET_TESTING_Daemon *second = value;
struct ConnectContext *connect_context;
- connect_context = GNUNET_malloc(sizeof(struct ConnectContext));
+ connect_context = GNUNET_malloc (sizeof (struct ConnectContext));
connect_context->first = first->daemon;
connect_context->second = second;
connect_context->ct_ctx = ct_ctx;
- GNUNET_SCHEDULER_add_now(&schedule_connect, connect_context);
+ GNUNET_SCHEDULER_add_now (&schedule_connect, connect_context);
return GNUNET_YES;
}
* @return GNUNET_YES to continue iteration
*/
static int
-copy_topology_iterator (void *cls,
- const GNUNET_HashCode * key,
- void *value)
+copy_topology_iterator (void *cls, const GNUNET_HashCode * key, void *value)
{
struct PeerData *first = cls;
- GNUNET_assert(GNUNET_OK == GNUNET_CONTAINER_multihashmap_put(first->connect_peers, key, value, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (first->connect_peers, key,
+ value,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
return GNUNET_YES;
}
total = 0;
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
- ret = GNUNET_CONTAINER_multihashmap_iterate(pg->peers[pg_iter].allowed_peers, ©_topology_iterator, &pg->peers[pg_iter]);
+ ret =
+ GNUNET_CONTAINER_multihashmap_iterate (pg->
+ peers[pg_iter].allowed_peers,
+ ©_topology_iterator,
+ &pg->peers[pg_iter]);
if (GNUNET_SYSERR == ret)
return GNUNET_SYSERR;
* @return the number of connections that will be attempted
*/
static int
-connect_topology (struct GNUNET_TESTING_PeerGroup *pg, GNUNET_TESTING_NotifyCompletion notify_callback, void *notify_cls)
+connect_topology (struct GNUNET_TESTING_PeerGroup *pg,
+ GNUNET_TESTING_NotifyCompletion notify_callback,
+ void *notify_cls)
{
unsigned int pg_iter;
int ret;
#endif
total = 0;
- ct_ctx = GNUNET_malloc(sizeof(struct ConnectTopologyContext));
+ ct_ctx = GNUNET_malloc (sizeof (struct ConnectTopologyContext));
ct_ctx->notify_connections_done = notify_callback;
ct_ctx->notify_cls = notify_cls;
ct_ctx->pg = pg;
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
- total += GNUNET_CONTAINER_multihashmap_size(pg->peers[pg_iter].connect_peers);
+ total +=
+ GNUNET_CONTAINER_multihashmap_size (pg->peers[pg_iter].connect_peers);
}
if (total == 0)
{
- GNUNET_free(ct_ctx);
+ GNUNET_free (ct_ctx);
return total;
}
ct_ctx->remaining_connections = total;
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
ct_ctx->first = &pg->peers[pg_iter];
- ret = GNUNET_CONTAINER_multihashmap_iterate(pg->peers[pg_iter].connect_peers, &connect_iterator, ct_ctx);
- GNUNET_assert(GNUNET_SYSERR != ret && ret >= 0);
+ ret =
+ GNUNET_CONTAINER_multihashmap_iterate (pg->
+ peers[pg_iter].connect_peers,
+ &connect_iterator, ct_ctx);
+ GNUNET_assert (GNUNET_SYSERR != ret && ret >= 0);
total = total + ret;
#if OLD
connection_iter = FIXME;
while (connection_iter != NULL)
{
- connect_context = GNUNET_malloc(sizeof(struct ConnectContext));
+ connect_context = GNUNET_malloc (sizeof (struct ConnectContext));
connect_context->pg = pg;
connect_context->first = FIXME;
connect_context->second = connection_iter->daemon;
- GNUNET_SCHEDULER_add_now(&schedule_connect, connect_context);
+ GNUNET_SCHEDULER_add_now (&schedule_connect, connect_context);
connection_iter = connection_iter->next;
}
#endif
unsigned int
GNUNET_TESTING_create_topology (struct GNUNET_TESTING_PeerGroup *pg,
enum GNUNET_TESTING_Topology topology,
- enum GNUNET_TESTING_Topology restrict_topology,
+ enum GNUNET_TESTING_Topology
+ restrict_topology,
const char *restrict_transports)
{
int ret;
{
case GNUNET_TESTING_TOPOLOGY_CLIQUE:
#if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Creating clique topology\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Creating clique topology\n"));
#endif
num_connections = create_clique (pg, &add_allowed_connections);
break;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating small world (ring) topology\n"));
#endif
- num_connections = create_small_world_ring (pg, &add_allowed_connections);
+ num_connections =
+ create_small_world_ring (pg, &add_allowed_connections);
break;
case GNUNET_TESTING_TOPOLOGY_SMALL_WORLD:
#if VERBOSE_TESTING
break;
case GNUNET_TESTING_TOPOLOGY_RING:
#if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Creating ring topology\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Creating ring topology\n"));
#endif
num_connections = create_ring (pg, &add_allowed_connections);
break;
case GNUNET_TESTING_TOPOLOGY_2D_TORUS:
#if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Creating 2d torus topology\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Creating 2d torus topology\n"));
#endif
num_connections = create_2d_torus (pg, &add_allowed_connections);
break;
break;
case GNUNET_TESTING_TOPOLOGY_INTERNAT:
#if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Creating InterNAT topology\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Creating InterNAT topology\n"));
#endif
num_connections = create_nated_internet (pg, &add_allowed_connections);
break;
case GNUNET_TESTING_TOPOLOGY_NONE:
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Creating no allowed topology (all peers can connect at core level)\n"));
+ _
+ ("Creating no allowed topology (all peers can connect at core level)\n"));
#endif
num_connections = 0;
break;
break;
}
- if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (pg->cfg, "TESTING", "F2F"))
+ if (GNUNET_YES ==
+ GNUNET_CONFIGURATION_get_value_yesno (pg->cfg, "TESTING", "F2F"))
{
- ret = create_and_copy_friend_files(pg);
+ ret = create_and_copy_friend_files (pg);
if (ret != GNUNET_OK)
{
#if VERBOSE_TESTING
else
{
#if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Friend files created/copied successfully!\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Friend files created/copied successfully!\n"));
#endif
}
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Blacklisting all but clique topology\n"));
#endif
- unblacklisted_connections = create_clique (pg, &unblacklist_connections);
+ unblacklisted_connections =
+ create_clique (pg, &unblacklist_connections);
break;
case GNUNET_TESTING_TOPOLOGY_SMALL_WORLD_RING:
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Blacklisting all but small world (ring) topology\n"));
#endif
- unblacklisted_connections = create_small_world_ring (pg, &unblacklist_connections);
+ unblacklisted_connections =
+ create_small_world_ring (pg, &unblacklist_connections);
break;
case GNUNET_TESTING_TOPOLOGY_SMALL_WORLD:
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Blacklisting all but small world (2d-torus) topology\n"));
+ _
+ ("Blacklisting all but small world (2d-torus) topology\n"));
#endif
- unblacklisted_connections = create_small_world (pg, &unblacklist_connections);
+ unblacklisted_connections =
+ create_small_world (pg, &unblacklist_connections);
break;
case GNUNET_TESTING_TOPOLOGY_RING:
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Blacklisting all but 2d torus topology\n"));
#endif
- unblacklisted_connections = create_2d_torus (pg, &unblacklist_connections);
+ unblacklisted_connections =
+ create_2d_torus (pg, &unblacklist_connections);
break;
case GNUNET_TESTING_TOPOLOGY_ERDOS_RENYI:
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Blacklisting all but Erdos-Renyi topology\n"));
#endif
- unblacklisted_connections = create_erdos_renyi (pg, &unblacklist_connections);
+ unblacklisted_connections =
+ create_erdos_renyi (pg, &unblacklist_connections);
break;
case GNUNET_TESTING_TOPOLOGY_INTERNAT:
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Blacklisting all but InterNAT topology\n"));
#endif
- unblacklisted_connections = create_nated_internet (pg, &unblacklist_connections);
+ unblacklisted_connections =
+ create_nated_internet (pg, &unblacklist_connections);
break;
case GNUNET_TESTING_TOPOLOGY_SCALE_FREE:
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Blacklisting all but Scale Free topology\n"));
#endif
- unblacklisted_connections = create_scale_free (pg, &unblacklist_connections);
+ unblacklisted_connections =
+ create_scale_free (pg, &unblacklist_connections);
break;
case GNUNET_TESTING_TOPOLOGY_LINE:
#if VERBOSE_TESTING
case GNUNET_TESTING_TOPOLOGY_NONE:
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Creating no blacklist topology (all peers can connect at transport level)\n"));
+ _
+ ("Creating no blacklist topology (all peers can connect at transport level)\n"));
#endif
default:
break;
}
if ((unblacklisted_connections > 0) && (restrict_transports != NULL))
- {
- ret = create_and_copy_blacklist_files(pg, restrict_transports);
- if (ret != GNUNET_OK)
- {
+ {
+ ret = create_and_copy_blacklist_files (pg, restrict_transports);
+ if (ret != GNUNET_OK)
+ {
#if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Failed during blacklist file copying!\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Failed during blacklist file copying!\n"));
#endif
- return 0;
- }
- else
- {
+ return 0;
+ }
+ else
+ {
#if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Blacklist files created/copied successfully!\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Blacklist files created/copied successfully!\n"));
#endif
- }
- }
+ }
+ }
return num_connections;
}
* @return GNUNET_YES to continue iteration
*/
static int
-random_connect_iterator (void *cls,
- const GNUNET_HashCode * key,
- void *value)
+random_connect_iterator (void *cls, const GNUNET_HashCode * key, void *value)
{
struct RandomContext *random_ctx = cls;
double random_number;
uint32_t second_pos;
GNUNET_HashCode first_hash;
- random_number = ((double) GNUNET_CRYPTO_random_u64(GNUNET_CRYPTO_QUALITY_WEAK,
- UINT64_MAX)) / ( (double) UINT64_MAX);
+ random_number =
+ ((double)
+ GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
+ UINT64_MAX)) / ((double) UINT64_MAX);
if (random_number < random_ctx->percentage)
- {
- GNUNET_assert(GNUNET_OK == GNUNET_CONTAINER_multihashmap_put(random_ctx->first->connect_peers_working_set, key, value, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
- }
+ {
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (random_ctx->
+ first->connect_peers_working_set,
+ key, value,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ }
/* Now we have considered this particular connection, remove it from the second peer so it's not double counted */
- uid_from_hash(key, &second_pos);
- hash_from_uid(random_ctx->first_uid, &first_hash);
- GNUNET_assert(random_ctx->pg->total > second_pos);
- GNUNET_assert(GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove(random_ctx->pg->peers[second_pos].connect_peers, &first_hash, random_ctx->first->daemon));
+ uid_from_hash (key, &second_pos);
+ hash_from_uid (random_ctx->first_uid, &first_hash);
+ GNUNET_assert (random_ctx->pg->total > second_pos);
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (random_ctx->
+ pg->peers
+ [second_pos].connect_peers,
+ &first_hash,
+ random_ctx->
+ first->daemon));
return GNUNET_YES;
}
* @return GNUNET_YES to continue iteration
*/
static int
-minimum_connect_iterator (void *cls,
- const GNUNET_HashCode * key,
- void *value)
+minimum_connect_iterator (void *cls, const GNUNET_HashCode * key, void *value)
{
struct MinimumContext *min_ctx = cls;
uint32_t second_pos;
GNUNET_HashCode first_hash;
unsigned int i;
- if (GNUNET_CONTAINER_multihashmap_size(min_ctx->first->connect_peers_working_set) < min_ctx->num_to_add)
- {
- for (i = 0; i < min_ctx->num_to_add; i++)
- {
- if (min_ctx->pg_array[i] == min_ctx->current)
- {
- GNUNET_assert(GNUNET_OK == GNUNET_CONTAINER_multihashmap_put(min_ctx->first->connect_peers_working_set, key, value, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
- uid_from_hash(key, &second_pos);
- hash_from_uid(min_ctx->first_uid, &first_hash);
- GNUNET_assert(min_ctx->pg->total > second_pos);
- GNUNET_assert(GNUNET_OK == GNUNET_CONTAINER_multihashmap_put(min_ctx->pg->peers[second_pos].connect_peers_working_set, &first_hash, min_ctx->first->daemon, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
- /* Now we have added this particular connection, remove it from the second peer's map so it's not double counted */
- GNUNET_assert(GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove(min_ctx->pg->peers[second_pos].connect_peers, &first_hash, min_ctx->first->daemon));
- }
- }
- min_ctx->current++;
- return GNUNET_YES;
- }
+ if (GNUNET_CONTAINER_multihashmap_size
+ (min_ctx->first->connect_peers_working_set) < min_ctx->num_to_add)
+ {
+ for (i = 0; i < min_ctx->num_to_add; i++)
+ {
+ if (min_ctx->pg_array[i] == min_ctx->current)
+ {
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put
+ (min_ctx->first->connect_peers_working_set, key,
+ value,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ uid_from_hash (key, &second_pos);
+ hash_from_uid (min_ctx->first_uid, &first_hash);
+ GNUNET_assert (min_ctx->pg->total > second_pos);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (min_ctx->
+ pg->peers
+ [second_pos].connect_peers_working_set,
+ &first_hash,
+ min_ctx->first->
+ daemon,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ /* Now we have added this particular connection, remove it from the second peer's map so it's not double counted */
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove
+ (min_ctx->pg->peers[second_pos].connect_peers,
+ &first_hash, min_ctx->first->daemon));
+ }
+ }
+ min_ctx->current++;
+ return GNUNET_YES;
+ }
else
- return GNUNET_NO; /* We can stop iterating, we have enough peers! */
+ return GNUNET_NO; /* We can stop iterating, we have enough peers! */
}
* @return GNUNET_YES to continue iteration
*/
static int
-dfs_connect_iterator (void *cls,
- const GNUNET_HashCode * key,
- void *value)
+dfs_connect_iterator (void *cls, const GNUNET_HashCode * key, void *value)
{
struct DFSContext *dfs_ctx = cls;
GNUNET_HashCode first_hash;
if (dfs_ctx->current == dfs_ctx->chosen)
{
- GNUNET_assert(GNUNET_OK == GNUNET_CONTAINER_multihashmap_put(dfs_ctx->first->connect_peers_working_set, key, value, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
- uid_from_hash(key, &dfs_ctx->second_uid);
- hash_from_uid(dfs_ctx->first_uid, &first_hash);
- GNUNET_assert(GNUNET_OK == GNUNET_CONTAINER_multihashmap_put(dfs_ctx->pg->peers[dfs_ctx->second_uid].connect_peers_working_set, &first_hash, dfs_ctx->first->daemon, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
- GNUNET_assert(GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove(dfs_ctx->pg->peers[dfs_ctx->second_uid].connect_peers, &first_hash, dfs_ctx->first->daemon));
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (dfs_ctx->
+ first->connect_peers_working_set,
+ key, value,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ uid_from_hash (key, &dfs_ctx->second_uid);
+ hash_from_uid (dfs_ctx->first_uid, &first_hash);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (dfs_ctx->
+ pg->peers
+ [dfs_ctx->second_uid].connect_peers_working_set,
+ &first_hash,
+ dfs_ctx->
+ first->daemon,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (dfs_ctx->
+ pg->peers
+ [dfs_ctx->second_uid].connect_peers,
+ &first_hash,
+ dfs_ctx->
+ first->daemon));
/* Can't remove second from first yet because we are currently iterating, hence the return value in the DFSContext! */
- return GNUNET_NO; /* We have found our peer, don't iterate more */
+ return GNUNET_NO; /* We have found our peer, don't iterate more */
}
dfs_ctx->current++;
* @param percentage what percent of total connections to make
*/
void
-choose_random_connections(struct GNUNET_TESTING_PeerGroup *pg, double percentage)
+choose_random_connections (struct GNUNET_TESTING_PeerGroup *pg,
+ double percentage)
{
struct RandomContext random_ctx;
uint32_t pg_iter;
random_ctx.first = &pg->peers[pg_iter];
random_ctx.percentage = percentage;
random_ctx.pg = pg;
- pg->peers[pg_iter].connect_peers_working_set = GNUNET_CONTAINER_multihashmap_create(pg->total);
- GNUNET_CONTAINER_multihashmap_iterate(pg->peers[pg_iter].connect_peers, &random_connect_iterator, &random_ctx);
+ pg->peers[pg_iter].connect_peers_working_set =
+ GNUNET_CONTAINER_multihashmap_create (pg->total);
+ GNUNET_CONTAINER_multihashmap_iterate (pg->peers[pg_iter].connect_peers,
+ &random_connect_iterator,
+ &random_ctx);
/* Now remove the old connections */
- GNUNET_CONTAINER_multihashmap_destroy(pg->peers[pg_iter].connect_peers);
+ GNUNET_CONTAINER_multihashmap_destroy (pg->
+ peers[pg_iter].connect_peers);
/* And replace with the random set */
- pg->peers[pg_iter].connect_peers = pg->peers[pg_iter].connect_peers_working_set;
+ pg->peers[pg_iter].connect_peers =
+ pg->peers[pg_iter].connect_peers_working_set;
}
}
* @param num how many connections at least should each peer have (if possible)?
*/
static void
-choose_minimum(struct GNUNET_TESTING_PeerGroup *pg, unsigned int num)
+choose_minimum (struct GNUNET_TESTING_PeerGroup *pg, unsigned int num)
{
struct MinimumContext minimum_ctx;
uint32_t pg_iter;
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
- {
- pg->peers[pg_iter].connect_peers_working_set = GNUNET_CONTAINER_multihashmap_create(num);
- }
+ {
+ pg->peers[pg_iter].connect_peers_working_set =
+ GNUNET_CONTAINER_multihashmap_create (num);
+ }
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
minimum_ctx.first_uid = pg_iter;
- minimum_ctx.pg_array = GNUNET_CRYPTO_random_permute(GNUNET_CRYPTO_QUALITY_WEAK,
- GNUNET_CONTAINER_multihashmap_size(pg->peers[pg_iter].connect_peers));
+ minimum_ctx.pg_array =
+ GNUNET_CRYPTO_random_permute (GNUNET_CRYPTO_QUALITY_WEAK,
+ GNUNET_CONTAINER_multihashmap_size
+ (pg->peers[pg_iter].connect_peers));
minimum_ctx.first = &pg->peers[pg_iter];
minimum_ctx.pg = pg;
minimum_ctx.num_to_add = num;
minimum_ctx.current = 0;
- GNUNET_CONTAINER_multihashmap_iterate(pg->peers[pg_iter].connect_peers,
- &minimum_connect_iterator,
- &minimum_ctx);
+ GNUNET_CONTAINER_multihashmap_iterate (pg->peers[pg_iter].connect_peers,
+ &minimum_connect_iterator,
+ &minimum_ctx);
}
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
/* Remove the "old" connections */
- GNUNET_CONTAINER_multihashmap_destroy(pg->peers[pg_iter].connect_peers);
+ GNUNET_CONTAINER_multihashmap_destroy (pg->
+ peers[pg_iter].connect_peers);
/* And replace with the working set */
- pg->peers[pg_iter].connect_peers = pg->peers[pg_iter].connect_peers_working_set;
+ pg->peers[pg_iter].connect_peers =
+ pg->peers[pg_iter].connect_peers_working_set;
}
}
static unsigned int
-count_workingset_connections(struct GNUNET_TESTING_PeerGroup *pg)
+count_workingset_connections (struct GNUNET_TESTING_PeerGroup *pg)
{
unsigned int count;
unsigned int pg_iter;
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
- count += GNUNET_CONTAINER_multihashmap_size(pg->peers[pg_iter].connect_peers_working_set);
+ count +=
+ GNUNET_CONTAINER_multihashmap_size (pg->
+ peers
+ [pg_iter].connect_peers_working_set);
}
return count;
}
-static unsigned int count_allowed_connections(struct GNUNET_TESTING_PeerGroup *pg)
+static unsigned int
+count_allowed_connections (struct GNUNET_TESTING_PeerGroup *pg)
{
unsigned int count;
unsigned int pg_iter;
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
- count += GNUNET_CONTAINER_multihashmap_size(pg->peers[pg_iter].connect_peers);
+ count +=
+ GNUNET_CONTAINER_multihashmap_size (pg->peers[pg_iter].connect_peers);
}
return count;
* iterate,
* GNUNET_NO if not.
*/
-static
-int find_closest_peers (void *cls, const GNUNET_HashCode * key, void *value)
+static int
+find_closest_peers (void *cls, const GNUNET_HashCode * key, void *value)
{
struct FindClosestContext *closest_ctx = cls;
struct GNUNET_TESTING_Daemon *daemon = value;
if (((closest_ctx->closest == NULL) ||
- (GNUNET_CRYPTO_hash_matching_bits(&daemon->id.hashPubKey, &closest_ctx->curr_peer->daemon->id.hashPubKey) > closest_ctx->closest_dist))
- && (GNUNET_YES != GNUNET_CONTAINER_multihashmap_contains(closest_ctx->curr_peer->connect_peers, key)))
+ (GNUNET_CRYPTO_hash_matching_bits
+ (&daemon->id.hashPubKey,
+ &closest_ctx->curr_peer->daemon->id.hashPubKey) >
+ closest_ctx->closest_dist))
+ && (GNUNET_YES !=
+ GNUNET_CONTAINER_multihashmap_contains (closest_ctx->
+ curr_peer->connect_peers,
+ key)))
{
- closest_ctx->closest_dist = GNUNET_CRYPTO_hash_matching_bits(&daemon->id.hashPubKey, &closest_ctx->curr_peer->daemon->id.hashPubKey);
+ closest_ctx->closest_dist =
+ GNUNET_CRYPTO_hash_matching_bits (&daemon->id.hashPubKey,
+ &closest_ctx->curr_peer->daemon->
+ id.hashPubKey);
closest_ctx->closest = daemon;
- uid_from_hash(key, &closest_ctx->closest_num);
+ uid_from_hash (key, &closest_ctx->closest_num);
}
return GNUNET_YES;
}
* @param proc processor to actually add the connections
*/
void
-add_closest (struct GNUNET_TESTING_PeerGroup *pg, unsigned int num, GNUNET_TESTING_ConnectionProcessor proc)
+add_closest (struct GNUNET_TESTING_PeerGroup *pg, unsigned int num,
+ GNUNET_TESTING_ConnectionProcessor proc)
{
struct FindClosestContext closest_ctx;
uint32_t pg_iter;
uint32_t i;
- for (i = 0; i < num; i++) /* Each time find a closest peer (from those available) */
+ for (i = 0; i < num; i++) /* Each time find a closest peer (from those available) */
{
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
closest_ctx.closest = NULL;
closest_ctx.closest_dist = 0;
closest_ctx.closest_num = 0;
- GNUNET_CONTAINER_multihashmap_iterate(pg->peers[pg_iter].allowed_peers, &find_closest_peers, &closest_ctx);
+ GNUNET_CONTAINER_multihashmap_iterate (pg->
+ peers[pg_iter].allowed_peers,
+ &find_closest_peers,
+ &closest_ctx);
if (closest_ctx.closest != NULL)
{
- GNUNET_assert(closest_ctx.closest_num < pg->total);
- proc(pg, pg_iter, closest_ctx.closest_num);
+ GNUNET_assert (closest_ctx.closest_num < pg->total);
+ proc (pg, pg_iter, closest_ctx.closest_num);
}
}
}
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
- pg->peers[pg_iter].connect_peers_working_set = GNUNET_CONTAINER_multihashmap_create(num);
+ pg->peers[pg_iter].connect_peers_working_set =
+ GNUNET_CONTAINER_multihashmap_create (num);
}
starting_peer = 0;
dfs_count = 0;
- while ((count_workingset_connections(pg) < num * pg->total) && (count_allowed_connections(pg) > 0))
+ while ((count_workingset_connections (pg) < num * pg->total)
+ && (count_allowed_connections (pg) > 0))
{
- if (dfs_count % pg->total == 0) /* Restart the DFS at some weakly connected peer */
+ if (dfs_count % pg->total == 0) /* Restart the DFS at some weakly connected peer */
{
- least_connections = -1; /* Set to very high number */
+ least_connections = -1; /* Set to very high number */
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
- if (GNUNET_CONTAINER_multihashmap_size(pg->peers[pg_iter].connect_peers_working_set) < least_connections)
+ if (GNUNET_CONTAINER_multihashmap_size
+ (pg->peers[pg_iter].connect_peers_working_set) <
+ least_connections)
{
starting_peer = pg_iter;
- least_connections = GNUNET_CONTAINER_multihashmap_size(pg->peers[pg_iter].connect_peers_working_set);
+ least_connections =
+ GNUNET_CONTAINER_multihashmap_size (pg->
+ peers
+ [pg_iter].connect_peers_working_set);
}
}
}
- if (GNUNET_CONTAINER_multihashmap_size(pg->peers[starting_peer].connect_peers) == 0) /* Ensure there is at least one peer left to connect! */
+ if (GNUNET_CONTAINER_multihashmap_size (pg->peers[starting_peer].connect_peers) == 0) /* Ensure there is at least one peer left to connect! */
{
dfs_count = 0;
continue;
}
/* Choose a random peer from the chosen peers set of connections to add */
- dfs_ctx.chosen = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, GNUNET_CONTAINER_multihashmap_size(pg->peers[starting_peer].connect_peers));
+ dfs_ctx.chosen =
+ GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+ GNUNET_CONTAINER_multihashmap_size
+ (pg->peers[starting_peer].connect_peers));
dfs_ctx.first_uid = starting_peer;
dfs_ctx.first = &pg->peers[starting_peer];
dfs_ctx.pg = pg;
dfs_ctx.current = 0;
- GNUNET_CONTAINER_multihashmap_iterate(pg->peers[starting_peer].connect_peers, &dfs_connect_iterator, &dfs_ctx);
+ GNUNET_CONTAINER_multihashmap_iterate (pg->
+ peers
+ [starting_peer].connect_peers,
+ &dfs_connect_iterator, &dfs_ctx);
/* Remove the second from the first, since we will be continuing the search and may encounter the first peer again! */
- hash_from_uid(dfs_ctx.second_uid, &second_hash);
- GNUNET_assert(GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove(pg->peers[starting_peer].connect_peers, &second_hash, pg->peers[dfs_ctx.second_uid].daemon));
+ hash_from_uid (dfs_ctx.second_uid, &second_hash);
+ GNUNET_assert (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (pg->peers
+ [starting_peer].connect_peers,
+ &second_hash,
+ pg->
+ peers
+ [dfs_ctx.second_uid].daemon));
starting_peer = dfs_ctx.second_uid;
}
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
/* Remove the "old" connections */
- GNUNET_CONTAINER_multihashmap_destroy(pg->peers[pg_iter].connect_peers);
+ GNUNET_CONTAINER_multihashmap_destroy (pg->
+ peers[pg_iter].connect_peers);
/* And replace with the working set */
- pg->peers[pg_iter].connect_peers = pg->peers[pg_iter].connect_peers_working_set;
+ pg->peers[pg_iter].connect_peers =
+ pg->peers[pg_iter].connect_peers_working_set;
}
}
* Internal callback for topology information for a particular peer.
*/
static void
-internal_topology_callback(void *cls,
- const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+internal_topology_callback (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_TRANSPORT_ATS_Information
+ *atsi)
{
struct CoreContext *core_ctx = cls;
struct TopologyIterateContext *iter_ctx = core_ctx->iter_context;
- if (peer == NULL) /* Either finished, or something went wrong */
+ if (peer == NULL) /* Either finished, or something went wrong */
{
iter_ctx->completed++;
iter_ctx->connected--;
/* One core context allocated per iteration, must free! */
- GNUNET_free(core_ctx);
+ GNUNET_free (core_ctx);
}
else
{
- iter_ctx->topology_cb(iter_ctx->cls, &core_ctx->daemon->id,
- peer, NULL);
+ iter_ctx->topology_cb (iter_ctx->cls, &core_ctx->daemon->id,
+ peer, NULL);
}
if (iter_ctx->completed == iter_ctx->total)
{
- iter_ctx->topology_cb(iter_ctx->cls, NULL, NULL,
- NULL);
+ iter_ctx->topology_cb (iter_ctx->cls, NULL, NULL, NULL);
/* Once all are done, free the iteration context */
- GNUNET_free(iter_ctx);
+ GNUNET_free (iter_ctx);
}
}
* schedule for some time in the future.
*/
static void
-schedule_get_topology(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+schedule_get_topology (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct CoreContext *core_context = cls;
- struct TopologyIterateContext *topology_context = (struct TopologyIterateContext *)core_context->iter_context;
+ struct TopologyIterateContext *topology_context =
+ (struct TopologyIterateContext *) core_context->iter_context;
if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
return;
if (topology_context->connected > MAX_OUTSTANDING_CONNECTIONS)
{
#if VERBOSE_TESTING > 2
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Delaying connect, we have too many outstanding connections!\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _
+ ("Delaying connect, we have too many outstanding connections!\n"));
#endif
- GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 100), &schedule_get_topology, core_context);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_MILLISECONDS, 100),
+ &schedule_get_topology, core_context);
}
else
{
#if VERBOSE_TESTING > 2
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Creating connection, outstanding_connections is %d\n"), outstanding_connects);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Creating connection, outstanding_connections is %d\n"),
+ outstanding_connects);
#endif
topology_context->connected++;
- if (GNUNET_OK != GNUNET_CORE_iterate_peers (core_context->daemon->server, &internal_topology_callback, core_context))
- internal_topology_callback(core_context, NULL, NULL);
+ if (GNUNET_OK !=
+ GNUNET_CORE_iterate_peers (core_context->daemon->server,
+ &internal_topology_callback,
+ core_context))
+ internal_topology_callback (core_context, NULL, NULL);
}
}
* all connections that each currently has.
*/
void
-GNUNET_TESTING_get_topology (struct GNUNET_TESTING_PeerGroup *pg, GNUNET_TESTING_NotifyTopology cb, void *cls)
+GNUNET_TESTING_get_topology (struct GNUNET_TESTING_PeerGroup *pg,
+ GNUNET_TESTING_NotifyTopology cb, void *cls)
{
struct TopologyIterateContext *topology_context;
struct CoreContext *core_ctx;
unsigned int total_count;
/* Allocate a single topology iteration context */
- topology_context = GNUNET_malloc(sizeof(struct TopologyIterateContext));
+ topology_context = GNUNET_malloc (sizeof (struct TopologyIterateContext));
topology_context->topology_cb = cb;
topology_context->cls = cls;
total_count = 0;
if (pg->peers[i].daemon->running == GNUNET_YES)
{
/* Allocate one core context per core we need to connect to */
- core_ctx = GNUNET_malloc(sizeof(struct CoreContext));
+ core_ctx = GNUNET_malloc (sizeof (struct CoreContext));
core_ctx->daemon = pg->peers[i].daemon;
/* Set back pointer to topology iteration context */
core_ctx->iter_context = topology_context;
- GNUNET_SCHEDULER_add_now(&schedule_get_topology, core_ctx);
+ GNUNET_SCHEDULER_add_now (&schedule_get_topology, core_ctx);
total_count++;
}
}
if (total_count == 0)
{
- cb(cls, NULL, NULL, "Cannot iterate over topology, no running peers!");
- GNUNET_free(topology_context);
+ cb (cls, NULL, NULL, "Cannot iterate over topology, no running peers!");
+ GNUNET_free (topology_context);
}
else
topology_context->total = total_count;
* @param is_persistent GNUNET_YES if the value is persistent, GNUNET_NO if not
* @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration
*/
-static int internal_stats_callback (void *cls,
- const char *subsystem,
- const char *name,
- uint64_t value,
- int is_persistent)
+static int
+internal_stats_callback (void *cls,
+ const char *subsystem,
+ const char *name, uint64_t value, int is_persistent)
{
struct StatsCoreContext *core_context = cls;
- struct StatsIterateContext *stats_context = (struct StatsIterateContext *)core_context->iter_context;
+ struct StatsIterateContext *stats_context =
+ (struct StatsIterateContext *) core_context->iter_context;
- return stats_context->proc(stats_context->cls, &core_context->daemon->id, subsystem, name, value, is_persistent);
+ return stats_context->proc (stats_context->cls, &core_context->daemon->id,
+ subsystem, name, value, is_persistent);
}
/**
* @param success whether or not the statistics iterations
* was canceled or not (we don't care)
*/
-static void internal_stats_cont (void *cls, int success)
+static void
+internal_stats_cont (void *cls, int success)
{
struct StatsCoreContext *core_context = cls;
- struct StatsIterateContext *stats_context = (struct StatsIterateContext *)core_context->iter_context;
+ struct StatsIterateContext *stats_context =
+ (struct StatsIterateContext *) core_context->iter_context;
stats_context->connected--;
stats_context->completed++;
if (stats_context->completed == stats_context->total)
{
- stats_context->cont(stats_context->cls, GNUNET_YES);
- GNUNET_free(stats_context);
+ stats_context->cont (stats_context->cls, GNUNET_YES);
+ GNUNET_free (stats_context);
}
if (core_context->stats_handle != NULL)
- GNUNET_STATISTICS_destroy(core_context->stats_handle, GNUNET_NO);
+ GNUNET_STATISTICS_destroy (core_context->stats_handle, GNUNET_NO);
- GNUNET_free(core_context);
+ GNUNET_free (core_context);
}
/**
* schedule for some time in the future.
*/
static void
-schedule_get_statistics(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+schedule_get_statistics (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct StatsCoreContext *core_context = cls;
- struct StatsIterateContext *stats_context = (struct StatsIterateContext *)core_context->iter_context;
+ struct StatsIterateContext *stats_context =
+ (struct StatsIterateContext *) core_context->iter_context;
if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
return;
if (stats_context->connected > MAX_OUTSTANDING_CONNECTIONS)
{
#if VERBOSE_TESTING > 2
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Delaying connect, we have too many outstanding connections!\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _
+ ("Delaying connect, we have too many outstanding connections!\n"));
#endif
- GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 100), &schedule_get_statistics, core_context);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_MILLISECONDS, 100),
+ &schedule_get_statistics, core_context);
}
else
{
#if VERBOSE_TESTING > 2
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Creating connection, outstanding_connections is %d\n"), outstanding_connects);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Creating connection, outstanding_connections is %d\n"),
+ outstanding_connects);
#endif
stats_context->connected++;
- core_context->stats_handle = GNUNET_STATISTICS_create("testing", core_context->daemon->cfg);
+ core_context->stats_handle =
+ GNUNET_STATISTICS_create ("testing", core_context->daemon->cfg);
if (core_context->stats_handle == NULL)
{
internal_stats_cont (core_context, GNUNET_NO);
return;
}
- core_context->stats_get_handle = GNUNET_STATISTICS_get(core_context->stats_handle, NULL, NULL, GNUNET_TIME_relative_get_forever(), &internal_stats_cont, &internal_stats_callback, core_context);
+ core_context->stats_get_handle =
+ GNUNET_STATISTICS_get (core_context->stats_handle, NULL, NULL,
+ GNUNET_TIME_relative_get_forever (),
+ &internal_stats_cont, &internal_stats_callback,
+ core_context);
if (core_context->stats_get_handle == NULL)
internal_stats_cont (core_context, GNUNET_NO);
* GNUNET_NO if not (and we may have added it to the list)
*/
static int
-stats_check_existing(struct GNUNET_TESTING_PeerGroup *pg, struct PeerData *specific_peer, struct DuplicateStats **stats_list)
+stats_check_existing (struct GNUNET_TESTING_PeerGroup *pg,
+ struct PeerData *specific_peer,
+ struct DuplicateStats **stats_list)
{
struct DuplicateStats *pos;
char *unix_domain_socket;
unsigned long long port;
char *to_match;
- if (GNUNET_YES != GNUNET_CONFIGURATION_get_value_yesno(pg->cfg, "testing", "single_statistics_per_host"))
- return GNUNET_NO; /* Each peer has its own statistics instance, do nothing! */
+ if (GNUNET_YES !=
+ GNUNET_CONFIGURATION_get_value_yesno (pg->cfg, "testing",
+ "single_statistics_per_host"))
+ return GNUNET_NO; /* Each peer has its own statistics instance, do nothing! */
pos = *stats_list;
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string(specific_peer->cfg, "statistics", "unixpath", &unix_domain_socket))
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_string (specific_peer->cfg, "statistics",
+ "unixpath", &unix_domain_socket))
return GNUNET_NO;
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number(specific_peer->cfg, "statistics", "port", &port))
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_number (specific_peer->cfg, "statistics",
+ "port", &port))
return GNUNET_NO;
if (specific_peer->daemon->hostname != NULL)
- GNUNET_asprintf(&to_match, "%s%s%llu", specific_peer->daemon->hostname, unix_domain_socket, port);
+ GNUNET_asprintf (&to_match, "%s%s%llu", specific_peer->daemon->hostname,
+ unix_domain_socket, port);
else
- GNUNET_asprintf(&to_match, "%s%llu", unix_domain_socket, port);
+ GNUNET_asprintf (&to_match, "%s%llu", unix_domain_socket, port);
while (pos != NULL)
{
- if (0 == strcmp(to_match, pos->unique_string))
+ if (0 == strcmp (to_match, pos->unique_string))
{
GNUNET_free (unix_domain_socket);
GNUNET_free (to_match);
}
pos = pos->next;
}
- pos = GNUNET_malloc(sizeof(struct DuplicateStats));
+ pos = GNUNET_malloc (sizeof (struct DuplicateStats));
pos->unique_string = to_match;
pos->next = *stats_list;
*stats_list = pos;
void
GNUNET_TESTING_get_statistics (struct GNUNET_TESTING_PeerGroup *pg,
GNUNET_STATISTICS_Callback cont,
- GNUNET_TESTING_STATISTICS_Iterator proc, void *cls)
+ GNUNET_TESTING_STATISTICS_Iterator proc,
+ void *cls)
{
struct StatsIterateContext *stats_context;
struct StatsCoreContext *core_ctx;
stats_list = NULL;
/* Allocate a single stats iteration context */
- stats_context = GNUNET_malloc(sizeof(struct StatsIterateContext));
+ stats_context = GNUNET_malloc (sizeof (struct StatsIterateContext));
stats_context->cont = cont;
stats_context->proc = proc;
stats_context->cls = cls;
for (i = 0; i < pg->total; i++)
{
- if ((pg->peers[i].daemon->running == GNUNET_YES) && (GNUNET_NO == stats_check_existing(pg, &pg->peers[i], &stats_list)))
+ if ((pg->peers[i].daemon->running == GNUNET_YES)
+ && (GNUNET_NO ==
+ stats_check_existing (pg, &pg->peers[i], &stats_list)))
{
/* Allocate one core context per core we need to connect to */
- core_ctx = GNUNET_malloc(sizeof(struct StatsCoreContext));
+ core_ctx = GNUNET_malloc (sizeof (struct StatsCoreContext));
core_ctx->daemon = pg->peers[i].daemon;
/* Set back pointer to topology iteration context */
core_ctx->iter_context = stats_context;
- GNUNET_SCHEDULER_add_now(&schedule_get_statistics, core_ctx);
+ GNUNET_SCHEDULER_add_now (&schedule_get_statistics, core_ctx);
total_count++;
}
}
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Retrieving stats from %u total instances.\n", total_count);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Retrieving stats from %u total instances.\n", total_count);
stats_context->total = total_count;
if (stats_list != NULL)
{
pos = stats_list;
- while(pos != NULL)
+ while (pos != NULL)
{
- GNUNET_free(pos->unique_string);
+ GNUNET_free (pos->unique_string);
stats_list = pos->next;
- GNUNET_free(pos);
+ GNUNET_free (pos);
pos = stats_list->next;
}
}
enum GNUNET_TESTING_Topology topology,
enum GNUNET_TESTING_TopologyOption options,
double option_modifier,
- GNUNET_TESTING_NotifyCompletion notify_callback,
- void *notify_cls)
+ GNUNET_TESTING_NotifyCompletion
+ notify_callback, void *notify_cls)
{
switch (topology)
- {
- case GNUNET_TESTING_TOPOLOGY_CLIQUE:
+ {
+ case GNUNET_TESTING_TOPOLOGY_CLIQUE:
#if VERBOSE_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating clique CONNECT topology\n"));
#endif
- create_clique (pg, &add_actual_connections);
- break;
- case GNUNET_TESTING_TOPOLOGY_SMALL_WORLD_RING:
+ create_clique (pg, &add_actual_connections);
+ break;
+ case GNUNET_TESTING_TOPOLOGY_SMALL_WORLD_RING:
#if VERBOSE_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating small world (ring) CONNECT topology\n"));
#endif
- create_small_world_ring (pg, &add_actual_connections);
- break;
- case GNUNET_TESTING_TOPOLOGY_SMALL_WORLD:
+ create_small_world_ring (pg, &add_actual_connections);
+ break;
+ case GNUNET_TESTING_TOPOLOGY_SMALL_WORLD:
#if VERBOSE_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating small world (2d-torus) CONNECT topology\n"));
#endif
- create_small_world (pg, &add_actual_connections);
- break;
- case GNUNET_TESTING_TOPOLOGY_RING:
+ create_small_world (pg, &add_actual_connections);
+ break;
+ case GNUNET_TESTING_TOPOLOGY_RING:
#if VERBOSE_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating ring CONNECT topology\n"));
#endif
- create_ring (pg, &add_actual_connections);
- break;
- case GNUNET_TESTING_TOPOLOGY_2D_TORUS:
+ create_ring (pg, &add_actual_connections);
+ break;
+ case GNUNET_TESTING_TOPOLOGY_2D_TORUS:
#if VERBOSE_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating 2d torus CONNECT topology\n"));
#endif
- create_2d_torus (pg, &add_actual_connections);
- break;
- case GNUNET_TESTING_TOPOLOGY_ERDOS_RENYI:
+ create_2d_torus (pg, &add_actual_connections);
+ break;
+ case GNUNET_TESTING_TOPOLOGY_ERDOS_RENYI:
#if VERBOSE_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating Erdos-Renyi CONNECT topology\n"));
#endif
- create_erdos_renyi (pg, &add_actual_connections);
- break;
- case GNUNET_TESTING_TOPOLOGY_INTERNAT:
+ create_erdos_renyi (pg, &add_actual_connections);
+ break;
+ case GNUNET_TESTING_TOPOLOGY_INTERNAT:
#if VERBOSE_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating InterNAT CONNECT topology\n"));
#endif
- create_nated_internet (pg, &add_actual_connections);
- break;
- case GNUNET_TESTING_TOPOLOGY_SCALE_FREE:
+ create_nated_internet (pg, &add_actual_connections);
+ break;
+ case GNUNET_TESTING_TOPOLOGY_SCALE_FREE:
#if VERBOSE_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating Scale Free CONNECT topology\n"));
#endif
- create_scale_free (pg, &add_actual_connections);
- break;
- case GNUNET_TESTING_TOPOLOGY_LINE:
+ create_scale_free (pg, &add_actual_connections);
+ break;
+ case GNUNET_TESTING_TOPOLOGY_LINE:
#if VERBOSE_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating straight line CONNECT topology\n"));
#endif
- create_line (pg, &add_actual_connections);
- break;
- case GNUNET_TESTING_TOPOLOGY_NONE:
+ create_line (pg, &add_actual_connections);
+ break;
+ case GNUNET_TESTING_TOPOLOGY_NONE:
#if VERBOSE_TOPOLOGY
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating no CONNECT topology\n"));
#endif
- copy_allowed_topology(pg);
- break;
- default:
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
- _("Unknown topology specification, can't connect peers!\n"));
- return GNUNET_SYSERR;
- }
+ copy_allowed_topology (pg);
+ break;
+ default:
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _
+ ("Unknown topology specification, can't connect peers!\n"));
+ return GNUNET_SYSERR;
+ }
switch (options)
{
case GNUNET_TESTING_TOPOLOGY_OPTION_RANDOM:
#if VERBOSE_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Connecting random subset (%'.2f percent) of possible peers\n"), 100 * option_modifier);
+ _
+ ("Connecting random subset (%'.2f percent) of possible peers\n"),
+ 100 * option_modifier);
#endif
- choose_random_connections(pg, option_modifier);
+ choose_random_connections (pg, option_modifier);
break;
case GNUNET_TESTING_TOPOLOGY_OPTION_MINIMUM:
#if VERBOSE_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Connecting a minimum of %u peers each (if possible)\n"), (unsigned int)option_modifier);
+ _("Connecting a minimum of %u peers each (if possible)\n"),
+ (unsigned int) option_modifier);
#endif
- choose_minimum(pg, (unsigned int)option_modifier);
+ choose_minimum (pg, (unsigned int) option_modifier);
break;
case GNUNET_TESTING_TOPOLOGY_OPTION_DFS:
#if VERBOSE_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Using DFS to connect a minimum of %u peers each (if possible)\n"), (unsigned int)option_modifier);
+ _
+ ("Using DFS to connect a minimum of %u peers each (if possible)\n"),
+ (unsigned int) option_modifier);
#endif
- perform_dfs(pg, (int)option_modifier);
+ perform_dfs (pg, (int) option_modifier);
break;
case GNUNET_TESTING_TOPOLOGY_OPTION_ADD_CLOSEST:
#if VERBOSE_TOPOLOGY
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Finding additional %u closest peers each (if possible)\n"), (unsigned int)option_modifier);
+ _
+ ("Finding additional %u closest peers each (if possible)\n"),
+ (unsigned int) option_modifier);
#endif
- add_closest(pg, (unsigned int)option_modifier, &add_actual_connections);
+ add_closest (pg, (unsigned int) option_modifier,
+ &add_actual_connections);
break;
case GNUNET_TESTING_TOPOLOGY_OPTION_NONE:
break;
break;
}
- return connect_topology(pg, notify_callback, notify_cls);
+ return connect_topology (pg, notify_callback, notify_cls);
}
/**
* @param d handle for the daemon
* @param emsg error message (NULL on success)
*/
-static void internal_hostkey_callback (void *cls,
- const struct GNUNET_PeerIdentity *id,
- struct GNUNET_TESTING_Daemon *d,
- const char *emsg)
+static void
+internal_hostkey_callback (void *cls,
+ const struct GNUNET_PeerIdentity *id,
+ struct GNUNET_TESTING_Daemon *d, const char *emsg)
{
struct InternalStartContext *internal_context = cls;
internal_context->peer->pg->starting--;
internal_context->peer->pg->started++;
if (internal_context->hostkey_callback != NULL)
- internal_context->hostkey_callback(internal_context->hostkey_cls, id, d, emsg);
- else if (internal_context->peer->pg->started == internal_context->peer->pg->total)
+ internal_context->hostkey_callback (internal_context->hostkey_cls, id, d,
+ emsg);
+ else if (internal_context->peer->pg->started ==
+ internal_context->peer->pg->total)
{
- internal_context->peer->pg->started = 0; /* Internal startup may use this counter! */
- GNUNET_TESTING_daemons_continue_startup(internal_context->peer->pg);
+ internal_context->peer->pg->started = 0; /* Internal startup may use this counter! */
+ GNUNET_TESTING_daemons_continue_startup (internal_context->peer->pg);
}
}
* @param d handle for the daemon
* @param emsg error message (NULL on success)
*/
-static void internal_startup_callback (void *cls,
- const struct GNUNET_PeerIdentity *id,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TESTING_Daemon *d,
- const char *emsg)
+static void
+internal_startup_callback (void *cls,
+ const struct GNUNET_PeerIdentity *id,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_Daemon *d, const char *emsg)
{
struct InternalStartContext *internal_context = cls;
internal_context->peer->pg->starting--;
if (internal_context->start_cb != NULL)
- internal_context->start_cb(internal_context->start_cb_cls, id, cfg, d, emsg);
+ internal_context->start_cb (internal_context->start_cb_cls, id, cfg, d,
+ emsg);
}
static void
-internal_continue_startup (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+internal_continue_startup (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct InternalStartContext *internal_context = cls;
}
else
{
- GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 100), &internal_continue_startup, internal_context);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_MILLISECONDS, 100),
+ &internal_continue_startup,
+ internal_context);
}
}
churn_start_callback (void *cls,
const struct GNUNET_PeerIdentity *id,
const struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TESTING_Daemon *d,
- const char *emsg)
+ struct GNUNET_TESTING_Daemon *d, const char *emsg)
{
struct ChurnRestartContext *startup_ctx = cls;
struct ChurnContext *churn_ctx = startup_ctx->churn_ctx;
if (emsg != NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Churn stop callback failed with error `%s'\n",
- emsg);
+ "Churn stop callback failed with error `%s'\n", emsg);
churn_ctx->num_failed_start++;
}
else
}
#if DEBUG_CHURN
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
- "Started peer, %d left.\n",
- churn_ctx->num_to_start);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Started peer, %d left.\n", churn_ctx->num_to_start);
#endif
- total_left = (churn_ctx->num_to_stop - churn_ctx->num_failed_stop) + (churn_ctx->num_to_start - churn_ctx->num_failed_start);
+ total_left =
+ (churn_ctx->num_to_stop - churn_ctx->num_failed_stop) +
+ (churn_ctx->num_to_start - churn_ctx->num_failed_start);
if (total_left == 0)
- {
- if ((churn_ctx->num_failed_stop > 0) || (churn_ctx->num_failed_start > 0))
- GNUNET_asprintf(&error_message,
- "Churn didn't complete successfully, %u peers failed to start %u peers failed to be stopped!",
- churn_ctx->num_failed_start,
- churn_ctx->num_failed_stop);
- churn_ctx->cb(churn_ctx->cb_cls, error_message);
- GNUNET_free_non_null(error_message);
- GNUNET_free(churn_ctx);
- GNUNET_free(startup_ctx);
- }
+ {
+ if ((churn_ctx->num_failed_stop > 0)
+ || (churn_ctx->num_failed_start > 0))
+ GNUNET_asprintf (&error_message,
+ "Churn didn't complete successfully, %u peers failed to start %u peers failed to be stopped!",
+ churn_ctx->num_failed_start,
+ churn_ctx->num_failed_stop);
+ churn_ctx->cb (churn_ctx->cb_cls, error_message);
+ GNUNET_free_non_null (error_message);
+ GNUNET_free (churn_ctx);
+ GNUNET_free (startup_ctx);
+ }
}
-static void schedule_churn_restart(void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+static void
+schedule_churn_restart (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct PeerRestartContext *peer_restart_ctx = cls;
- struct ChurnRestartContext *startup_ctx = peer_restart_ctx->churn_restart_ctx;
+ struct ChurnRestartContext *startup_ctx =
+ peer_restart_ctx->churn_restart_ctx;
if (startup_ctx->outstanding > MAX_CONCURRENT_STARTING)
- GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 100), &schedule_churn_restart, peer_restart_ctx);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_MILLISECONDS, 100),
+ &schedule_churn_restart, peer_restart_ctx);
else
{
- GNUNET_TESTING_daemon_start_stopped(peer_restart_ctx->daemon,
- startup_ctx->timeout,
- &churn_start_callback,
- startup_ctx);
- GNUNET_free(peer_restart_ctx);
+ GNUNET_TESTING_daemon_start_stopped (peer_restart_ctx->daemon,
+ startup_ctx->timeout,
+ &churn_start_callback,
+ startup_ctx);
+ GNUNET_free (peer_restart_ctx);
}
}
static void
-internal_start (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+internal_start (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct InternalStartContext *internal_context = cls;
if (internal_context->peer->pg->starting < MAX_CONCURRENT_HOSTKEYS)
{
internal_context->peer->pg->starting++;
- internal_context->peer->daemon = GNUNET_TESTING_daemon_start (internal_context->peer->cfg,
- internal_context->timeout,
- internal_context->hostname,
- internal_context->username,
- internal_context->sshport,
- &internal_hostkey_callback,
- internal_context,
- &internal_startup_callback,
- internal_context);
+ internal_context->peer->daemon =
+ GNUNET_TESTING_daemon_start (internal_context->peer->cfg,
+ internal_context->timeout,
+ internal_context->hostname,
+ internal_context->username,
+ internal_context->sshport,
+ &internal_hostkey_callback,
+ internal_context,
+ &internal_startup_callback,
+ internal_context);
}
else
{
- GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 100), &internal_start, internal_context);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_MILLISECONDS, 100),
+ &internal_start, internal_context);
}
}
*
*/
void
-GNUNET_TESTING_daemons_continue_startup(struct GNUNET_TESTING_PeerGroup *pg)
+GNUNET_TESTING_daemons_continue_startup (struct GNUNET_TESTING_PeerGroup *pg)
{
unsigned int i;
pg->starting = 0;
for (i = 0; i < pg->total; i++)
{
- GNUNET_SCHEDULER_add_now (&internal_continue_startup, &pg->peers[i].internal_context);
+ GNUNET_SCHEDULER_add_now (&internal_continue_startup,
+ &pg->peers[i].internal_context);
//GNUNET_TESTING_daemon_continue_startup(pg->peers[i].daemon);
}
}
GNUNET_TESTING_daemons_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
unsigned int total,
struct GNUNET_TIME_Relative timeout,
- GNUNET_TESTING_NotifyHostkeyCreated hostkey_callback,
- void *hostkey_cls,
+ GNUNET_TESTING_NotifyHostkeyCreated
+ hostkey_callback, void *hostkey_cls,
GNUNET_TESTING_NotifyDaemonRunning cb,
void *cb_cls,
GNUNET_TESTING_NotifyConnection
pg->notify_connection = connect_callback;
pg->notify_connection_cls = connect_callback_cls;
pg->total = total;
- pg->max_timeout = GNUNET_TIME_relative_to_absolute(timeout);
+ pg->max_timeout = GNUNET_TIME_relative_to_absolute (timeout);
pg->peers = GNUNET_malloc (total * sizeof (struct PeerData));
if (NULL != hostnames)
{
while (hostpos != NULL)
{
pg->hosts[off].minport = LOW_PORT;
- pg->hosts[off].hostname = GNUNET_strdup(hostpos->hostname);
+ pg->hosts[off].hostname = GNUNET_strdup (hostpos->hostname);
if (hostpos->username != NULL)
- pg->hosts[off].username = GNUNET_strdup(hostpos->username);
+ pg->hosts[off].username = GNUNET_strdup (hostpos->username);
pg->hosts[off].sshport = hostpos->port;
hostpos = hostpos->next;
off++;
#if NO_LL
off = 2;
/* skip leading spaces */
- while ((0 != *hostnames) && (isspace ( (unsigned char) *hostnames)))
+ while ((0 != *hostnames) && (isspace ((unsigned char) *hostnames)))
hostnames++;
rpos = hostnames;
while ('\0' != *rpos)
{
- if (isspace ( (unsigned char) *rpos))
+ if (isspace ((unsigned char) *rpos))
off++;
rpos++;
}
pos = start;
while ('\0' != *pos)
{
- if (isspace ( (unsigned char) *pos))
+ if (isspace ((unsigned char) *pos))
{
*pos = '\0';
if (strlen (start) > 0)
hostname = pg->hosts[off % hostcnt].hostname;
username = pg->hosts[off % hostcnt].username;
sshport = pg->hosts[off % hostcnt].sshport;
- pcfg = make_config (cfg,
- &pg->hosts[off % hostcnt].minport,
- &upnum,
- hostname, &fdnum);
+ pcfg = make_config (cfg,
+ &pg->hosts[off % hostcnt].minport,
+ &upnum, hostname, &fdnum);
}
else
{
hostname = NULL;
username = NULL;
sshport = 0;
- pcfg = make_config (cfg,
- &minport,
- &upnum,
- hostname, &fdnum);
+ pcfg = make_config (cfg, &minport, &upnum, hostname, &fdnum);
}
if (NULL == pcfg)
GNUNET_CONFIGURATION_get_value_string (pcfg, "PATHS", "SERVICEHOME",
&baseservicehome))
{
- GNUNET_asprintf (&newservicehome,
- "%s/%d/", baseservicehome, off);
- GNUNET_free (baseservicehome);
+ GNUNET_asprintf (&newservicehome, "%s/%d/", baseservicehome, off);
+ GNUNET_free (baseservicehome);
}
else
{
tmpdir = getenv ("TMPDIR");
tmpdir = tmpdir ? tmpdir : "/tmp";
- GNUNET_asprintf (&newservicehome,
- "%s/%s/%d/",
- tmpdir,
- "gnunet-testing-test-test", off);
+ GNUNET_asprintf (&newservicehome,
+ "%s/%s/%d/",
+ tmpdir, "gnunet-testing-test-test", off);
}
GNUNET_CONFIGURATION_set_value_string (pcfg,
"PATHS",
"SERVICEHOME", newservicehome);
GNUNET_free (newservicehome);
pg->peers[off].cfg = pcfg;
- pg->peers[off].allowed_peers = GNUNET_CONTAINER_multihashmap_create(total);
- pg->peers[off].connect_peers = GNUNET_CONTAINER_multihashmap_create(total);
- pg->peers[off].blacklisted_peers = GNUNET_CONTAINER_multihashmap_create(total);
+ pg->peers[off].allowed_peers =
+ GNUNET_CONTAINER_multihashmap_create (total);
+ pg->peers[off].connect_peers =
+ GNUNET_CONTAINER_multihashmap_create (total);
+ pg->peers[off].blacklisted_peers =
+ GNUNET_CONTAINER_multihashmap_create (total);
pg->peers[off].pg = pg;
pg->peers[off].internal_context.peer = &pg->peers[off];
pg->peers[off].internal_context.start_cb = cb;
pg->peers[off].internal_context.start_cb_cls = cb_cls;
- GNUNET_SCHEDULER_add_now (&internal_start, &pg->peers[off].internal_context);
+ GNUNET_SCHEDULER_add_now (&internal_start,
+ &pg->peers[off].internal_context);
}
return pg;
* offsetting operation.
*/
struct GNUNET_TESTING_Daemon *
-GNUNET_TESTING_daemon_get (struct GNUNET_TESTING_PeerGroup *pg, unsigned int position)
+GNUNET_TESTING_daemon_get (struct GNUNET_TESTING_PeerGroup *pg,
+ unsigned int position)
{
if (position < pg->total)
return pg->peers[position].daemon;
* @return the daemon on success, or NULL if no such peer identity is found
*/
struct GNUNET_TESTING_Daemon *
-GNUNET_TESTING_daemon_get_by_id (struct GNUNET_TESTING_PeerGroup *pg, struct GNUNET_PeerIdentity *peer_id)
+GNUNET_TESTING_daemon_get_by_id (struct GNUNET_TESTING_PeerGroup *pg,
+ struct GNUNET_PeerIdentity *peer_id)
{
unsigned int i;
- for (i = 0; i < pg->total; i ++)
+ for (i = 0; i < pg->total; i++)
{
- if (0 == memcmp(&pg->peers[i].daemon->id, peer_id, sizeof(struct GNUNET_PeerIdentity)))
+ if (0 ==
+ memcmp (&pg->peers[i].daemon->id, peer_id,
+ sizeof (struct GNUNET_PeerIdentity)))
return pg->peers[i].daemon;
}
* @param d handle to the daemon that was restarted
* @param emsg NULL on success
*/
-void restart_callback (void *cls,
- const struct GNUNET_PeerIdentity *id,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TESTING_Daemon *d,
- const char *emsg)
+void
+restart_callback (void *cls,
+ const struct GNUNET_PeerIdentity *id,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_Daemon *d, const char *emsg)
{
struct RestartContext *restart_context = cls;
if (restart_context->peers_restarted == restart_context->peer_group->total)
{
- restart_context->callback(restart_context->callback_cls, NULL);
- GNUNET_free(restart_context);
+ restart_context->callback (restart_context->callback_cls, NULL);
+ GNUNET_free (restart_context);
}
- else if (restart_context->peers_restart_failed + restart_context->peers_restarted == restart_context->peer_group->total)
+ else if (restart_context->peers_restart_failed +
+ restart_context->peers_restarted ==
+ restart_context->peer_group->total)
{
- restart_context->callback(restart_context->callback_cls, "Failed to restart peers!");
- GNUNET_free(restart_context);
+ restart_context->callback (restart_context->callback_cls,
+ "Failed to restart peers!");
+ GNUNET_free (restart_context);
}
}
if (emsg != NULL)
{
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
- "Churn stop callback failed with error `%s'\n", emsg);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Churn stop callback failed with error `%s'\n", emsg);
churn_ctx->num_failed_stop++;
}
else
}
#if DEBUG_CHURN
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
- "Stopped peer, %d left.\n",
- churn_ctx->num_to_stop);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Stopped peer, %d left.\n", churn_ctx->num_to_stop);
#endif
- total_left = (churn_ctx->num_to_stop - churn_ctx->num_failed_stop) + (churn_ctx->num_to_start - churn_ctx->num_failed_start);
+ total_left =
+ (churn_ctx->num_to_stop - churn_ctx->num_failed_stop) +
+ (churn_ctx->num_to_start - churn_ctx->num_failed_start);
if (total_left == 0)
- {
- if ((churn_ctx->num_failed_stop > 0) || (churn_ctx->num_failed_start > 0))
- {
- GNUNET_asprintf(&error_message,
- "Churn didn't complete successfully, %u peers failed to start %u peers failed to be stopped!",
- churn_ctx->num_failed_start,
- churn_ctx->num_failed_stop);
- }
- churn_ctx->cb(churn_ctx->cb_cls, error_message);
- GNUNET_free_non_null(error_message);
- GNUNET_free(churn_ctx);
- GNUNET_free(shutdown_ctx);
- }
+ {
+ if ((churn_ctx->num_failed_stop > 0)
+ || (churn_ctx->num_failed_start > 0))
+ {
+ GNUNET_asprintf (&error_message,
+ "Churn didn't complete successfully, %u peers failed to start %u peers failed to be stopped!",
+ churn_ctx->num_failed_start,
+ churn_ctx->num_failed_stop);
+ }
+ churn_ctx->cb (churn_ctx->cb_cls, error_message);
+ GNUNET_free_non_null (error_message);
+ GNUNET_free (churn_ctx);
+ GNUNET_free (shutdown_ctx);
+ }
}
/**
unsigned int i;
unsigned int running = 0;
for (i = 0; i < pg->total; i++)
- {
- if (pg->peers[i].daemon->running == GNUNET_YES)
{
- GNUNET_assert(running != -1);
- running++;
+ if (pg->peers[i].daemon->running == GNUNET_YES)
+ {
+ GNUNET_assert (running != -1);
+ running++;
+ }
}
- }
return running;
}
* to calling gnunet-arm N times all at once).
*/
static void
-schedule_churn_shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+schedule_churn_shutdown_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct PeerShutdownContext *peer_shutdown_ctx = cls;
struct ShutdownContext *shutdown_ctx;
- GNUNET_assert(peer_shutdown_ctx != NULL);
+ GNUNET_assert (peer_shutdown_ctx != NULL);
shutdown_ctx = peer_shutdown_ctx->shutdown_ctx;
- GNUNET_assert(shutdown_ctx != NULL);
+ GNUNET_assert (shutdown_ctx != NULL);
if (shutdown_ctx->outstanding > MAX_CONCURRENT_SHUTDOWN)
- GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 100), &schedule_churn_shutdown_task, peer_shutdown_ctx);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_MILLISECONDS, 100),
+ &schedule_churn_shutdown_task,
+ peer_shutdown_ctx);
else
{
shutdown_ctx->outstanding++;
- GNUNET_TESTING_daemon_stop (peer_shutdown_ctx->daemon, shutdown_ctx->timeout, shutdown_ctx->cb, shutdown_ctx, GNUNET_NO, GNUNET_YES);
- GNUNET_free(peer_shutdown_ctx);
+ GNUNET_TESTING_daemon_stop (peer_shutdown_ctx->daemon,
+ shutdown_ctx->timeout, shutdown_ctx->cb,
+ shutdown_ctx, GNUNET_NO, GNUNET_YES);
+ GNUNET_free (peer_shutdown_ctx);
}
}
running = 0;
stopped = 0;
- if ((von == 0) && (voff == 0)) /* No peers at all? */
+ if ((von == 0) && (voff == 0)) /* No peers at all? */
{
- cb(cb_cls, NULL);
+ cb (cb_cls, NULL);
return;
}
for (i = 0; i < pg->total; i++)
- {
- if (pg->peers[i].daemon->running == GNUNET_YES)
{
- GNUNET_assert(running != -1);
- running++;
- }
- else
- {
- GNUNET_assert(stopped != -1);
- stopped++;
+ if (pg->peers[i].daemon->running == GNUNET_YES)
+ {
+ GNUNET_assert (running != -1);
+ running++;
+ }
+ else
+ {
+ GNUNET_assert (stopped != -1);
+ stopped++;
+ }
}
- }
if (voff > running)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Trying to stop more peers than are currently running!\n");
- cb(cb_cls, "Trying to stop more peers than are currently running!");
- return;
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Trying to stop more peers than are currently running!\n");
+ cb (cb_cls, "Trying to stop more peers than are currently running!");
+ return;
+ }
if (von > stopped)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Trying to start more peers than are currently stopped!\n");
- cb(cb_cls, "Trying to start more peers than are currently stopped!");
- return;
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Trying to start more peers than are currently stopped!\n");
+ cb (cb_cls, "Trying to start more peers than are currently stopped!");
+ return;
+ }
- churn_ctx = GNUNET_malloc(sizeof(struct ChurnContext));
+ churn_ctx = GNUNET_malloc (sizeof (struct ChurnContext));
running_arr = NULL;
if (running > 0)
- running_arr = GNUNET_malloc(running * sizeof(unsigned int));
+ running_arr = GNUNET_malloc (running * sizeof (unsigned int));
stopped_arr = NULL;
if (stopped > 0)
- stopped_arr = GNUNET_malloc(stopped * sizeof(unsigned int));
+ stopped_arr = GNUNET_malloc (stopped * sizeof (unsigned int));
running_permute = NULL;
stopped_permute = NULL;
if (running > 0)
- running_permute = GNUNET_CRYPTO_random_permute(GNUNET_CRYPTO_QUALITY_WEAK, running);
+ running_permute =
+ GNUNET_CRYPTO_random_permute (GNUNET_CRYPTO_QUALITY_WEAK, running);
if (stopped > 0)
- stopped_permute = GNUNET_CRYPTO_random_permute(GNUNET_CRYPTO_QUALITY_WEAK, stopped);
+ stopped_permute =
+ GNUNET_CRYPTO_random_permute (GNUNET_CRYPTO_QUALITY_WEAK, stopped);
total_running = running;
total_stopped = stopped;
churn_ctx->num_to_start = von;
churn_ctx->num_to_stop = voff;
churn_ctx->cb = cb;
- churn_ctx->cb_cls = cb_cls;
+ churn_ctx->cb_cls = cb_cls;
for (i = 0; i < pg->total; i++)
- {
- if (pg->peers[i].daemon->running == GNUNET_YES)
{
- GNUNET_assert((running_arr != NULL) && (total_running > running));
- running_arr[running] = i;
- running++;
- }
- else
- {
- GNUNET_assert((stopped_arr != NULL) && (total_stopped > stopped));
- stopped_arr[stopped] = i;
- stopped++;
+ if (pg->peers[i].daemon->running == GNUNET_YES)
+ {
+ GNUNET_assert ((running_arr != NULL) && (total_running > running));
+ running_arr[running] = i;
+ running++;
+ }
+ else
+ {
+ GNUNET_assert ((stopped_arr != NULL) && (total_stopped > stopped));
+ stopped_arr[stopped] = i;
+ stopped++;
+ }
}
- }
- GNUNET_assert(running >= voff);
+ GNUNET_assert (running >= voff);
if (voff > 0)
{
- shutdown_ctx = GNUNET_malloc(sizeof(struct ShutdownContext));
+ shutdown_ctx = GNUNET_malloc (sizeof (struct ShutdownContext));
shutdown_ctx->cb = &churn_stop_callback;
shutdown_ctx->cb_cls = churn_ctx;
shutdown_ctx->total_peers = voff;
}
for (i = 0; i < voff; i++)
- {
+ {
#if DEBUG_CHURN
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Stopping peer %d!\n", running_permute[i]);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Stopping peer %d!\n",
+ running_permute[i]);
#endif
- GNUNET_assert(running_arr != NULL);
- peer_shutdown_ctx = GNUNET_malloc(sizeof(struct PeerShutdownContext));
- peer_shutdown_ctx->daemon = pg->peers[running_arr[running_permute[i]]].daemon;
- peer_shutdown_ctx->shutdown_ctx = shutdown_ctx;
- GNUNET_SCHEDULER_add_now(&schedule_churn_shutdown_task, peer_shutdown_ctx);
-
- /*
- GNUNET_TESTING_daemon_stop (pg->peers[running_arr[running_permute[i]]].daemon,
- timeout,
- &churn_stop_callback, churn_ctx,
- GNUNET_NO, GNUNET_YES); */
- }
-
- GNUNET_assert(stopped >= von);
+ GNUNET_assert (running_arr != NULL);
+ peer_shutdown_ctx = GNUNET_malloc (sizeof (struct PeerShutdownContext));
+ peer_shutdown_ctx->daemon =
+ pg->peers[running_arr[running_permute[i]]].daemon;
+ peer_shutdown_ctx->shutdown_ctx = shutdown_ctx;
+ GNUNET_SCHEDULER_add_now (&schedule_churn_shutdown_task,
+ peer_shutdown_ctx);
+
+ /*
+ GNUNET_TESTING_daemon_stop (pg->peers[running_arr[running_permute[i]]].daemon,
+ timeout,
+ &churn_stop_callback, churn_ctx,
+ GNUNET_NO, GNUNET_YES); */
+ }
+
+ GNUNET_assert (stopped >= von);
if (von > 0)
{
- churn_startup_ctx = GNUNET_malloc(sizeof(struct ChurnRestartContext));
+ churn_startup_ctx = GNUNET_malloc (sizeof (struct ChurnRestartContext));
churn_startup_ctx->churn_ctx = churn_ctx;
churn_startup_ctx->timeout = timeout;
}
for (i = 0; i < von; i++)
{
#if DEBUG_CHURN
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Starting up peer %d!\n", stopped_permute[i]);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Starting up peer %d!\n",
+ stopped_permute[i]);
#endif
- GNUNET_assert(stopped_arr != NULL);
- peer_restart_ctx = GNUNET_malloc(sizeof(struct PeerRestartContext));
+ GNUNET_assert (stopped_arr != NULL);
+ peer_restart_ctx = GNUNET_malloc (sizeof (struct PeerRestartContext));
peer_restart_ctx->churn_restart_ctx = churn_startup_ctx;
- peer_restart_ctx->daemon = pg->peers[stopped_arr[stopped_permute[i]]].daemon;
- GNUNET_SCHEDULER_add_now(&schedule_churn_restart, peer_restart_ctx);
+ peer_restart_ctx->daemon =
+ pg->peers[stopped_arr[stopped_permute[i]]].daemon;
+ GNUNET_SCHEDULER_add_now (&schedule_churn_restart, peer_restart_ctx);
/*
- GNUNET_TESTING_daemon_start_stopped(pg->peers[stopped_arr[stopped_permute[i]]].daemon,
- timeout, &churn_start_callback, churn_ctx);*/
- }
-
- GNUNET_free_non_null(running_arr);
- GNUNET_free_non_null(stopped_arr);
- GNUNET_free_non_null(running_permute);
- GNUNET_free_non_null(stopped_permute);
+ GNUNET_TESTING_daemon_start_stopped(pg->peers[stopped_arr[stopped_permute[i]]].daemon,
+ timeout, &churn_start_callback, churn_ctx); */
+ }
+
+ GNUNET_free_non_null (running_arr);
+ GNUNET_free_non_null (stopped_arr);
+ GNUNET_free_non_null (running_permute);
+ GNUNET_free_non_null (stopped_permute);
}
if (pg->total > 0)
{
- restart_context = GNUNET_malloc(sizeof(struct RestartContext));
+ restart_context = GNUNET_malloc (sizeof (struct RestartContext));
restart_context->peer_group = pg;
restart_context->peers_restarted = 0;
restart_context->callback = callback;
for (off = 0; off < pg->total; off++)
{
- GNUNET_TESTING_daemon_restart (pg->peers[off].daemon, &restart_callback, restart_context);
+ GNUNET_TESTING_daemon_restart (pg->peers[off].daemon,
+ &restart_callback, restart_context);
}
}
}
* @param cb_cls closure for cb
*/
void
-GNUNET_TESTING_daemons_vary (struct GNUNET_TESTING_PeerGroup *pg,
- unsigned int offset,
- int desired_status,
- struct GNUNET_TIME_Relative timeout,
- GNUNET_TESTING_NotifyCompletion cb,
- void *cb_cls)
+GNUNET_TESTING_daemons_vary (struct GNUNET_TESTING_PeerGroup *pg,
+ unsigned int offset,
+ int desired_status,
+ struct GNUNET_TIME_Relative timeout,
+ GNUNET_TESTING_NotifyCompletion cb, void *cb_cls)
{
struct ShutdownContext *shutdown_ctx;
struct ChurnRestartContext *startup_ctx;
if (GNUNET_NO == desired_status)
{
if (NULL != pg->peers[offset].daemon)
- {
- shutdown_ctx = GNUNET_malloc(sizeof(struct ShutdownContext));
- churn_ctx = GNUNET_malloc(sizeof(struct ChurnContext));
- churn_ctx->num_to_start = 0;
- churn_ctx->num_to_stop = 1;
- churn_ctx->cb = cb;
- churn_ctx->cb_cls = cb_cls;
- shutdown_ctx->cb_cls = churn_ctx;
- GNUNET_TESTING_daemon_stop(pg->peers[offset].daemon,
- timeout, &churn_stop_callback, shutdown_ctx,
- GNUNET_NO, GNUNET_YES);
- }
+ {
+ shutdown_ctx = GNUNET_malloc (sizeof (struct ShutdownContext));
+ churn_ctx = GNUNET_malloc (sizeof (struct ChurnContext));
+ churn_ctx->num_to_start = 0;
+ churn_ctx->num_to_stop = 1;
+ churn_ctx->cb = cb;
+ churn_ctx->cb_cls = cb_cls;
+ shutdown_ctx->cb_cls = churn_ctx;
+ GNUNET_TESTING_daemon_stop (pg->peers[offset].daemon,
+ timeout, &churn_stop_callback,
+ shutdown_ctx, GNUNET_NO, GNUNET_YES);
+ }
}
else if (GNUNET_YES == desired_status)
{
if (NULL == pg->peers[offset].daemon)
- {
- startup_ctx = GNUNET_malloc(sizeof(struct ChurnRestartContext));
- churn_ctx = GNUNET_malloc(sizeof(struct ChurnContext));
- churn_ctx->num_to_start = 1;
- churn_ctx->num_to_stop = 0;
- churn_ctx->cb = cb;
- churn_ctx->cb_cls = cb_cls;
- startup_ctx->churn_ctx = churn_ctx;
- GNUNET_TESTING_daemon_start_stopped(pg->peers[offset].daemon,
- timeout, &churn_start_callback, startup_ctx);
- }
+ {
+ startup_ctx = GNUNET_malloc (sizeof (struct ChurnRestartContext));
+ churn_ctx = GNUNET_malloc (sizeof (struct ChurnContext));
+ churn_ctx->num_to_start = 1;
+ churn_ctx->num_to_stop = 0;
+ churn_ctx->cb = cb;
+ churn_ctx->cb_cls = cb_cls;
+ startup_ctx->churn_ctx = churn_ctx;
+ GNUNET_TESTING_daemon_start_stopped (pg->peers[offset].daemon,
+ timeout, &churn_start_callback,
+ startup_ctx);
+ }
}
else
GNUNET_break (0);
* @param cls closure (struct ShutdownContext)
* @param emsg NULL on success
*/
-void internal_shutdown_callback (void *cls,
- const char *emsg)
+void
+internal_shutdown_callback (void *cls, const char *emsg)
{
struct ShutdownContext *shutdown_ctx = cls;
shutdown_ctx->peers_failed++;
}
- if ((shutdown_ctx->cb != NULL) && (shutdown_ctx->peers_down + shutdown_ctx->peers_failed == shutdown_ctx->total_peers))
+ if ((shutdown_ctx->cb != NULL)
+ && (shutdown_ctx->peers_down + shutdown_ctx->peers_failed ==
+ shutdown_ctx->total_peers))
{
if (shutdown_ctx->peers_failed > 0)
- shutdown_ctx->cb(shutdown_ctx->cb_cls, "Not all peers successfully shut down!");
+ shutdown_ctx->cb (shutdown_ctx->cb_cls,
+ "Not all peers successfully shut down!");
else
- shutdown_ctx->cb(shutdown_ctx->cb_cls, NULL);
- GNUNET_free(shutdown_ctx);
+ shutdown_ctx->cb (shutdown_ctx->cb_cls, NULL);
+ GNUNET_free (shutdown_ctx);
}
}
* to calling gnunet-arm N times all at once).
*/
static void
-schedule_shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc)
+schedule_shutdown_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct PeerShutdownContext *peer_shutdown_ctx = cls;
struct ShutdownContext *shutdown_ctx;
- GNUNET_assert(peer_shutdown_ctx != NULL);
+ GNUNET_assert (peer_shutdown_ctx != NULL);
shutdown_ctx = peer_shutdown_ctx->shutdown_ctx;
- GNUNET_assert(shutdown_ctx != NULL);
+ GNUNET_assert (shutdown_ctx != NULL);
if (shutdown_ctx->outstanding > MAX_CONCURRENT_SHUTDOWN)
- GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 100), &schedule_shutdown_task, peer_shutdown_ctx);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_MILLISECONDS, 100),
+ &schedule_shutdown_task, peer_shutdown_ctx);
else
{
shutdown_ctx->outstanding++;
- GNUNET_TESTING_daemon_stop (peer_shutdown_ctx->daemon, shutdown_ctx->timeout, &internal_shutdown_callback, shutdown_ctx, GNUNET_YES, GNUNET_NO);
- GNUNET_free(peer_shutdown_ctx);
+ GNUNET_TESTING_daemon_stop (peer_shutdown_ctx->daemon,
+ shutdown_ctx->timeout,
+ &internal_shutdown_callback, shutdown_ctx,
+ GNUNET_YES, GNUNET_NO);
+ GNUNET_free (peer_shutdown_ctx);
}
}
* @param cb_cls closure for cb
*/
void
-GNUNET_TESTING_daemons_stop (struct GNUNET_TESTING_PeerGroup *pg,
- struct GNUNET_TIME_Relative timeout,
- GNUNET_TESTING_NotifyCompletion cb,
- void *cb_cls)
+GNUNET_TESTING_daemons_stop (struct GNUNET_TESTING_PeerGroup *pg,
+ struct GNUNET_TIME_Relative timeout,
+ GNUNET_TESTING_NotifyCompletion cb, void *cb_cls)
{
unsigned int off;
struct ShutdownContext *shutdown_ctx;
struct PeerShutdownContext *peer_shutdown_ctx;
- GNUNET_assert(pg->total > 0);
+ GNUNET_assert (pg->total > 0);
- shutdown_ctx = GNUNET_malloc(sizeof(struct ShutdownContext));
+ shutdown_ctx = GNUNET_malloc (sizeof (struct ShutdownContext));
shutdown_ctx->cb = cb;
shutdown_ctx->cb_cls = cb_cls;
shutdown_ctx->total_peers = pg->total;
for (off = 0; off < pg->total; off++)
{
- GNUNET_assert(NULL != pg->peers[off].daemon);
- peer_shutdown_ctx = GNUNET_malloc(sizeof(struct PeerShutdownContext));
+ GNUNET_assert (NULL != pg->peers[off].daemon);
+ peer_shutdown_ctx = GNUNET_malloc (sizeof (struct PeerShutdownContext));
peer_shutdown_ctx->daemon = pg->peers[off].daemon;
peer_shutdown_ctx->shutdown_ctx = shutdown_ctx;
- GNUNET_SCHEDULER_add_now(&schedule_shutdown_task, peer_shutdown_ctx);
+ GNUNET_SCHEDULER_add_now (&schedule_shutdown_task, peer_shutdown_ctx);
//GNUNET_TESTING_daemon_stop (pg->peers[off].daemon, timeout, shutdown_cb, shutdown_ctx, GNUNET_YES, GNUNET_NO);
if (NULL != pg->peers[off].cfg)
GNUNET_CONFIGURATION_destroy (pg->peers[off].cfg);
if (pg->peers[off].allowed_peers != NULL)
- GNUNET_CONTAINER_multihashmap_destroy(pg->peers[off].allowed_peers);
+ GNUNET_CONTAINER_multihashmap_destroy (pg->peers[off].allowed_peers);
if (pg->peers[off].connect_peers != NULL)
- GNUNET_CONTAINER_multihashmap_destroy(pg->peers[off].connect_peers);
+ GNUNET_CONTAINER_multihashmap_destroy (pg->peers[off].connect_peers);
if (pg->peers[off].blacklisted_peers != NULL)
- GNUNET_CONTAINER_multihashmap_destroy(pg->peers[off].blacklisted_peers);
+ GNUNET_CONTAINER_multihashmap_destroy (pg->
+ peers[off].blacklisted_peers);
}
GNUNET_free (pg->peers);
for (off = 0; off < pg->num_hosts; off++)
projects / oweals / gnunet.git / commitdiff