#define MAX_CONCURRENT_SHUTDOWN 200
-#define CONNECT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 180)
+#define CONNECT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
-#define CONNECT_ATTEMPTS 30
+#define CONNECT_ATTEMPTS 12
/**
* Which list of peers do we need to modify?
switch (list)
{
case ALLOWED:
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Adding to ALLOWED\n");
first_list = &pg->peers[first].allowed_peers_head;
second_list = &pg->peers[second].allowed_peers_head;
first_tail = &pg->peers[first].allowed_peers_tail;
if (add_first)
{
#if OLD
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Adding peer %d to %d\n", second, first);
new_first = GNUNET_malloc (sizeof (struct PeerConnection));
new_first->index = second;
GNUNET_CONTAINER_DLL_insert(*first_list, *first_tail, new_first);
*
* @param pg the peer group we are dealing with
* @param proc the connection processor to use
+ * @param list the peer list to use
*
* @return the number of connections created
*/
* @param pg the peergroup to create the topology on
* @param proc the connection processor to call to actually set
* up connections between two peers
+ * @param list the peer list to use
*
* @return the number of connections that were set up
*
* @param pg the peergroup to create the topology on
* @param proc the connection processor to call to actually set
* up connections between two peers
+ * @param list the peer list to use
*
* @return the number of connections that were set up
*
* @param pg the peergroup to create the topology on
* @param proc the connection processor to call to actually set
* up connections between two peers
+ * @param list the peer list to use
*
* @return the number of connections that were set up
*
* @param pg the peergroup to create the topology on
* @param proc the connection processor to call to actually set
* up connections between two peers
+ * @param list the peer list to use
*
* @return the number of connections that were set up
*
* @param pg the peergroup to create the topology on
* @param proc the connection processor to call to actually set
* up connections between two peers
+ * @param list the peer list to use
*
* @return the number of connections that were set up
*
* @param pg the peergroup to create the topology on
* @param proc the connection processor to call to actually set
* up connections between two peers
+ * @param list the peer list to use
*
* @return the number of connections that were set up
*
* @param filename the file to read topology information from
* @param proc the connection processor to call to actually set
* up connections between two peers
+ * @param list the peer list to use
*
* @return the number of connections that were set up
*
* @param pg the peergroup to create the topology on
* @param proc the connection processor to call to actually set
* up connections between two peers
+ * @param list the peer list to use
*
* @return the number of connections that were set up
*
num_connections = create_from_file (pg, filename, &add_connections, ALLOWED);
else
{
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Missing configuration option TESTING:TOPOLOGY_FILE for creating topology from file!");
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Missing configuration option TESTING:TOPOLOGY_FILE for creating topology from file!\n");
num_connections = 0;
}
break;
_
("Creating no allowed topology (all peers can connect at core level)\n"));
#endif
- num_connections = 0;
+ num_connections = pg->total * pg->total; /* Clique is allowed! */
break;
default:
num_connections = 0;
* @param pg the peergroup we are dealing with
* @param num how many connections at least should each peer have (if possible)?
* @param proc processor to actually add the connections
+ * @param list the peer list to use
*/
void
add_closest (struct GNUNET_TESTING_PeerGroup *pg, unsigned int num,
else
proc = GNUNET_OS_start_process (NULL, NULL, "ssh",
"ssh", arg, "mkdir -p", baseservicehome, NULL);
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Creating remote dir with command ssh %s %s %s\n", arg, " mkdir -p ", baseservicehome);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Creating remote dir with command ssh %s %s %s\n", arg, " mkdir -p ", baseservicehome);
GNUNET_OS_process_wait(proc);
}
GNUNET_free(baseservicehome);
&hostkeys_file))
{
if (GNUNET_YES != GNUNET_DISK_file_test (hostkeys_file))
- GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Couldn't read hostkeys file!");
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Couldn't read hostkeys file!\n");
else
{
/* Check hostkey file size, read entire thing into memory */