#include "gnunet_testing_lib.h"
#include "gnunet_core_service.h"
-#define VERBOSE_TESTING GNUNET_NO
+#define VERBOSE_TESTING GNUNET_YES
#define VERBOSE_TOPOLOGY GNUNET_YES
#define DEBUG_CHURN GNUNET_NO
+#define OLD 1
+
/**
* Lowest port used for GNUnet testing. Should be high enough to not
* conflict with other applications running on the hosts but be low
* enough to not conflict with client-ports (typically starting around
* 32k).
*/
-#define LOW_PORT 10000
+#define LOW_PORT 12000
/**
* Highest port used for GNUnet testing. Should be low enough to not
*/
#define HIGH_PORT 56000
-#define MAX_OUTSTANDING_CONNECTIONS 40
-
-#define MAX_CONCURRENT_HOSTKEYS 10
+/* Maximum time to delay connect attempt */
+#define MAX_CONNECT_DELAY 300
-#define MAX_CONCURRENT_STARTING 10
+/**
+ * Which list of peers do we need to modify?
+ */
+enum PeerLists
+{
+ /** Modify allowed peers */
+ ALLOWED,
-#define MAX_CONCURRENT_SHUTDOWN 10
+ /** Modify connect peers */
+ CONNECT,
-#define CONNECT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 200)
+ /** Modify blacklist peers */
+ BLACKLIST,
-#define CONNECT_ATTEMPTS 21
+ /** Modify workingset peers */
+ WORKING_SET
+};
/**
* Prototype of a function called whenever two peers would be connected
unsigned int
first,
unsigned int
- second);
+ second,
+ enum PeerLists list);
/**
*/
struct ChurnContext
{
+ /**
+ * The peergroup we are dealing with.
+ */
+ struct GNUNET_TESTING_PeerGroup *pg;
+
/**
* Callback used to notify of churning finished
*/
struct ShutdownContext
{
+ struct GNUNET_TESTING_PeerGroup *pg;
/**
* Total peers to wait for
*/
void *cls;
};
+enum States
+{
+ /** Waiting to read number of peers */
+ NUM_PEERS,
+
+ /** Should find next peer index */
+ PEER_INDEX,
+
+ /** Should find colon */
+ COLON,
+
+ /** Should read other peer index, space, or endline */
+ OTHER_PEER_INDEX
+};
+
+
#if OLD
struct PeerConnection
{
+ /**
+ * Doubly Linked list
+ */
+ struct PeerConnection *prev;
+
/*
- * Linked list
+ * Doubly Linked list
*/
struct PeerConnection *next;
+
/*
- * Pointer to daemon handle
+ * Index of daemon in pg->peers
*/
- struct GNUNET_TESTING_Daemon *daemon;
+ uint32_t index;
};
#endif
*/
const char *username;
+ /**
+ * Pointer to starting memory location of a hostkey
+ */
+ const char *hostkey;
+
/**
* Port to use for ssh.
*/
struct ChurnRestartContext
{
+ /**
+ * PeerGroup that we are working with.
+ */
+ struct GNUNET_TESTING_PeerGroup *pg;
+
/**
* Number of restarts currently in flight.
*/
struct GNUNET_TIME_Relative timeout;
};
+struct OutstandingSSH
+{
+ struct OutstandingSSH *next;
+
+ struct OutstandingSSH *prev;
+
+ /**
+ * Number of current ssh connections.
+ */
+ uint32_t outstanding;
+
+ /**
+ * The hostname of this peer.
+ */
+ const char *hostname;
+};
+
/**
* Data we keep per peer.
*/
*/
struct GNUNET_TESTING_PeerGroup *pg;
+#if OLD
+ /**
+ * Linked list of allowed peer connections.
+ */
+ struct PeerConnection *allowed_peers_head;
+
+ /**
+ * Linked list of allowed peer connections.
+ */
+ struct PeerConnection *allowed_peers_tail;
+
+ /**
+ * Linked list of blacklisted peer connections.
+ */
+ struct PeerConnection *blacklisted_peers_head;
+
+ /**
+ * Linked list of blacklisted peer connections.
+ */
+ struct PeerConnection *blacklisted_peers_tail;
+
+ /**
+ * Linked list of connect peer connections.
+ */
+ struct PeerConnection *connect_peers_head;
+
+ /**
+ * Linked list of connect peer connections.
+ */
+ struct PeerConnection *connect_peers_tail;
+
+ /**
+ * Linked list of connect peer connections.
+ */
+ struct PeerConnection *connect_peers_working_set_head;
+
+ /**
+ * Linked list of connect peer connections.
+ */
+ struct PeerConnection *connect_peers_working_set_tail;
+
+#else
/**
* Hash map of allowed peer connections (F2F created topology)
*/
* Temporary hash map of peer connections
*/
struct GNUNET_CONTAINER_MultiHashMap *connect_peers_working_set;
+#endif
/**
* Temporary variable for topology creation, should be reset before
struct TopologyIterateContext
{
+ /**
+ * The peergroup we are working with.
+ */
+ struct GNUNET_TESTING_PeerGroup *pg;
+
/**
* Callback for notifying of two connected peers.
*/
struct StatsIterateContext
{
+ /**
+ * The peergroup that we are dealing with.
+ */
+ struct GNUNET_TESTING_PeerGroup *pg;
+
/**
* Continuation to call once all stats information has been retrieved.
*/
* How many peers have already been started?
*/
unsigned int started;
+
+ /**
+ * Number of possible connections to peers
+ * at a time.
+ */
+ unsigned int max_outstanding_connections;
+
+ /**
+ * Number of ssh connections to peers (max).
+ */
+ unsigned int max_concurrent_ssh;
+
+ /**
+ * Number of connects we are waiting on, allows us to rate limit
+ * connect attempts.
+ */
+ unsigned int outstanding_connects;
+
+ /**
+ * How many connects have already been scheduled?
+ */
+ unsigned int total_connects_scheduled;
+
+ /**
+ * Hostkeys loaded from a file.
+ */
+ char *hostkey_data;
+
+ /**
+ * Head of DLL to keep track of the number of outstanding
+ * ssh connections per peer.
+ */
+ struct OutstandingSSH *ssh_head;
+
+ /**
+ * Tail of DLL to keep track of the number of outstanding
+ * ssh connections per peer.
+ */
+ struct OutstandingSSH *ssh_tail;
};
struct UpdateContext
*/
unsigned int remaining_connections;
+ /**
+ * How many more connections do we need to schedule?
+ */
+ unsigned int remaining_connects_to_schedule;
+
/**
* Handle to group of peers.
*/
struct GNUNET_TESTING_PeerGroup *pg;
+ /**
+ * How long to try this connection before timing out.
+ */
+ struct GNUNET_TIME_Relative connect_timeout;
+
+ /**
+ * How many times to retry connecting the two peers.
+ */
+ unsigned int connect_attempts;
+
/**
* Temp value set for each iteration.
*/
- struct PeerData *first;
+ //struct PeerData *first;
/**
* Notification that all peers are connected.
* Higher level topology connection context.
*/
struct ConnectTopologyContext *ct_ctx;
+
+ /**
+ * Whether this connection has been accounted for in the schedule_connect call.
+ */
+ int counted;
+};
+
+struct UnblacklistContext
+{
+ /**
+ * The peergroup
+ */
+ struct GNUNET_TESTING_PeerGroup *pg;
+
+ /**
+ * uid of the first peer
+ */
+ uint32_t first_uid;
+};
+
+struct RandomContext
+{
+ /**
+ * The peergroup
+ */
+ struct GNUNET_TESTING_PeerGroup *pg;
+
+ /**
+ * uid of the first peer
+ */
+ uint32_t first_uid;
+
+ /**
+ * Peer data for first peer.
+ */
+ struct PeerData *first;
+
+ /**
+ * Random percentage to use
+ */
+ double percentage;
+};
+
+struct MinimumContext
+{
+ /**
+ * The peergroup
+ */
+ struct GNUNET_TESTING_PeerGroup *pg;
+
+ /**
+ * uid of the first peer
+ */
+ uint32_t first_uid;
+
+ /**
+ * Peer data for first peer.
+ */
+ struct PeerData *first;
+
+ /**
+ * Number of conns per peer
+ */
+ unsigned int num_to_add;
+
+ /**
+ * Permuted array of all possible connections. Only add the Nth
+ * peer if it's in the Nth position.
+ */
+ unsigned int *pg_array;
+
+ /**
+ * What number is the current element we are iterating over?
+ */
+ unsigned int current;
+};
+
+struct DFSContext
+{
+ /**
+ * The peergroup
+ */
+ struct GNUNET_TESTING_PeerGroup *pg;
+
+ /**
+ * uid of the first peer
+ */
+ uint32_t first_uid;
+
+ /**
+ * uid of the second peer
+ */
+ uint32_t second_uid;
+
+ /**
+ * Peer data for first peer.
+ */
+ struct PeerData *first;
+
+ /**
+ * Which peer has been chosen as the one to add?
+ */
+ unsigned int chosen;
+
+ /**
+ * What number is the current element we are iterating over?
+ */
+ unsigned int current;
};
+#if !OLD
/**
* Convert unique ID to hash code.
*
{
memcpy (uid, hash, sizeof (uint32_t));
}
-
-/**
- * Number of connects we are waiting on, allows us to rate limit
- * connect attempts.
- */
-static int outstanding_connects;
+#endif
/**
* Get a topology from a string input.
*/
"NONE",
+ /**
+ * Read the topology from a file.
+ */
+ "FROM_FILE",
+
NULL
};
"/tmp/test-service-%s-%u", section, ctx->upnum++);
value = uval;
}
- else if (GNUNET_YES ==
+ else if ((GNUNET_YES ==
GNUNET_CONFIGURATION_get_value_number (ctx->orig, "testing",
per_host_variable,
- &num_per_host))
+ &num_per_host)) && (num_per_host > 0))
+
{
GNUNET_snprintf (uval,
sizeof (uval),
}
GNUNET_free (single_variable);
GNUNET_free (per_host_variable);
-
}
if ((0 == strcmp (option, "HOSTNAME")) && (ctx->hostname != NULL))
* out of "*port" numbers, return NULL.
*
* @param cfg template configuration
+ * @param off the current peer offset
* @param port port numbers to use, update to reflect
* port numbers that were used
* @param upnum number to make unix domain socket names unique
*/
static struct GNUNET_CONFIGURATION_Handle *
make_config (const struct GNUNET_CONFIGURATION_Handle *cfg,
+ uint32_t off,
uint16_t * port,
uint32_t * upnum, const char *hostname, uint32_t * fdnum)
{
uint16_t orig;
char *control_host;
char *allowed_hosts;
+ unsigned long long temp_port;
orig = *port;
uc.nport = *port;
allowed_hosts);
GNUNET_CONFIGURATION_set_value_string (uc.ret, "statistics",
"ACCEPT_FROM", allowed_hosts);
+
+ GNUNET_CONFIGURATION_set_value_string (uc.ret, "core", "UNIXPATH", "");
+ GNUNET_CONFIGURATION_set_value_string (uc.ret, "transport", "UNIXPATH", "");
+ GNUNET_CONFIGURATION_set_value_string (uc.ret, "dht", "UNIXPATH", "");
+ GNUNET_CONFIGURATION_set_value_string (uc.ret, "statistics", "UNIXPATH", "");
+
+
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number(uc.orig, "statistics", "port", &temp_port) &&
+ (temp_port != 0) &&
+ (GNUNET_YES !=
+ GNUNET_CONFIGURATION_get_value_yesno (uc.orig, "testing",
+ "single_statistics_per_host")))
+ {
+ GNUNET_CONFIGURATION_set_value_number (uc.ret, "statistics", "port", temp_port + off);
+ }
+
GNUNET_free_non_null (control_host);
GNUNET_free (allowed_hosts);
}
return uc.ret;
}
-
/*
- * Add entries to the peers connect list
+ * Add entries to the some list
*
* @param pg the peer group we are working with
* @param first index of the first peer
* @param second index of the second peer
+ * @param list the peer list to use
*
- * @return the number of connections added
- * technically should only be 0 or 2
+ * @return the number of connections added (can be 0, 1 or 2)
*
*/
static unsigned int
-add_actual_connections (struct GNUNET_TESTING_PeerGroup *pg,
- unsigned int first, unsigned int second)
+remove_connections (struct GNUNET_TESTING_PeerGroup *pg,
+ unsigned int first, unsigned int second,
+ enum PeerLists list)
{
- int added;
- int add_first;
- int add_second;
+ int removed;
+#if OLD
+ struct PeerConnection **first_list;
+ struct PeerConnection **second_list;
+ struct PeerConnection *first_iter;
+ struct PeerConnection *second_iter;
+ struct PeerConnection **first_tail;
+ struct PeerConnection **second_tail;
+#else
GNUNET_HashCode hash_first;
GNUNET_HashCode hash_second;
hash_from_uid (first, &hash_first);
hash_from_uid (second, &hash_second);
+#endif
- add_first = GNUNET_NO;
- if (GNUNET_NO ==
- GNUNET_CONTAINER_multihashmap_contains (pg->peers[first].connect_peers,
- &hash_second))
+ removed = 0;
+#if OLD
+ switch (list)
+ {
+ case ALLOWED:
+ first_list = &pg->peers[first].allowed_peers_head;
+ second_list = &pg->peers[second].allowed_peers_head;
+ first_tail = &pg->peers[first].allowed_peers_tail;
+ second_tail = &pg->peers[second].allowed_peers_tail;
+ break;
+ case CONNECT:
+ first_list = &pg->peers[first].connect_peers_head;
+ second_list = &pg->peers[second].connect_peers_head;
+ first_tail = &pg->peers[first].connect_peers_tail;
+ second_tail = &pg->peers[second].connect_peers_tail;
+ break;
+ case BLACKLIST:
+ first_list = &pg->peers[first].blacklisted_peers_head;
+ second_list = &pg->peers[second].blacklisted_peers_head;
+ first_tail = &pg->peers[first].blacklisted_peers_tail;
+ second_tail = &pg->peers[second].blacklisted_peers_tail;
+ break;
+ case WORKING_SET:
+ first_list = &pg->peers[first].connect_peers_working_set_head;
+ second_list = &pg->peers[second].connect_peers_working_set_head;
+ first_tail = &pg->peers[first].connect_peers_working_set_tail;
+ second_tail = &pg->peers[second].connect_peers_working_set_tail;
+ break;
+ default:
+ GNUNET_break(0);
+ return 0;
+ }
+
+ first_iter = *first_list;
+ while (first_iter != NULL)
{
- add_first = GNUNET_YES;
+ if (first_iter->index == second)
+ {
+ GNUNET_CONTAINER_DLL_remove(*first_list, *first_tail, first_iter);
+ GNUNET_free(first_iter);
+ removed++;
+ break;
+ }
+ first_iter = first_iter->next;
}
- add_second = GNUNET_NO;
- if (GNUNET_NO ==
- GNUNET_CONTAINER_multihashmap_contains (pg->peers[second].connect_peers,
- &hash_first))
+ second_iter = *second_list;
+ while (second_iter != NULL)
{
- add_second = GNUNET_YES;
+ if (second_iter->index == first)
+ {
+ GNUNET_CONTAINER_DLL_remove(*second_list, *second_tail, second_iter);
+ GNUNET_free(second_iter);
+ removed++;
+ break;
+ }
+ second_iter = second_iter->next;
}
-
- added = 0;
- if (add_first)
+#else
+ if (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_contains (pg->peers[first].blacklisted_peers,
+ &hash_second))
{
- 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++;
+ GNUNET_CONTAINER_multihashmap_remove_all (pg->peers[first].blacklisted_peers,
+ &hash_second);
}
- if (add_second)
+ if (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_contains (pg->peers[second].blacklisted_peers,
+ &hash_first))
{
- 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++;
+ GNUNET_CONTAINER_multihashmap_remove_all (pg->peers[second].blacklisted_peers,
+ &hash_first);
}
+#endif
- return added;
+ return removed;
}
-
/*
- * Add entries to the peers allowed connections list
+ * Add entries to the some list
*
* @param pg the peer group we are working with
* @param first index of the first peer
* @param second index of the second peer
+ * @param list the list type that we should modify
*
* @return the number of connections added (can be 0, 1 or 2)
- * technically should only be 0 or 2, but the small price
- * of iterating over the lists (hashmaps in the future)
- * for being sure doesn't bother me!
*
*/
static unsigned int
-add_allowed_connections (struct GNUNET_TESTING_PeerGroup *pg,
- unsigned int first, unsigned int second)
+add_connections (struct GNUNET_TESTING_PeerGroup *pg,
+ unsigned int first, unsigned int second,
+ enum PeerLists list)
{
int added;
+ int add_first;
+ int add_second;
#if OLD
+ struct PeerConnection **first_list;
+ struct PeerConnection **second_list;
struct PeerConnection *first_iter;
struct PeerConnection *second_iter;
struct PeerConnection *new_first;
struct PeerConnection *new_second;
-#endif
- int add_first;
- int add_second;
-
+ struct PeerConnection **first_tail;
+ struct PeerConnection **second_tail;
+#else
GNUNET_HashCode hash_first;
GNUNET_HashCode hash_second;
hash_from_uid (first, &hash_first);
hash_from_uid (second, &hash_second);
+#endif
- add_first = GNUNET_NO;
- 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))
- {
- add_second = GNUNET_YES;
- }
#if OLD
- first_iter = pg->peers[first].connected_peers;
+ switch (list)
+ {
+ case ALLOWED:
+ first_list = &pg->peers[first].allowed_peers_head;
+ second_list = &pg->peers[second].allowed_peers_head;
+ first_tail = &pg->peers[first].allowed_peers_tail;
+ second_tail = &pg->peers[second].allowed_peers_tail;
+ break;
+ case CONNECT:
+ first_list = &pg->peers[first].connect_peers_head;
+ second_list = &pg->peers[second].connect_peers_head;
+ first_tail = &pg->peers[first].connect_peers_tail;
+ second_tail = &pg->peers[second].connect_peers_tail;
+ break;
+ case BLACKLIST:
+ first_list = &pg->peers[first].blacklisted_peers_head;
+ second_list = &pg->peers[second].blacklisted_peers_head;
+ first_tail = &pg->peers[first].blacklisted_peers_tail;
+ second_tail = &pg->peers[second].blacklisted_peers_tail;
+ break;
+ case WORKING_SET:
+ first_list = &pg->peers[first].connect_peers_working_set_head;
+ second_list = &pg->peers[second].connect_peers_working_set_head;
+ first_tail = &pg->peers[first].connect_peers_working_set_tail;
+ second_tail = &pg->peers[second].connect_peers_working_set_tail;
+ break;
+ default:
+ GNUNET_break(0);
+ return 0;
+ }
+
+ add_first = GNUNET_YES;
+ add_second = GNUNET_YES;
+
+ first_iter = *first_list;
while (first_iter != NULL)
{
- if (first_iter->daemon == pg->peers[second].daemon)
- add_first = GNUNET_NO;
+ if (first_iter->index == second)
+ {
+ add_first = GNUNET_NO;
+ break;
+ }
first_iter = first_iter->next;
}
- second_iter = pg->peers[second].connected_peers;
- add_second = GNUNET_YES;
+ second_iter = *second_list;
while (second_iter != NULL)
{
- if (second_iter->daemon == pg->peers[first].daemon)
- add_second = GNUNET_NO;
+ if (second_iter->index == first)
+ {
+ add_second = GNUNET_NO;
+ break;
+ }
second_iter = second_iter->next;
}
-#endif
-
- 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));
-#if OLD
- 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;
-#endif
- pg->peers[first].num_connections++;
- added++;
- }
-
- 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));
-#if OLD
- 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;
- pg->peers[first].num_connections++;
-#endif
- pg->peers[second].num_connections++;
- added++;
- }
-
- return added;
-}
-
-/*
- * Add entries to the peers blacklisted list
- *
- * @param pg the peer group we are working with
- * @param first index of the first peer
- * @param second index of the second peer
- *
- * @return the number of connections added (can be 0, 1 or 2)
- *
- */
-static unsigned int
-blacklist_connections (struct GNUNET_TESTING_PeerGroup *pg,
- unsigned int first, unsigned int second)
-{
- int added;
- int add_first;
- int add_second;
- GNUNET_HashCode hash_first;
- GNUNET_HashCode hash_second;
-
- hash_from_uid (first, &hash_first);
- hash_from_uid (second, &hash_second);
-
- add_first = GNUNET_NO;
+#else
if (GNUNET_NO ==
- GNUNET_CONTAINER_multihashmap_contains (pg->
- peers[first].blacklisted_peers,
+ 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,
+ GNUNET_CONTAINER_multihashmap_contains (pg->peers[second].blacklisted_peers,
&hash_first))
{
add_second = GNUNET_YES;
}
+#endif
added = 0;
if (add_first)
{
+#if OLD
+ new_first = GNUNET_malloc (sizeof (struct PeerConnection));
+ new_first->index = second;
+ GNUNET_CONTAINER_DLL_insert(*first_list, *first_tail, new_first);
+ /*
+ new_first->next = *first_list;
+ *first_list = new_first;*/
+#else
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_CONTAINER_multihashmap_put (pg->
+ peers
+ [first].blacklisted_peers,
+ &hash_second,
+ pg->
+ peers[second].daemon,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+#endif
pg->peers[first].num_connections++;
added++;
}
if (add_second)
{
+#if OLD
+ new_second = GNUNET_malloc (sizeof (struct PeerConnection));
+ new_second->index = first;
+ GNUNET_CONTAINER_DLL_insert(*second_list, *second_tail, new_second);
+ /*
+ new_second->next = *second_list;
+ *second_list = new_second;
+ *second_list */
+#else
GNUNET_assert (GNUNET_OK ==
GNUNET_CONTAINER_multihashmap_put (pg->
peers
pg->
peers[first].daemon,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+#endif
pg->peers[second].num_connections++;
added++;
}
return added;
}
-/*
- * Remove entries from the peers blacklisted list
- *
- * @param pg the peer group we are working with
- * @param first index of the first peer
- * @param second index of the second peer
- *
- * @return the number of connections removed (can be 0, 1 or 2)
- *
- */
-static unsigned int
-unblacklist_connections (struct GNUNET_TESTING_PeerGroup *pg,
- unsigned int first, unsigned int second)
-{
- int removed;
- int remove_first;
- int remove_second;
- GNUNET_HashCode hash_first;
- GNUNET_HashCode 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);
-
- removed = 0;
- if (remove_first)
- {
- 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));
- removed++;
- }
-
- return removed;
-}
/**
* Scale free network construction as described in:
*
* @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
*/
static unsigned int
create_scale_free (struct GNUNET_TESTING_PeerGroup *pg,
- GNUNET_TESTING_ConnectionProcessor proc)
+ GNUNET_TESTING_ConnectionProcessor proc, enum PeerLists list)
{
unsigned int total_connections;
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, list);
for (outer_count = 1; outer_count < pg->total; outer_count++)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"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, list);
}
}
}
/**
* Create a topology given a peer group (set of running peers)
- * and a connection processor.
+ * and a connection processor. Creates a small world topology
+ * according to the rewired ring construction. The basic
+ * behavior is that a ring topology is created, but with some
+ * probability instead of connecting a peer to the next
+ * neighbor in the ring a connection will be created to a peer
+ * selected uniformly at random. We use the TESTING
+ * PERCENTAGE option to specify what number of
+ * connections each peer should have. Default is 2,
+ * which makes the ring, any given number is multiplied by
+ * the log of the network size; i.e. a PERCENTAGE of 2 makes
+ * each peer have on average 2logn connections. The additional
+ * connections are made at increasing distance around the ring
+ * from the original peer, or to random peers based on the re-
+ * wiring probability. The TESTING
+ * PROBABILITY option is used as the probability that a given
+ * connection is rewired.
*
* @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
*
*/
static unsigned int
create_small_world_ring (struct GNUNET_TESTING_PeerGroup *pg,
- GNUNET_TESTING_ConnectionProcessor proc)
+ GNUNET_TESTING_ConnectionProcessor proc, enum PeerLists list)
{
unsigned int i, j;
int nodeToConnect;
unsigned int natLog;
unsigned int randomPeer;
- double random, logNModifier, percentage;
+ double random, logNModifier, probability;
unsigned int smallWorldConnections;
int connsPerPeer;
char *p_string;
logNModifier = 0.5; /* FIXME: default value? */
if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (pg->cfg,
"TESTING",
- "LOGNMODIFIER",
+ "PERCENTAGE",
&p_string))
{
if (sscanf (p_string, "%lf", &logNModifier) != 1)
p_string, "LOGNMODIFIER", "TESTING");
GNUNET_free (p_string);
}
- percentage = 0.5; /* FIXME: default percentage? */
+ probability = 0.5; /* FIXME: default percentage? */
if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (pg->cfg,
"TESTING",
- "PERCENTAGE",
+ "PROBABILITY",
&p_string))
{
- if (sscanf (p_string, "%lf", &percentage) != 1)
+ 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"),
if (connsPerPeer % 2 == 1)
connsPerPeer += 1;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Target is %d connections per peer."), connsPerPeer);
+
smallWorldConnections = 0;
connect_attempts = 0;
for (i = 0; i < pg->total; i++)
((double)
GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
UINT64_MAX) / ((double) UINT64_MAX));
- if (random < percentage)
+ if (random < probability)
{
/* Connect to uniformly selected random peer */
randomPeer =
GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
pg->total);
}
- smallWorldConnections += proc (pg, i, randomPeer);
+ smallWorldConnections += proc (pg, i, randomPeer, list);
}
else
{
{
nodeToConnect = nodeToConnect - pg->total;
}
- connect_attempts += proc (pg, i, nodeToConnect);
+ connect_attempts += proc (pg, i, nodeToConnect, list);
}
}
* @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
*
*/
static unsigned int
create_nated_internet (struct GNUNET_TESTING_PeerGroup *pg,
- GNUNET_TESTING_ConnectionProcessor proc)
+ GNUNET_TESTING_ConnectionProcessor proc, enum PeerLists list)
{
unsigned int outer_count, inner_count;
unsigned int cutoff;
nat_percentage = 0.6; /* FIXME: default percentage? */
if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (pg->cfg,
"TESTING",
- "NATPERCENTAGE",
+ "PERCENTAGE",
&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");
+ p_string, "PERCENTAGE", "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, list);
}
}
}
* @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
*
*/
static unsigned int
create_small_world (struct GNUNET_TESTING_PeerGroup *pg,
- GNUNET_TESTING_ConnectionProcessor proc)
+ GNUNET_TESTING_ConnectionProcessor proc, enum PeerLists list)
{
unsigned int i, j, k;
unsigned int square;
else
nodeToConnect = i - cols + 1;
- connect_attempts += proc (pg, i, nodeToConnect);
+ connect_attempts += proc (pg, i, nodeToConnect, list);
if (i < cols)
- nodeToConnect = (rows * cols) - cols + i;
+ {
+ nodeToConnect = (rows * cols) - cols + i;
+ if (nodeToConnect >= pg->total)
+ nodeToConnect -= cols;
+ }
else
nodeToConnect = i - cols;
if (nodeToConnect < pg->total)
- connect_attempts += proc (pg, i, nodeToConnect);
+ connect_attempts += proc (pg, i, nodeToConnect, list);
}
natLog = log (pg->total);
#if VERBOSE_TESTING > 2
((double) UINT64_MAX);
/* If random < probability, then connect the two nodes */
if (random < probability)
- smallWorldConnections += proc (pg, j, k);
+ smallWorldConnections += proc (pg, j, k, list);
}
}
* @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
*
*/
static unsigned int
create_erdos_renyi (struct GNUNET_TESTING_PeerGroup *pg,
- GNUNET_TESTING_ConnectionProcessor proc)
+ GNUNET_TESTING_ConnectionProcessor proc, enum PeerLists list)
{
double temp_rand;
unsigned int outer_count;
#endif
if (temp_rand < probability)
{
- connect_attempts += proc (pg, outer_count, inner_count);
+ connect_attempts += proc (pg, outer_count, inner_count, list);
}
}
}
* @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
*
*/
static unsigned int
create_2d_torus (struct GNUNET_TESTING_PeerGroup *pg,
- GNUNET_TESTING_ConnectionProcessor proc)
+ GNUNET_TESTING_ConnectionProcessor proc, enum PeerLists list)
{
unsigned int i;
unsigned int square;
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, list);
/* Second connect to the node immediately above */
if (i < cols)
- nodeToConnect = (rows * cols) - cols + i;
+ {
+ nodeToConnect = (rows * cols) - cols + i;
+ if (nodeToConnect >= pg->total)
+ nodeToConnect -= cols;
+ }
else
nodeToConnect = i - cols;
- if (nodeToConnect < pg->total)
+ if (nodeToConnect < pg->total)
+ {
+#if VERBOSE_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Connecting peer %d to peer %d\n", i, nodeToConnect);
+#endif
+ connect_attempts += proc (pg, i, nodeToConnect, list);
+ }
+
+ }
+
+ return connect_attempts;
+}
+
+
+/**
+ * Create a topology given a peer group (set of running peers)
+ * and a connection processor.
+ *
+ * @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
+ *
+ */
+static unsigned int
+create_clique (struct GNUNET_TESTING_PeerGroup *pg,
+ GNUNET_TESTING_ConnectionProcessor proc, enum PeerLists list)
+{
+ unsigned int outer_count;
+ unsigned int inner_count;
+ int connect_attempts;
+
+ connect_attempts = 0;
+
+ for (outer_count = 0; outer_count < pg->total - 1; outer_count++)
+ {
+ for (inner_count = outer_count + 1; inner_count < pg->total;
+ inner_count++)
+ {
+#if VERBOSE_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Connecting peer %d to peer %d\n",
+ outer_count, inner_count);
+#endif
+ connect_attempts += proc (pg, outer_count, inner_count, list);
+ }
+ }
+
+ return connect_attempts;
+}
+
+#if !OLD
+/**
+ * Iterator over hash map entries.
+ *
+ * @param cls closure the peer group
+ * @param key the key stored in the hashmap is the
+ * index of the peer to connect to
+ * @param value value in the hash map, handle to the peer daemon
+ * @return GNUNET_YES if we should continue to
+ * iterate,
+ * GNUNET_NO if not.
+ */
+static int
+unblacklist_iterator (void *cls,
+ const GNUNET_HashCode * key,
+ void *value)
+{
+ struct UnblacklistContext *un_ctx = cls;
+ uint32_t second_pos;
+
+ uid_from_hash (key, &second_pos);
+
+ unblacklist_connections(un_ctx->pg, un_ctx->first_uid, second_pos);
+
+ return GNUNET_YES;
+}
+#endif
+
+/**
+ * Create a blacklist topology based on the allowed topology
+ * which disallows any connections not in the allowed topology
+ * at the transport level.
+ *
+ * @param pg the peergroup to create the topology on
+ * @param proc the connection processor to call to allow
+ * up connections between two peers
+ *
+ * @return the number of connections that were set up
+ *
+ */
+static unsigned int
+copy_allowed (struct GNUNET_TESTING_PeerGroup *pg,
+ GNUNET_TESTING_ConnectionProcessor proc)
+{
+ struct UnblacklistContext un_ctx;
+ unsigned int count;
+ unsigned int total;
+ struct PeerConnection *iter;
+
+ un_ctx.pg = pg;
+ total = 0;
+ for (count = 0; count < pg->total - 1; count++)
+ {
+ un_ctx.first_uid = count;
+#if OLD
+ iter = pg->peers[count].allowed_peers_head;
+ while (iter != NULL)
{
-#if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Connecting peer %d to peer %d\n", i, nodeToConnect);
-#endif
- connect_attempts += proc (pg, i, nodeToConnect);
+ remove_connections(pg, count, iter->index, BLACKLIST);
+ //unblacklist_connections(pg, count, iter->index);
+ iter = iter->next;
}
-
+#else
+ total += GNUNET_CONTAINER_multihashmap_iterate(pg->peers[count].allowed_peers, &unblacklist_iterator, &un_ctx);
+#endif
}
-
- return connect_attempts;
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Unblacklisted %u peers\n", total);
+ return total;
}
-
/**
* Create a topology given a peer group (set of running peers)
* and a connection processor.
* @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 which list should be modified
*
* @return the number of connections that were set up
*
*/
static unsigned int
-create_clique (struct GNUNET_TESTING_PeerGroup *pg,
- GNUNET_TESTING_ConnectionProcessor proc)
+create_line (struct GNUNET_TESTING_PeerGroup *pg,
+ GNUNET_TESTING_ConnectionProcessor proc, enum PeerLists list)
{
- unsigned int outer_count;
- unsigned int inner_count;
+ unsigned int count;
int connect_attempts;
connect_attempts = 0;
- for (outer_count = 0; outer_count < pg->total - 1; outer_count++)
+ /* Connect each peer to the next highest numbered peer */
+ for (count = 0; count < pg->total - 1; count++)
{
- for (inner_count = outer_count + 1; inner_count < pg->total;
- inner_count++)
- {
#if VERBOSE_TESTING
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Connecting peer %d to peer %d\n",
- outer_count, inner_count);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Connecting peer %d to peer %d\n", count, count + 1);
#endif
- connect_attempts += proc (pg, outer_count, inner_count);
- }
+ connect_attempts += proc (pg, count, count + 1, list);
}
return connect_attempts;
* and a connection processor.
*
* @param pg the peergroup to create the topology on
+ * @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
*
*/
static unsigned int
-create_line (struct GNUNET_TESTING_PeerGroup *pg,
- GNUNET_TESTING_ConnectionProcessor proc)
+create_from_file (struct GNUNET_TESTING_PeerGroup *pg,
+ char *filename,
+ GNUNET_TESTING_ConnectionProcessor proc, enum PeerLists list)
{
- unsigned int count;
int connect_attempts;
-
+ unsigned int first_peer_index;
+ unsigned int second_peer_index;
connect_attempts = 0;
+ struct stat frstat;
+ int count;
+ char *data;
+ char *buf;
+ unsigned int total_peers;
+
+ enum States curr_state;
+
+ if (GNUNET_OK != GNUNET_DISK_file_test (filename))
+ GNUNET_DISK_fn_write (filename, NULL, 0, GNUNET_DISK_PERM_USER_READ);
+
+ if ((0 != STAT (filename, &frstat)) || (frstat.st_size == 0))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Could not open file `%s' specified for topology!", filename);
+ return connect_attempts;
+ }
+
+ data = GNUNET_malloc_large (frstat.st_size);
+ GNUNET_assert(data != NULL);
+ if (frstat.st_size !=
+ GNUNET_DISK_fn_read (filename, data, frstat.st_size))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Could not read file %s specified for host list, ending test!", filename);
+ GNUNET_free (data);
+ return connect_attempts;
+ }
+
+ buf = data;
+ count = 0;
+ /* First line should contain a single integer, specifying the number of peers */
+ /* Each subsequent line should contain this format PEER_INDEX:OTHER_PEER_INDEX[,...] */
+ curr_state = NUM_PEERS;
+ while (count < frstat.st_size - 1)
+ {
+ if ((buf[count] == '\n') || (buf[count] == ' '))
+ {
+ count++;
+ continue;
+ }
+
+ switch (curr_state)
+ {
+ case NUM_PEERS:
+ if (1 != sscanf(&buf[count], "%u", &total_peers))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Failed to read number of peers from topology file!\n");
+ GNUNET_free_non_null(data);
+ return connect_attempts;
+ }
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Read %u total peers in topology\n", total_peers);
+ GNUNET_assert(total_peers == pg->total);
+ curr_state = PEER_INDEX;
+ while((buf[count] != '\n') && (count < frstat.st_size - 1))
+ count++;
+ count++;
+ break;
+ case PEER_INDEX:
+ if (1 != sscanf(&buf[count], "%u", &first_peer_index))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Failed to read peer index from topology file!\n");
+ GNUNET_free_non_null(data);
+ return connect_attempts;
+ }
+ while((buf[count] != ':') && (count < frstat.st_size - 1))
+ count++;
+ count++;
+ curr_state = OTHER_PEER_INDEX;
+ break;
+ case COLON:
+ if (1 == sscanf(&buf[count], ":"))
+ curr_state = OTHER_PEER_INDEX;
+ count++;
+ break;
+ case OTHER_PEER_INDEX:
+ if (1 != sscanf(&buf[count], "%u", &second_peer_index))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Failed to peer index from topology file!\n");
+ GNUNET_free_non_null(data);
+ return connect_attempts;
+ }
+ /* Assume file is written with first peer 1, but array index is 0 */
+ connect_attempts += proc (pg, first_peer_index - 1, second_peer_index - 1, list);
+ while((buf[count] != '\n') && (buf[count] != ',') && (count < frstat.st_size - 1))
+ count++;
+ if (buf[count] == '\n')
+ {
+ curr_state = PEER_INDEX;
+ }
+ else if (buf[count] != ',')
+ {
+ curr_state = OTHER_PEER_INDEX;
+ }
+ count++;
+ break;
+ default:
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Found bad data in topology file while in state %d!\n", curr_state);
+ GNUNET_break(0);
+ return connect_attempts;
+ }
+ }
+#if 0
/* Connect each peer to the next highest numbered peer */
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);
+ "Connecting peer %d to peer %d\n", first_peer_index, second_peer_index);
#endif
- connect_attempts += proc (pg, count, count + 1);
+ connect_attempts += proc (pg, first_peer_index, second_peer_index);
}
-
+#endif
return connect_attempts;
}
* @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
*
*/
static unsigned int
create_ring (struct GNUNET_TESTING_PeerGroup *pg,
- GNUNET_TESTING_ConnectionProcessor proc)
+ GNUNET_TESTING_ConnectionProcessor proc, enum PeerLists list)
{
unsigned int count;
int connect_attempts;
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, list);
}
/* Connect the last peer to the first peer */
- connect_attempts += proc (pg, pg->total - 1, 0);
+ connect_attempts += proc (pg, pg->total - 1, 0, list);
return connect_attempts;
}
-
+#if !OLD
/**
* Iterator for writing friends of a peer to a file.
*
blacklist_file_iterator (void *cls, const GNUNET_HashCode * key, void *value)
{
struct BlacklistContext *blacklist_ctx = cls;
- //FILE *temp_blacklist_handle = cls;
struct GNUNET_TESTING_Daemon *peer = value;
struct GNUNET_PeerIdentity *temppeer;
struct GNUNET_CRYPTO_HashAsciiEncoded peer_enc;
temppeer = &peer->id;
GNUNET_CRYPTO_hash_to_enc (&temppeer->hashPubKey, &peer_enc);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Writing entry %s:%s to file\n", blacklist_ctx->transport, (char *) &peer_enc);
fprintf (blacklist_ctx->temp_file_handle, "%s:%s\n",
blacklist_ctx->transport, (char *) &peer_enc);
return GNUNET_YES;
}
+#endif
+
/*
* Create the friend files based on the PeerConnection's
struct GNUNET_OS_Process **procarr;
char *arg;
char *mytemp;
+#if NOT_STUPID
enum GNUNET_OS_ProcessStatusType type;
unsigned long return_code;
int count;
- int ret;
int max_wait = 10;
+#endif
+ int ret;
+ ret = GNUNET_OK;
+#if OLD
+ struct GNUNET_CRYPTO_HashAsciiEncoded peer_enc;
+ struct PeerConnection *conn_iter;
+#endif
procarr = GNUNET_malloc (sizeof (struct GNUNET_OS_Process *) * pg->total);
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
GNUNET_assert (mytemp != NULL);
temp_friend_handle = fopen (mytemp, "wt");
GNUNET_assert (temp_friend_handle != NULL);
+#if OLD
+ conn_iter = pg->peers[pg_iter].allowed_peers_head;
+ while (conn_iter != NULL)
+ {
+ GNUNET_CRYPTO_hash_to_enc (&pg->peers[conn_iter->index].daemon->id.hashPubKey, &peer_enc);
+ fprintf (temp_friend_handle, "%s\n", (char *) &peer_enc);
+ conn_iter = conn_iter->next;
+ }
+#else
GNUNET_CONTAINER_multihashmap_iterate (pg->peers[pg_iter].allowed_peers,
&friend_file_iterator,
temp_friend_handle);
+#endif
fclose (temp_friend_handle);
if (GNUNET_OK !=
GNUNET_OS_start_process (NULL, NULL, "scp", "scp", mytemp, arg,
NULL);
+ ret = GNUNET_OS_process_wait(procarr[pg_iter]); /* FIXME: schedule this, throttle! */
+ GNUNET_OS_process_close (procarr[pg_iter]);
+ if (ret != GNUNET_OK)
+ return ret;
+ procarr[pg_iter] = NULL;
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Copying file with command scp %s %s\n"), mytemp,
GNUNET_free (mytemp);
}
+#if NOT_STUPID
count = 0;
ret = GNUNET_SYSERR;
while ((count < max_wait) && (ret != GNUNET_OK))
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Finished copying all friend files!\n"));
+#endif
#endif
GNUNET_free (procarr);
return ret;
const char *transports)
{
FILE *temp_file_handle;
- static struct BlacklistContext blacklist_ctx;
unsigned int pg_iter;
char *temp_service_path;
struct GNUNET_OS_Process **procarr;
unsigned int i;
char *pos;
char *temp_transports;
+ int entry_count;
+#if OLD
+ struct GNUNET_CRYPTO_HashAsciiEncoded peer_enc;
+ struct PeerConnection *conn_iter;
+#else
+ static struct BlacklistContext blacklist_ctx;
+#endif
procarr = GNUNET_malloc (sizeof (struct GNUNET_OS_Process *) * pg->total);
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
temp_file_handle = fopen (mytemp, "wt");
GNUNET_assert (temp_file_handle != NULL);
temp_transports = GNUNET_strdup (transports);
+#if !OLD
blacklist_ctx.temp_file_handle = temp_file_handle;
+#endif
transport_len = strlen (temp_transports) + 1;
pos = NULL;
else if ((temp_transports[i] == ' ') || (temp_transports[i] == '\0')) /* At end of string */
{
temp_transports[i] = '\0';
+#if OLD
+ conn_iter = pg->peers[pg_iter].blacklisted_peers_head;
+ while (conn_iter != NULL)
+ {
+ GNUNET_CRYPTO_hash_to_enc (&pg->peers[conn_iter->index].daemon->id.hashPubKey, &peer_enc);
+ fprintf (temp_file_handle, "%s:%s\n", pos, (char *) &peer_enc);
+ conn_iter = conn_iter->next;
+ entry_count++;
+ }
+#else
blacklist_ctx.transport = pos;
- GNUNET_CONTAINER_multihashmap_iterate (pg->
+ entry_count = GNUNET_CONTAINER_multihashmap_iterate (pg->
peers
[pg_iter].blacklisted_peers,
&blacklist_file_iterator,
&blacklist_ctx);
+#endif
pos = NULL;
} /* At beginning of actual string */
else if (pos == NULL)
GNUNET_OS_start_process (NULL, NULL, "scp", "scp", mytemp, arg,
NULL);
+ GNUNET_OS_process_wait(procarr[pg_iter]); /* FIXME: add scheduled blacklist file copy that parallelizes file copying! */
+
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Copying file with command scp %s %s\n"), mytemp,
return ret;
}
+/* Forward Declaration */
+static void
+schedule_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+
+/**
+ * Choose a random peer's next connection to create, and
+ * call schedule_connect to set up the connect task.
+ *
+ * @param ct_ctx the overall connection context
+ */
+static void preschedule_connect(struct ConnectTopologyContext *ct_ctx)
+{
+ struct GNUNET_TESTING_PeerGroup *pg = ct_ctx->pg;
+ struct PeerConnection *connection_iter;
+ struct ConnectContext *connect_context;
+ uint32_t random_peer;
+
+ if (ct_ctx->remaining_connects_to_schedule == 0)
+ return;
+ random_peer = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, pg->total);
+ while (pg->peers[random_peer].connect_peers_head == NULL)
+ random_peer = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, pg->total);
+
+ connection_iter = pg->peers[random_peer].connect_peers_head;
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Scheduling connection between %d and %d\n", random_peer, connection_iter->index);
+
+ connect_context = GNUNET_malloc (sizeof (struct ConnectContext));
+ connect_context->first = pg->peers[random_peer].daemon;
+ connect_context->second = pg->peers[connection_iter->index].daemon;
+ connect_context->ct_ctx = ct_ctx;
+ GNUNET_SCHEDULER_add_now (&schedule_connect, connect_context);
+ GNUNET_CONTAINER_DLL_remove(pg->peers[random_peer].connect_peers_head, pg->peers[random_peer].connect_peers_tail, connection_iter);
+ ct_ctx->remaining_connects_to_schedule--;
+}
+
/**
* Internal notification of a connection, kept so that we can ensure some connections
{
struct ConnectTopologyContext *ct_ctx = cls;
struct GNUNET_TESTING_PeerGroup *pg = ct_ctx->pg;
- outstanding_connects--;
+ pg->outstanding_connects--;
ct_ctx->remaining_connections--;
if (ct_ctx->remaining_connections == 0)
{
ct_ctx->notify_connections_done (ct_ctx->notify_cls, NULL);
GNUNET_free (ct_ctx);
}
+ else
+ preschedule_connect(ct_ctx);
if (pg->notify_connection != NULL)
pg->notify_connection (pg->notify_connection_cls, first, second, distance,
schedule_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct ConnectContext *connect_context = cls;
+ struct GNUNET_TESTING_PeerGroup *pg = connect_context->ct_ctx->pg;
if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
return;
- if (outstanding_connects > MAX_OUTSTANDING_CONNECTIONS)
+ if (pg->outstanding_connects > pg->max_outstanding_connections)
{
#if VERBOSE_TESTING > 2
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating connection, outstanding_connections is %d\n"),
outstanding_connects);
#endif
- outstanding_connects++;
+ pg->outstanding_connects++;
+ pg->total_connects_scheduled++;
GNUNET_TESTING_daemons_connect (connect_context->first,
connect_context->second,
- CONNECT_TIMEOUT,
- CONNECT_ATTEMPTS,
+ connect_context->ct_ctx->connect_timeout,
+ connect_context->ct_ctx->connect_attempts,
&internal_connect_notify,
connect_context->ct_ctx);
GNUNET_free (connect_context);
}
}
-
+#if !OLD
/**
* Iterator for actually scheduling connections to be created
* between two peers.
return GNUNET_YES;
}
+#endif
-
+#if !OLD
/**
* Iterator for copying all entries in the allowed hashmap to the
* connect hashmap.
return GNUNET_YES;
}
+#endif
/**
* Make the peers to connect the same as those that are allowed to be
unsigned int pg_iter;
int ret;
int total;
-
+#if OLD
+ struct PeerConnection *iter;
+#endif
total = 0;
+ ret = 0;
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
+#if OLD
+ iter = pg->peers[pg_iter].allowed_peers_head;
+ while (iter != NULL)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Creating connection between %d and %d\n", pg_iter, iter->index);
+ total += add_connections(pg, pg_iter, iter->index, CONNECT);
+ //total += add_actual_connections(pg, pg_iter, iter->index);
+ iter = iter->next;
+ }
+#else
ret =
GNUNET_CONTAINER_multihashmap_iterate (pg->
peers[pg_iter].allowed_peers,
©_topology_iterator,
&pg->peers[pg_iter]);
+#endif
if (GNUNET_SYSERR == ret)
return GNUNET_SYSERR;
* of each peer in the peer group
*
* @param pg the peer group we are dealing with
+ * @param connect_timeout how long try connecting two peers
+ * @param connect_attempts how many times (max) to attempt
+ * @param notify_callback callback to notify when finished
+ * @param notify_cls closure for notify callback
+ *
* @return the number of connections that will be attempted
*/
static int
connect_topology (struct GNUNET_TESTING_PeerGroup *pg,
+ struct GNUNET_TIME_Relative connect_timeout,
+ unsigned int connect_attempts,
GNUNET_TESTING_NotifyCompletion notify_callback,
void *notify_cls)
{
unsigned int pg_iter;
- int ret;
unsigned int total;
struct ConnectTopologyContext *ct_ctx;
#if OLD
struct PeerConnection *connection_iter;
- struct ConnectContext *connect_context;
#endif
total = 0;
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
+#if OLD
+ connection_iter = pg->peers[pg_iter].connect_peers_head;
+ while (connection_iter != NULL)
+ {
+ connection_iter = connection_iter->next;
+ total++;
+ }
+#else
total +=
GNUNET_CONTAINER_multihashmap_size (pg->peers[pg_iter].connect_peers);
+#endif
}
if (total == 0)
GNUNET_free (ct_ctx);
return total;
}
+ ct_ctx->connect_timeout = connect_timeout;
+ ct_ctx->connect_attempts = connect_attempts;
ct_ctx->remaining_connections = total;
- total = 0;
-
- 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);
- total = total + ret;
+ ct_ctx->remaining_connects_to_schedule = total;
-#if OLD
- connection_iter = FIXME;
- while (connection_iter != NULL)
- {
- 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);
- connection_iter = connection_iter->next;
- }
-#endif
- }
+ for (pg_iter = 0; pg_iter < pg->max_outstanding_connections; pg_iter++)
+ {
+ preschedule_connect(ct_ctx);
+ }
return total;
+
}
const char *restrict_transports)
{
int ret;
+
unsigned int num_connections;
int unblacklisted_connections;
+ char *filename;
+
+#if !OLD
+ unsigned int i;
+ for (i = 0; i < pg->total; i++)
+ {
+ pg->peers[i].allowed_peers =
+ GNUNET_CONTAINER_multihashmap_create (100);
+ pg->peers[i].connect_peers =
+ GNUNET_CONTAINER_multihashmap_create (100);
+ pg->peers[i].blacklisted_peers =
+ GNUNET_CONTAINER_multihashmap_create (100);
+ pg->peers[i].pg = pg;
+ }
+#endif
switch (topology)
{
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Creating clique topology\n"));
#endif
- num_connections = create_clique (pg, &add_allowed_connections);
+ num_connections = create_clique (pg, &add_connections, ALLOWED);
break;
case GNUNET_TESTING_TOPOLOGY_SMALL_WORLD_RING:
#if VERBOSE_TESTING
_("Creating small world (ring) topology\n"));
#endif
num_connections =
- create_small_world_ring (pg, &add_allowed_connections);
+ create_small_world_ring (pg, &add_connections, ALLOWED);
break;
case GNUNET_TESTING_TOPOLOGY_SMALL_WORLD:
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating small world (2d-torus) topology\n"));
#endif
- num_connections = create_small_world (pg, &add_allowed_connections);
+ num_connections = create_small_world (pg, &add_connections, ALLOWED);
break;
case GNUNET_TESTING_TOPOLOGY_RING:
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Creating ring topology\n"));
#endif
- num_connections = create_ring (pg, &add_allowed_connections);
+ num_connections = create_ring (pg, &add_connections, ALLOWED);
break;
case GNUNET_TESTING_TOPOLOGY_2D_TORUS:
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Creating 2d torus topology\n"));
#endif
- num_connections = create_2d_torus (pg, &add_allowed_connections);
+ num_connections = create_2d_torus (pg, &add_connections, ALLOWED);
break;
case GNUNET_TESTING_TOPOLOGY_ERDOS_RENYI:
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating Erdos-Renyi topology\n"));
#endif
- num_connections = create_erdos_renyi (pg, &add_allowed_connections);
+ num_connections = create_erdos_renyi (pg, &add_connections, ALLOWED);
break;
case GNUNET_TESTING_TOPOLOGY_INTERNAT:
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Creating InterNAT topology\n"));
#endif
- num_connections = create_nated_internet (pg, &add_allowed_connections);
+ num_connections = create_nated_internet (pg, &add_connections, ALLOWED);
break;
case GNUNET_TESTING_TOPOLOGY_SCALE_FREE:
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating Scale Free topology\n"));
#endif
- num_connections = create_scale_free (pg, &add_allowed_connections);
+ num_connections = create_scale_free (pg, &add_connections, ALLOWED);
break;
case GNUNET_TESTING_TOPOLOGY_LINE:
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating straight line topology\n"));
#endif
- num_connections = create_line (pg, &add_allowed_connections);
+ num_connections = create_line (pg, &add_connections, ALLOWED);
+ break;
+ case GNUNET_TESTING_TOPOLOGY_FROM_FILE:
+#if VERBOSE_TESTING
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _("Creating topology from file!\n"));
+#endif
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (pg->cfg, "testing", "topology_file",
+ &filename))
+ 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!\n");
+ num_connections = 0;
+ }
break;
case GNUNET_TESTING_TOPOLOGY_NONE:
#if VERBOSE_TESTING
_
("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;
}
/* Use the create clique method to initially set all connections as blacklisted. */
- if (restrict_topology != GNUNET_TESTING_TOPOLOGY_NONE)
- create_clique (pg, &blacklist_connections);
+ if ((restrict_topology != GNUNET_TESTING_TOPOLOGY_NONE) && (restrict_topology != GNUNET_TESTING_TOPOLOGY_FROM_FILE))
+ create_clique (pg, &add_connections, BLACKLIST);
unblacklisted_connections = 0;
/* Un-blacklist connections as per the topology specified */
_("Blacklisting all but clique topology\n"));
#endif
unblacklisted_connections =
- create_clique (pg, &unblacklist_connections);
+ create_clique (pg, &remove_connections, BLACKLIST);
break;
case GNUNET_TESTING_TOPOLOGY_SMALL_WORLD_RING:
#if VERBOSE_TESTING
_("Blacklisting all but small world (ring) topology\n"));
#endif
unblacklisted_connections =
- create_small_world_ring (pg, &unblacklist_connections);
+ create_small_world_ring (pg, &remove_connections, BLACKLIST);
break;
case GNUNET_TESTING_TOPOLOGY_SMALL_WORLD:
#if VERBOSE_TESTING
("Blacklisting all but small world (2d-torus) topology\n"));
#endif
unblacklisted_connections =
- create_small_world (pg, &unblacklist_connections);
+ create_small_world (pg, &remove_connections, BLACKLIST);
break;
case GNUNET_TESTING_TOPOLOGY_RING:
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Blacklisting all but ring topology\n"));
#endif
- unblacklisted_connections = create_ring (pg, &unblacklist_connections);
+ unblacklisted_connections = create_ring (pg, &remove_connections, BLACKLIST);
break;
case GNUNET_TESTING_TOPOLOGY_2D_TORUS:
#if VERBOSE_TESTING
_("Blacklisting all but 2d torus topology\n"));
#endif
unblacklisted_connections =
- create_2d_torus (pg, &unblacklist_connections);
+ create_2d_torus (pg, &remove_connections, BLACKLIST);
break;
case GNUNET_TESTING_TOPOLOGY_ERDOS_RENYI:
#if VERBOSE_TESTING
_("Blacklisting all but Erdos-Renyi topology\n"));
#endif
unblacklisted_connections =
- create_erdos_renyi (pg, &unblacklist_connections);
+ create_erdos_renyi (pg, &remove_connections, BLACKLIST);
break;
case GNUNET_TESTING_TOPOLOGY_INTERNAT:
#if VERBOSE_TESTING
_("Blacklisting all but InterNAT topology\n"));
#endif
unblacklisted_connections =
- create_nated_internet (pg, &unblacklist_connections);
+ create_nated_internet (pg, &remove_connections, BLACKLIST);
break;
case GNUNET_TESTING_TOPOLOGY_SCALE_FREE:
#if VERBOSE_TESTING
_("Blacklisting all but Scale Free topology\n"));
#endif
unblacklisted_connections =
- create_scale_free (pg, &unblacklist_connections);
+ create_scale_free (pg, &remove_connections, BLACKLIST);
break;
case GNUNET_TESTING_TOPOLOGY_LINE:
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Blacklisting all but straight line topology\n"));
#endif
- unblacklisted_connections = create_line (pg, &unblacklist_connections);
+ unblacklisted_connections = create_line (pg, &remove_connections, BLACKLIST);
break;
- case GNUNET_TESTING_TOPOLOGY_NONE:
+ case GNUNET_TESTING_TOPOLOGY_NONE: /* Fall through */
+ case GNUNET_TESTING_TOPOLOGY_FROM_FILE:
#if VERBOSE_TESTING
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_
("Creating no blacklist topology (all peers can connect at transport level)\n"));
#endif
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ _
+ ("Creating blacklist topology from allowed\n"));
+ unblacklisted_connections = copy_allowed (pg, &remove_connections);
default:
break;
}
if ((unblacklisted_connections > 0) && (restrict_transports != NULL))
{
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Creating blacklist with `%s'\n", restrict_transports);
ret = create_and_copy_blacklist_files (pg, restrict_transports);
if (ret != GNUNET_OK)
{
return num_connections;
}
-struct RandomContext
-{
- /**
- * The peergroup
- */
- struct GNUNET_TESTING_PeerGroup *pg;
-
- /**
- * uid of the first peer
- */
- uint32_t first_uid;
-
- /**
- * Peer data for first peer.
- */
- struct PeerData *first;
-
- /**
- * Random percentage to use
- */
- double percentage;
-};
-
-struct MinimumContext
-{
- /**
- * The peergroup
- */
- struct GNUNET_TESTING_PeerGroup *pg;
-
- /**
- * uid of the first peer
- */
- uint32_t first_uid;
-
- /**
- * Peer data for first peer.
- */
- struct PeerData *first;
-
- /**
- * Number of conns per peer
- */
- unsigned int num_to_add;
-
- /**
- * Permuted array of all possible connections. Only add the Nth
- * peer if it's in the Nth position.
- */
- unsigned int *pg_array;
-
- /**
- * What number is the current element we are iterating over?
- */
- unsigned int current;
-};
-
-struct DFSContext
-{
- /**
- * The peergroup
- */
- struct GNUNET_TESTING_PeerGroup *pg;
-
- /**
- * uid of the first peer
- */
- uint32_t first_uid;
-
- /**
- * uid of the second peer
- */
- uint32_t second_uid;
-
- /**
- * Peer data for first peer.
- */
- struct PeerData *first;
-
- /**
- * Which peer has been chosen as the one to add?
- */
- unsigned int chosen;
-
- /**
- * What number is the current element we are iterating over?
- */
- unsigned int current;
-};
+#if !OLD
/**
* Iterator for choosing random peers to connect.
*
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);
return GNUNET_YES;
}
+
/**
* Iterator for adding at least X peers to a peers connection set.
*
dfs_ctx->current++;
return GNUNET_YES;
}
-
+#endif
/**
* From the set of connections possible, choose percentage percent of connections
{
struct RandomContext random_ctx;
uint32_t pg_iter;
+#if OLD
+ struct PeerConnection *temp_peers;
+ struct PeerConnection *conn_iter;
+ double random_number;
+#endif
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
random_ctx.first = &pg->peers[pg_iter];
random_ctx.percentage = percentage;
random_ctx.pg = pg;
+#if OLD
+ temp_peers = NULL;
+ conn_iter = pg->peers[pg_iter].connect_peers_head;
+ while (conn_iter != NULL)
+ {
+ random_number =
+ ((double)
+ GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
+ UINT64_MAX)) / ((double) UINT64_MAX);
+ if (random_number < percentage)
+ {
+ add_connections(pg, pg_iter, conn_iter->index, WORKING_SET);
+ }
+ conn_iter = conn_iter->next;
+ }
+#else
pg->peers[pg_iter].connect_peers_working_set =
GNUNET_CONTAINER_multihashmap_create (pg->total);
GNUNET_CONTAINER_multihashmap_iterate (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;
+#endif
+ }
+
+ for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
+ {
+ conn_iter = pg->peers[pg_iter].connect_peers_head;
+ while (pg->peers[pg_iter].connect_peers_head != NULL)
+ remove_connections(pg, pg_iter, pg->peers[pg_iter].connect_peers_head->index, CONNECT);
+
+ pg->peers[pg_iter].connect_peers_head = pg->peers[pg_iter].connect_peers_working_set_head;
+ pg->peers[pg_iter].connect_peers_tail = pg->peers[pg_iter].connect_peers_working_set_tail;
+ pg->peers[pg_iter].connect_peers_working_set_head = NULL;
+ pg->peers[pg_iter].connect_peers_working_set_tail = NULL;
+ }
+}
+
+
+/**
+ * Count the number of connections in a linked list of connections.
+ *
+ * @param conn_list the connection list to get the count of
+ *
+ * @return the number of elements in the list
+ */
+static unsigned int
+count_connections (struct PeerConnection *conn_list)
+{
+ struct PeerConnection *iter;
+ unsigned int count;
+ count = 0;
+ iter = conn_list;
+ while (iter != NULL)
+ {
+ iter = iter->next;
+ count++;
+ }
+ return count;
+}
+
+
+static unsigned int
+count_workingset_connections (struct GNUNET_TESTING_PeerGroup *pg)
+{
+ unsigned int count;
+ unsigned int pg_iter;
+#if OLD
+ struct PeerConnection *conn_iter;
+#endif
+ count = 0;
+
+ for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
+ {
+#if OLD
+ conn_iter = pg->peers[pg_iter].connect_peers_working_set_head;
+ while (conn_iter != NULL)
+ {
+ count++;
+ conn_iter = conn_iter->next;
+ }
+#else
+ count +=
+ GNUNET_CONTAINER_multihashmap_size (pg->
+ peers
+ [pg_iter].connect_peers_working_set);
+#endif
+ }
+
+ return count;
+}
+
+
+static unsigned int
+count_allowed_connections (struct GNUNET_TESTING_PeerGroup *pg)
+{
+ unsigned int count;
+ unsigned int pg_iter;
+#if OLD
+ struct PeerConnection *conn_iter;
+#endif
+
+ count = 0;
+ for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
+ {
+#if OLD
+ conn_iter = pg->peers[pg_iter].allowed_peers_head;
+ while (conn_iter != NULL)
+ {
+ count++;
+ conn_iter = conn_iter->next;
+ }
+#else
+ count +=
+ GNUNET_CONTAINER_multihashmap_size (pg->
+ peers
+ [pg_iter].allowed_peers);
+#endif
}
+
+ return count;
}
+
/**
* From the set of connections possible, choose at least num connections per
* peer.
static void
choose_minimum (struct GNUNET_TESTING_PeerGroup *pg, unsigned int num)
{
+#if !OLD
struct MinimumContext minimum_ctx;
+#else
+ struct PeerConnection *conn_iter;
+ unsigned int temp_list_size;
+ unsigned int i;
+ unsigned int count;
+ uint32_t random; /* Random list entry to connect peer to */
+#endif
uint32_t pg_iter;
+#if OLD
+ for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
+ {
+ temp_list_size = count_connections(pg->peers[pg_iter].connect_peers_head);
+ if (temp_list_size == 0)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Peer %d has 0 connections!?!?\n", pg_iter);
+ break;
+ }
+ for (i = 0; i < num; i++)
+ {
+ random = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, temp_list_size);
+ conn_iter = pg->peers[pg_iter].connect_peers_head;
+ for (count = 0; count < random; count++)
+ conn_iter = conn_iter->next;
+ /* We now have a random connection, connect it! */
+ GNUNET_assert(conn_iter != NULL);
+ add_connections(pg, pg_iter, conn_iter->index, WORKING_SET);
+ }
+ }
+#else
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
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)
-{
- unsigned int count;
- unsigned int pg_iter;
-
- count = 0;
-
+#endif
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
- count +=
- GNUNET_CONTAINER_multihashmap_size (pg->
- peers
- [pg_iter].connect_peers_working_set);
- }
+ while (pg->peers[pg_iter].connect_peers_head != NULL)
+ remove_connections(pg, pg_iter, pg->peers[pg_iter].connect_peers_head->index, CONNECT);
- return count;
-}
-
-
-static unsigned int
-count_allowed_connections (struct GNUNET_TESTING_PeerGroup *pg)
-{
- unsigned int count;
- unsigned int pg_iter;
-
- count = 0;
-
- for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
- {
- count +=
- GNUNET_CONTAINER_multihashmap_size (pg->peers[pg_iter].connect_peers);
+ pg->peers[pg_iter].connect_peers_head = pg->peers[pg_iter].connect_peers_working_set_head;
+ pg->peers[pg_iter].connect_peers_tail = pg->peers[pg_iter].connect_peers_working_set_tail;
+ pg->peers[pg_iter].connect_peers_working_set_head = NULL;
+ pg->peers[pg_iter].connect_peers_working_set_tail = NULL;
}
-
- return count;
}
-
+#if !OLD
struct FindClosestContext
{
/**
return GNUNET_YES;
}
+
/**
* From the set of connections possible, choose at num connections per
* peer based on depth which are closest out of those allowed. Guaranteed
* @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,
- GNUNET_TESTING_ConnectionProcessor proc)
+ GNUNET_TESTING_ConnectionProcessor proc, enum PeerLists list)
{
+#if OLD
+
+#else
struct FindClosestContext closest_ctx;
+#endif
uint32_t pg_iter;
uint32_t i;
if (closest_ctx.closest != NULL)
{
GNUNET_assert (closest_ctx.closest_num < pg->total);
- proc (pg, pg_iter, closest_ctx.closest_num);
+ proc (pg, pg_iter, closest_ctx.closest_num, list);
}
}
}
}
+#endif
/**
* From the set of connections possible, choose at least num connections per
void
perform_dfs (struct GNUNET_TESTING_PeerGroup *pg, unsigned int num)
{
- struct DFSContext dfs_ctx;
uint32_t pg_iter;
uint32_t dfs_count;
uint32_t starting_peer;
uint32_t least_connections;
+ uint32_t random_connection;
+#if OLD
+ unsigned int temp_count;
+ struct PeerConnection *peer_iter;
+#else
+ struct DFSContext dfs_ctx;
GNUNET_HashCode second_hash;
+#endif
+
+#if OLD
+ starting_peer = 0;
+ dfs_count = 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 */
+ {
+ least_connections = -1; /* Set to very high number */
+ for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
+ {
+ temp_count = count_connections(pg->peers[pg_iter].connect_peers_working_set_head);
+ if (temp_count < least_connections)
+ {
+ starting_peer = pg_iter;
+ least_connections = temp_count;
+ }
+ }
+ }
+
+ temp_count = count_connections(pg->peers[starting_peer].connect_peers_head);
+ if (temp_count == 0)
+ continue; /* FIXME: infinite loop? */
+
+ random_connection = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, temp_count);
+ temp_count = 0;
+ peer_iter = pg->peers[starting_peer].connect_peers_head;
+ while (temp_count < random_connection)
+ {
+ peer_iter = peer_iter->next;
+ temp_count++;
+ }
+ GNUNET_assert(peer_iter != NULL);
+ add_connections(pg, starting_peer, peer_iter->index, WORKING_SET);
+ remove_connections(pg, starting_peer, peer_iter->index, CONNECT);
+ starting_peer = peer_iter->index;
+ dfs_count++;
+ }
+#else
for (pg_iter = 0; pg_iter < pg->total; pg_iter++)
{
pg->peers[pg_iter].connect_peers_working_set =
pg->peers[pg_iter].connect_peers =
pg->peers[pg_iter].connect_peers_working_set;
}
+#endif
}
+
/**
* Internal callback for topology information for a particular peer.
*/
if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
return;
- if (topology_context->connected > MAX_OUTSTANDING_CONNECTIONS)
+ if (topology_context->connected > topology_context->pg->max_outstanding_connections)
{
#if VERBOSE_TESTING > 2
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
topology_context = GNUNET_malloc (sizeof (struct TopologyIterateContext));
topology_context->topology_cb = cb;
topology_context->cls = cls;
+ topology_context->pg = pg;
total_count = 0;
for (i = 0; i < pg->total; i++)
{
if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
return;
- if (stats_context->connected > MAX_OUTSTANDING_CONNECTIONS)
+ if (stats_context->connected > stats_context->pg->max_outstanding_connections)
{
#if VERBOSE_TESTING > 2
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (specific_peer->cfg, "statistics",
"port", &port))
- return GNUNET_NO;
+ {
+ GNUNET_free(unix_domain_socket);
+ return GNUNET_NO;
+ }
if (specific_peer->daemon->hostname != NULL)
GNUNET_asprintf (&to_match, "%s%s%llu", specific_peer->daemon->hostname,
stats_context->cont = cont;
stats_context->proc = proc;
stats_context->cls = cls;
+ stats_context->pg = pg;
total_count = 0;
for (i = 0; i < pg->total; i++)
* @param topology which topology to connect the peers in
* @param options options for connecting the topology
* @param option_modifier modifier for options that take a parameter
+ * @param connect_timeout how long to wait before giving up on connecting
+ * two peers
+ * @param connect_attempts how many times to attempt to connect two peers
+ * over the connect_timeout duration
* @param notify_callback notification to be called once all connections completed
* @param notify_cls closure for notification callback
*
enum GNUNET_TESTING_Topology topology,
enum GNUNET_TESTING_TopologyOption options,
double option_modifier,
+ struct GNUNET_TIME_Relative connect_timeout,
+ unsigned int connect_attempts,
GNUNET_TESTING_NotifyCompletion
notify_callback, void *notify_cls)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Creating clique CONNECT topology\n"));
#endif
- create_clique (pg, &add_actual_connections);
+ create_clique (pg, &add_connections, CONNECT);
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);
+ create_small_world_ring (pg, &add_connections, CONNECT);
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);
+ create_small_world (pg, &add_connections, CONNECT);
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);
+ create_ring (pg, &add_connections, CONNECT);
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);
+ create_2d_torus (pg, &add_connections, CONNECT);
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);
+ create_erdos_renyi (pg, &add_connections, CONNECT);
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);
+ create_nated_internet (pg, &add_connections, CONNECT);
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);
+ create_scale_free (pg, &add_connections, CONNECT);
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);
+ create_line (pg, &add_connections, CONNECT);
break;
case GNUNET_TESTING_TOPOLOGY_NONE:
#if VERBOSE_TOPOLOGY
("Using DFS to connect a minimum of %u peers each (if possible)\n"),
(unsigned int) option_modifier);
#endif
+#if FIXME
perform_dfs (pg, (int) option_modifier);
+#endif
break;
case GNUNET_TESTING_TOPOLOGY_OPTION_ADD_CLOSEST:
#if VERBOSE_TOPOLOGY
("Finding additional %u closest peers each (if possible)\n"),
(unsigned int) option_modifier);
#endif
+#if FIXME
add_closest (pg, (unsigned int) option_modifier,
- &add_actual_connections);
+ &add_connections, CONNECT);
+#endif
break;
case GNUNET_TESTING_TOPOLOGY_OPTION_NONE:
break;
break;
}
- return connect_topology (pg, notify_callback, notify_cls);
+ return connect_topology (pg, connect_timeout, connect_attempts, notify_callback, notify_cls);
+}
+
+/**
+ * Lookup and return the number of SSH connections to a host.
+ *
+ * @param hostname the hostname to lookup in the list
+ * @param pg the peergroup that the host belongs to
+ *
+ * @return the number of current ssh connections to the host
+ */
+static unsigned int
+count_outstanding_at_host(const char *hostname, struct GNUNET_TESTING_PeerGroup *pg)
+{
+ struct OutstandingSSH *pos;
+ pos = pg->ssh_head;
+ while ((pos != NULL) && (strcmp(pos->hostname, hostname) != 0))
+ pos = pos->next;
+ GNUNET_assert(pos != NULL);
+ return pos->outstanding;
+}
+
+
+/**
+ * Increment the number of SSH connections to a host by one.
+ *
+ * @param hostname the hostname to lookup in the list
+ * @param pg the peergroup that the host belongs to
+ *
+ */
+static void
+increment_outstanding_at_host(const char *hostname, struct GNUNET_TESTING_PeerGroup *pg)
+{
+ struct OutstandingSSH *pos;
+ pos = pg->ssh_head;
+ while ((pos != NULL) && (strcmp(pos->hostname, hostname) != 0))
+ pos = pos->next;
+ GNUNET_assert(pos != NULL);
+ pos->outstanding++;
+}
+
+/**
+ * Decrement the number of SSH connections to a host by one.
+ *
+ * @param hostname the hostname to lookup in the list
+ * @param pg the peergroup that the host belongs to
+ *
+ */
+static void
+decrement_outstanding_at_host(const char *hostname, struct GNUNET_TESTING_PeerGroup *pg)
+{
+ struct OutstandingSSH *pos;
+ pos = pg->ssh_head;
+ while ((pos != NULL) && (strcmp(pos->hostname, hostname) != 0))
+ pos = pos->next;
+ GNUNET_assert(pos != NULL);
+ pos->outstanding--;
}
+
/**
* Callback that is called whenever a hostkey is generated
* for a peer. Call the real callback and decrement the
struct InternalStartContext *internal_context = cls;
internal_context->peer->pg->starting--;
internal_context->peer->pg->started++;
+ if (internal_context->hostname != NULL)
+ decrement_outstanding_at_host(internal_context->hostname, internal_context->peer->pg);
if (internal_context->hostkey_callback != NULL)
internal_context->hostkey_callback (internal_context->hostkey_cls, id, d,
emsg);
*
* @param cls closure
* @param id identifier for the daemon, NULL on error
+ * @param cfg config
* @param d handle for the daemon
* @param emsg error message (NULL on success)
*/
{
struct InternalStartContext *internal_context = cls;
internal_context->peer->pg->starting--;
+ if (internal_context->hostname != NULL)
+ decrement_outstanding_at_host(internal_context->hostname, internal_context->peer->pg);
if (internal_context->start_cb != NULL)
internal_context->start_cb (internal_context->start_cb_cls, id, cfg, d,
emsg);
return;
}
- if (internal_context->peer->pg->starting < MAX_CONCURRENT_STARTING)
+ if ((internal_context->peer->pg->starting < internal_context->peer->pg->max_concurrent_ssh) ||
+ ((internal_context->hostname != NULL) &&
+ (count_outstanding_at_host(internal_context->hostname, internal_context->peer->pg) < internal_context->peer->pg->max_concurrent_ssh)))
{
+ if (internal_context->hostname != NULL)
+ increment_outstanding_at_host(internal_context->hostname, internal_context->peer->pg);
internal_context->peer->pg->starting++;
GNUNET_TESTING_daemon_continue_startup (internal_context->peer->daemon);
}
struct ChurnRestartContext *startup_ctx =
peer_restart_ctx->churn_restart_ctx;
- if (startup_ctx->outstanding > MAX_CONCURRENT_STARTING)
+ if (startup_ctx->outstanding > startup_ctx->pg->max_concurrent_ssh)
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_MILLISECONDS, 100),
&schedule_churn_restart, peer_restart_ctx);
}
}
+
+
static void
internal_start (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
return;
}
- if (internal_context->peer->pg->starting < MAX_CONCURRENT_HOSTKEYS)
+ if ((internal_context->peer->pg->starting < internal_context->peer->pg->max_concurrent_ssh) ||
+ ((internal_context->hostname != NULL) &&
+ (count_outstanding_at_host(internal_context->hostname, internal_context->peer->pg) < internal_context->peer->pg->max_concurrent_ssh)))
{
+ if (internal_context->hostname != NULL)
+ increment_outstanding_at_host(internal_context->hostname, internal_context->peer->pg);
internal_context->peer->pg->starting++;
internal_context->peer->daemon =
GNUNET_TESTING_daemon_start (internal_context->peer->cfg,
internal_context->hostname,
internal_context->username,
internal_context->sshport,
+ internal_context->hostkey,
&internal_hostkey_callback,
internal_context,
&internal_startup_callback,
*
* @param cfg configuration template to use
* @param total number of daemons to start
+ * @param max_concurrent_connections for testing, how many peers can
+* we connect to simultaneously
+ * @param max_concurrent_ssh when starting with ssh, how many ssh
+ * connections will we allow at once (based on remote hosts allowed!)
* @param timeout total time allowed for peers to start
* @param hostkey_callback function to call on each peers hostkey generation
* if NULL, peers will be started by this call, if non-null,
* @param cb_cls closure for cb
* @param connect_callback function to call each time two hosts are connected
* @param connect_callback_cls closure for connect_callback
- * @param hostnames linked list of hosts to use to start peers on (NULL to run on localhost only)
+ * @param hostnames linked list of host structs to use to start peers on
+ * (NULL to run on localhost only)
*
* @return NULL on error, otherwise handle to control peer group
*/
struct GNUNET_TESTING_PeerGroup *
GNUNET_TESTING_daemons_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
unsigned int total,
+ unsigned int max_concurrent_connections,
+ unsigned int max_concurrent_ssh,
struct GNUNET_TIME_Relative timeout,
GNUNET_TESTING_NotifyHostkeyCreated
hostkey_callback, void *hostkey_cls,
char *baseservicehome;
char *newservicehome;
char *tmpdir;
+ char *hostkeys_file;
+ char *arg;
+ char *ssh_port_str;
+ struct GNUNET_DISK_FileHandle *fd;
struct GNUNET_CONFIGURATION_Handle *pcfg;
unsigned int off;
unsigned int hostcnt;
+ unsigned int i;
uint16_t minport;
uint16_t sshport;
uint32_t upnum;
uint32_t fdnum;
+ uint64_t fs;
+ uint64_t total_hostkeys;
+ struct GNUNET_OS_Process *proc;
if (0 == total)
{
GNUNET_break (0);
return NULL;
}
+
upnum = 0;
fdnum = 0;
pg = GNUNET_malloc (sizeof (struct GNUNET_TESTING_PeerGroup));
pg->total = total;
pg->max_timeout = GNUNET_TIME_relative_to_absolute (timeout);
pg->peers = GNUNET_malloc (total * sizeof (struct PeerData));
+ pg->max_outstanding_connections = max_concurrent_connections;
+ pg->max_concurrent_ssh = max_concurrent_ssh;
if (NULL != hostnames)
{
off = 0;
hostcnt = 0;
minport = LOW_PORT;
}
+
+ /* Create the servicehome directory for each remote peer */
+ GNUNET_assert(GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (cfg, "PATHS", "SERVICEHOME",
+ &baseservicehome));
+ for (i = 0; i < pg->num_hosts; i++)
+ {
+ struct OutstandingSSH *ssh_entry;
+ ssh_entry = GNUNET_malloc(sizeof(struct OutstandingSSH));
+ ssh_entry->hostname = pg->hosts[i].hostname; /* Don't free! */
+ GNUNET_CONTAINER_DLL_insert(pg->ssh_head, pg->ssh_tail, ssh_entry);
+ if (NULL != pg->hosts[i].username)
+ GNUNET_asprintf (&arg, "%s@%s", pg->hosts[i].username, pg->hosts[i].hostname);
+ else
+ GNUNET_asprintf (&arg, "%s", pg->hosts[i].hostname);
+ if (pg->hosts[i].sshport != 0)
+ {
+ GNUNET_asprintf (&ssh_port_str, "%d", pg->hosts[i].sshport);
+ proc = GNUNET_OS_start_process (NULL, NULL, "ssh",
+ "ssh", "-P", ssh_port_str,
+#if !DEBUG_TESTING
+ "-q",
+#endif
+ arg, "mkdir -p", baseservicehome, NULL);
+ }
+ else
+ proc = GNUNET_OS_start_process (NULL, NULL, "ssh",
+ "ssh", arg, "mkdir -p", baseservicehome, NULL);
+ 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);
+
+ if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_string (cfg, "TESTING", "HOSTKEYSFILE",
+ &hostkeys_file))
+ {
+ if (GNUNET_YES != GNUNET_DISK_file_test (hostkeys_file))
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Couldn't read hostkeys file!\n");
+ else
+ {
+ /* Check hostkey file size, read entire thing into memory */
+ fd = GNUNET_DISK_file_open (hostkeys_file, GNUNET_DISK_OPEN_READ,
+ GNUNET_DISK_PERM_NONE);
+ if (NULL == fd)
+ {
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "open", hostkeys_file);
+ return NULL;
+ }
+
+ if (GNUNET_YES != GNUNET_DISK_file_size (hostkeys_file, &fs, GNUNET_YES))
+ fs = 0;
+
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Found file size %llu for hostkeys, expect hostkeys to be size %d\n", fs, HOSTKEYFILESIZE);
+
+ if (fs % HOSTKEYFILESIZE != 0)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "File size %llu seems incorrect for hostkeys...\n", fs);
+ }
+ else
+ {
+ total_hostkeys = fs / HOSTKEYFILESIZE;
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Will read %llu hostkeys from file\n", total_hostkeys);
+ pg->hostkey_data = GNUNET_malloc_large (fs);
+ GNUNET_assert (fs == GNUNET_DISK_file_read (fd, pg->hostkey_data, fs));
+ GNUNET_assert(GNUNET_OK == GNUNET_DISK_file_close(fd));
+ }
+ }
+ GNUNET_free(hostkeys_file);
+ }
+
for (off = 0; off < total; off++)
{
if (hostcnt > 0)
username = pg->hosts[off % hostcnt].username;
sshport = pg->hosts[off % hostcnt].sshport;
pcfg = make_config (cfg,
+ off,
&pg->hosts[off % hostcnt].minport,
&upnum, hostname, &fdnum);
}
hostname = NULL;
username = NULL;
sshport = 0;
- pcfg = make_config (cfg, &minport, &upnum, hostname, &fdnum);
+ pcfg = make_config (cfg, off, &minport, &upnum, hostname, &fdnum);
}
if (NULL == pcfg)
"SERVICEHOME", newservicehome);
GNUNET_free (newservicehome);
pg->peers[off].cfg = pcfg;
+#if DEFER
+ /* Can we do this later? */
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;
+#endif
+ pg->peers[off].pg = pg;
pg->peers[off].internal_context.peer = &pg->peers[off];
pg->peers[off].internal_context.timeout = timeout;
pg->peers[off].internal_context.hostname = hostname;
pg->peers[off].internal_context.username = username;
pg->peers[off].internal_context.sshport = sshport;
+ if (pg->hostkey_data != NULL)
+ pg->peers[off].internal_context.hostkey = &pg->hostkey_data[off * HOSTKEYFILESIZE];
pg->peers[off].internal_context.hostkey_callback = hostkey_callback;
pg->peers[off].internal_context.hostkey_cls = hostkey_cls;
pg->peers[off].internal_context.start_cb = cb;
{
struct PeerShutdownContext *peer_shutdown_ctx = cls;
struct ShutdownContext *shutdown_ctx;
-
+ struct ChurnContext *churn_ctx;
GNUNET_assert (peer_shutdown_ctx != NULL);
shutdown_ctx = peer_shutdown_ctx->shutdown_ctx;
GNUNET_assert (shutdown_ctx != NULL);
-
- if (shutdown_ctx->outstanding > MAX_CONCURRENT_SHUTDOWN)
+ churn_ctx = (struct ChurnContext *)shutdown_ctx->cb_cls;
+ if (shutdown_ctx->outstanding > churn_ctx->pg->max_concurrent_ssh)
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_MILLISECONDS, 100),
&schedule_churn_shutdown_task,
churn_ctx->num_to_stop = voff;
churn_ctx->cb = cb;
churn_ctx->cb_cls = cb_cls;
+ churn_ctx->pg = pg;
for (i = 0; i < pg->total; i++)
{
churn_startup_ctx = GNUNET_malloc (sizeof (struct ChurnRestartContext));
churn_startup_ctx->churn_ctx = churn_ctx;
churn_startup_ctx->timeout = timeout;
+ churn_startup_ctx->pg = pg;
}
for (i = 0; i < von; i++)
{
internal_shutdown_callback (void *cls, const char *emsg)
{
struct ShutdownContext *shutdown_ctx = cls;
+ unsigned int off;
shutdown_ctx->outstanding--;
if (emsg == NULL)
"Not all peers successfully shut down!");
else
shutdown_ctx->cb (shutdown_ctx->cb_cls, NULL);
+
+ GNUNET_free (shutdown_ctx->pg->peers);
+ GNUNET_free_non_null(shutdown_ctx->pg->hostkey_data);
+ for (off = 0; off < shutdown_ctx->pg->num_hosts; off++)
+ {
+ GNUNET_free (shutdown_ctx->pg->hosts[off].hostname);
+ GNUNET_free_non_null (shutdown_ctx->pg->hosts[off].username);
+ }
+ GNUNET_free_non_null (shutdown_ctx->pg->hosts);
+ GNUNET_free (shutdown_ctx->pg);
+
GNUNET_free (shutdown_ctx);
}
}
shutdown_ctx = peer_shutdown_ctx->shutdown_ctx;
GNUNET_assert (shutdown_ctx != NULL);
- if (shutdown_ctx->outstanding > MAX_CONCURRENT_SHUTDOWN)
+ if (shutdown_ctx->outstanding > shutdown_ctx->pg->max_concurrent_ssh)
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_MILLISECONDS, 100),
&schedule_shutdown_task, peer_shutdown_ctx);
unsigned int off;
struct ShutdownContext *shutdown_ctx;
struct PeerShutdownContext *peer_shutdown_ctx;
+#if OLD
+ struct PeerConnection *conn_iter;
+ struct PeerConnection *temp_conn;
+#endif
GNUNET_assert (pg->total > 0);
shutdown_ctx->cb_cls = cb_cls;
shutdown_ctx->total_peers = pg->total;
shutdown_ctx->timeout = timeout;
+ shutdown_ctx->pg = pg;
/* shtudown_ctx->outstanding = 0; */
for (off = 0; off < pg->total; off++)
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_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 OLD
+ conn_iter = pg->peers[off].allowed_peers_head;
+ while (conn_iter != NULL)
+ {
+ temp_conn = conn_iter->next;
+ GNUNET_free(conn_iter);
+ conn_iter = temp_conn;
+ }
+
+ conn_iter = pg->peers[off].connect_peers_head;
+ while (conn_iter != NULL)
+ {
+ temp_conn = conn_iter->next;
+ GNUNET_free(conn_iter);
+ conn_iter = temp_conn;
+ }
+
+ conn_iter = pg->peers[off].blacklisted_peers_head;
+ while (conn_iter != NULL)
+ {
+ temp_conn = conn_iter->next;
+ GNUNET_free(conn_iter);
+ conn_iter = temp_conn;
+ }
+
+ conn_iter = pg->peers[off].connect_peers_working_set_head;
+ while (conn_iter != NULL)
+ {
+ temp_conn = conn_iter->next;
+ GNUNET_free(conn_iter);
+ conn_iter = temp_conn;
+ }
+#else
if (pg->peers[off].allowed_peers != NULL)
GNUNET_CONTAINER_multihashmap_destroy (pg->peers[off].allowed_peers);
if (pg->peers[off].connect_peers != NULL)
if (pg->peers[off].blacklisted_peers != NULL)
GNUNET_CONTAINER_multihashmap_destroy (pg->
peers[off].blacklisted_peers);
+#endif
}
- GNUNET_free (pg->peers);
- for (off = 0; off < pg->num_hosts; off++)
- {
- GNUNET_free (pg->hosts[off].hostname);
- GNUNET_free_non_null (pg->hosts[off].username);
- }
- GNUNET_free_non_null (pg->hosts);
- GNUNET_free (pg);
+
}
projects / oweals / gnunet.git / blobdiff