diff options
author | Nathan S. Evans <evans@in.tum.de> | 2011-04-06 09:41:00 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2011-04-06 09:41:00 +0000 |
commit | 7c14f79654d27ea0bd06784b58a6f9e95064ecaf (patch) | |
tree | b085b633d11986b5d938179d4431999eba1252f1 /src/include/gnunet_testing_lib.h | |
parent | b24caf06a3d147b2362c210c4e7385b83c9f582b (diff) | |
download | gnunet-7c14f79654d27ea0bd06784b58a6f9e95064ecaf.tar.gz gnunet-7c14f79654d27ea0bd06784b58a6f9e95064ecaf.zip |
peergroup api version 2
Diffstat (limited to 'src/include/gnunet_testing_lib.h')
-rw-r--r-- | src/include/gnunet_testing_lib.h | 46 |
1 files changed, 14 insertions, 32 deletions
diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h index b52da166a..49d33af44 100644 --- a/src/include/gnunet_testing_lib.h +++ b/src/include/gnunet_testing_lib.h | |||
@@ -971,17 +971,13 @@ GNUNET_TESTING_daemons_vary (struct GNUNET_TESTING_PeerGroup *pg, | |||
971 | void *cb_cls); | 971 | void *cb_cls); |
972 | 972 | ||
973 | /** | 973 | /** |
974 | * Start count gnunet instances with the same set of transports and | 974 | * Start a peer group with a given number of peers. Notify |
975 | * applications. The port numbers (any option called "PORT") will be | 975 | * on completion of peer startup and connection based on given |
976 | * adjusted to ensure that no two peers running on the same system | 976 | * topological constraints. Optionally notify on each |
977 | * have the same port(s) in their respective configurations. | 977 | * established connection. |
978 | * | 978 | * |
979 | * @param cfg configuration template to use | 979 | * @param cfg configuration template to use |
980 | * @param total number of daemons to start | 980 | * @param total number of daemons to start |
981 | * @param max_concurrent_connections for testing, how many peers can | ||
982 | * we connect to simultaneously | ||
983 | * @param max_concurrent_ssh when starting with ssh, how many ssh | ||
984 | * connections will we allow at once (based on remote hosts allowed!) | ||
985 | * @param timeout total time allowed for peers to start | 981 | * @param timeout total time allowed for peers to start |
986 | * @param connect_cb function to call each time two daemons are connected | 982 | * @param connect_cb function to call each time two daemons are connected |
987 | * @param connect_cb_cls closure for connect_callback | 983 | * @param connect_cb_cls closure for connect_callback |
@@ -989,35 +985,21 @@ GNUNET_TESTING_daemons_vary (struct GNUNET_TESTING_PeerGroup *pg, | |||
989 | * @param peergroup_cb_cls closure for peergroup_cb | 985 | * @param peergroup_cb_cls closure for peergroup_cb |
990 | * @param hostnames linked list of host structs to use to start peers on | 986 | * @param hostnames linked list of host structs to use to start peers on |
991 | * (NULL to run on localhost only) | 987 | * (NULL to run on localhost only) |
992 | * @param topology allowed overlay topology | ||
993 | * @param restrict_topology blacklist connections to this topology | ||
994 | * @param restrict_transports specific transports to blacklist | ||
995 | * @param connect_topology topology to connect peers in (defaults to allowed | ||
996 | * topology) | ||
997 | * @param connect_topology_options options for connect topology | ||
998 | * @param connect_topology_option_modifier option modifier for connect topology | ||
999 | * @param verbose GNUNET_YES to print progress bars, GNUNET_NO otherwise | 988 | * @param verbose GNUNET_YES to print progress bars, GNUNET_NO otherwise |
1000 | * | 989 | * |
1001 | * @return NULL on error, otherwise handle to control peer group | 990 | * @return NULL on error, otherwise handle to control peer group |
1002 | */ | 991 | */ |
1003 | struct GNUNET_TESTING_PeerGroup * | 992 | struct GNUNET_TESTING_PeerGroup * |
1004 | GNUNET_TESTING_PeerGroup_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | 993 | GNUNET_TESTING_peergroup_start( |
1005 | unsigned int total, | 994 | const struct GNUNET_CONFIGURATION_Handle *cfg, |
1006 | unsigned int max_concurrent_connections, | 995 | unsigned int total, |
1007 | unsigned int max_concurrent_ssh, | 996 | struct GNUNET_TIME_Relative timeout, |
1008 | struct GNUNET_TIME_Relative timeout, | 997 | GNUNET_TESTING_NotifyConnection connect_cb, |
1009 | GNUNET_TESTING_NotifyConnection | 998 | void *connect_cb_cls, |
1010 | connect_cb, void *connect_cb_cls, | 999 | GNUNET_TESTING_NotifyCompletion peergroup_cb, |
1011 | GNUNET_TESTING_NotifyCompletion peergroup_cb, | 1000 | void *peergroup_cb_cls, |
1012 | void *peergroup_cb_cls, | 1001 | const struct GNUNET_TESTING_Host *hostnames, |
1013 | const struct GNUNET_TESTING_Host *hostnames, | 1002 | int verbose); |
1014 | enum GNUNET_TESTING_Topology topology, | ||
1015 | enum GNUNET_TESTING_Topology restrict_topology, | ||
1016 | const char *restrict_transports, | ||
1017 | enum GNUNET_TESTING_Topology connect_topology, | ||
1018 | enum GNUNET_TESTING_TopologyOption connect_topology_options, | ||
1019 | double connect_topology_option_modifier, | ||
1020 | int verbose); | ||
1021 | 1003 | ||
1022 | 1004 | ||
1023 | #if 0 /* keep Emacsens' auto-indent happy */ | 1005 | #if 0 /* keep Emacsens' auto-indent happy */ |