* @param d handle for the daemon
* @param emsg error message (NULL on success)
*/
-typedef void (*GNUNET_TESTING_NotifyHostkeyCreated)(void *cls,
- const struct GNUNET_PeerIdentity *id,
- struct GNUNET_TESTING_Daemon *d,
- const char *emsg);
+typedef void (*GNUNET_TESTING_NotifyHostkeyCreated) (void *cls,
+ const struct
+ GNUNET_PeerIdentity * id,
+ struct
+ GNUNET_TESTING_Daemon * d,
+ const char *emsg);
/**
* Prototype of a function that will be called whenever
* @param d handle for the daemon
* @param emsg error message (NULL on success)
*/
-typedef void (*GNUNET_TESTING_NotifyDaemonRunning)(void *cls,
- const struct GNUNET_PeerIdentity *id,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TESTING_Daemon *d,
- const char *emsg);
-
+typedef void (*GNUNET_TESTING_NotifyDaemonRunning) (void *cls,
+ const struct
+ GNUNET_PeerIdentity * id,
+ const struct
+ GNUNET_CONFIGURATION_Handle
+ * cfg,
+ struct GNUNET_TESTING_Daemon
+ * d, const char *emsg);
/**
* Handle to an entire testbed of GNUnet peers.
* @param cls closure
* @param emsg NULL on success
*/
-typedef void (*GNUNET_TESTING_NotifyCompletion)(void *cls,
- const char *emsg);
+typedef void (*GNUNET_TESTING_NotifyCompletion) (void *cls, const char *emsg);
/**
* Prototype of a function that will be called with the
* @param cls closure
* @param num_connections the number of connections created
*/
-typedef void (*GNUNET_TESTING_NotifyConnections)(void *cls,
- unsigned int num_connections);
+typedef void (*GNUNET_TESTING_NotifyConnections) (void *cls,
+ unsigned int num_connections);
/**
* Handle for a GNUnet daemon (technically a set of
void *update_cb_cls;
/**
- * Identity of this peer (once started).
+ * PID of the process that we started last.
*/
- struct GNUNET_PeerIdentity id;
+ struct GNUNET_OS_Process *proc;
/**
- * Flag to indicate that we've already been asked
- * to terminate (but could not because some action
- * was still pending).
+ * Handle to the server.
*/
- int dead;
+ struct GNUNET_CORE_Handle *server;
/**
- * GNUNET_YES if the hostkey has been created
- * for this peer, GNUNET_NO otherwise.
+ * Handle to the transport service of this peer
*/
- int have_hostkey;
+ struct GNUNET_TRANSPORT_Handle *th;
/**
- * PID of the process that we started last.
+ * Handle for getting HELLOs from transport
*/
- struct GNUNET_OS_Process *proc;
+ struct GNUNET_TRANSPORT_GetHelloHandle *ghh;
/**
- * In which phase are we during the start of
- * this process?
+ * HELLO message for this peer
*/
- enum GNUNET_TESTING_StartPhase phase;
+ struct GNUNET_HELLO_Message *hello;
/**
- * ID of the current task.
+ * Handle to a pipe for reading the hostkey.
*/
- GNUNET_SCHEDULER_TaskIdentifier task;
+ struct GNUNET_DISK_PipeHandle *pipe_stdout;
/**
- * Handle to the server.
+ * Currently, a single char * pointing to a service
+ * that has been churned off.
+ *
+ * FIXME: make this a linked list of services that have been churned off!!!
*/
- struct GNUNET_CORE_Handle *server;
+ char *churned_services;
/**
- * Handle to the transport service of this peer
+ * ID of the current task.
*/
- struct GNUNET_TRANSPORT_Handle *th;
+ GNUNET_SCHEDULER_TaskIdentifier task;
/**
- * HELLO message for this peer
+ * Identity of this peer (once started).
*/
- struct GNUNET_HELLO_Message *hello;
+ struct GNUNET_PeerIdentity id;
/**
- * Handle to a pipe for reading the hostkey.
+ * Flag to indicate that we've already been asked
+ * to terminate (but could not because some action
+ * was still pending).
*/
- struct GNUNET_DISK_PipeHandle *pipe_stdout;
+ int dead;
/**
- * Output from gnunet-peerinfo is read into this buffer.
+ * GNUNET_YES if the hostkey has been created
+ * for this peer, GNUNET_NO otherwise.
*/
- char hostkeybuf[105];
+ int have_hostkey;
+
+ /**
+ * In which phase are we during the start of
+ * this process?
+ */
+ enum GNUNET_TESTING_StartPhase phase;
/**
* Current position in 'hostkeybuf' (for reading from gnunet-peerinfo)
int churn;
/**
- * Currently, a single char * pointing to a service
- * that has been churned off.
- *
- * FIXME: make this a linked list of services that have been churned off!!!
+ * Output from gnunet-peerinfo is read into this buffer.
*/
- char *churned_services;
+ char hostkeybuf[105];
+
};
* @param second_daemon handle for the second daemon
* @param emsg error message (NULL on success)
*/
-typedef void (*GNUNET_TESTING_NotifyConnection)(void *cls,
- const struct GNUNET_PeerIdentity *first,
- const struct GNUNET_PeerIdentity *second,
- uint32_t distance,
- const struct GNUNET_CONFIGURATION_Handle *first_cfg,
- const struct GNUNET_CONFIGURATION_Handle *second_cfg,
- struct GNUNET_TESTING_Daemon *first_daemon,
- struct GNUNET_TESTING_Daemon *second_daemon,
- const char *emsg);
+typedef void (*GNUNET_TESTING_NotifyConnection) (void *cls,
+ const struct
+ GNUNET_PeerIdentity * first,
+ const struct
+ GNUNET_PeerIdentity * second,
+ uint32_t distance,
+ const struct
+ GNUNET_CONFIGURATION_Handle *
+ first_cfg,
+ const struct
+ GNUNET_CONFIGURATION_Handle *
+ second_cfg,
+ struct GNUNET_TESTING_Daemon *
+ first_daemon,
+ struct GNUNET_TESTING_Daemon *
+ second_daemon,
+ const char *emsg);
+
/**
* Prototype of a callback function indicating that two peers
* @param distance distance between the connected peers
* @param emsg error message (NULL on success)
*/
-typedef void (*GNUNET_TESTING_NotifyTopology)(void *cls,
- const struct GNUNET_PeerIdentity *first,
- const struct GNUNET_PeerIdentity *second,
- const char *emsg);
+typedef void (*GNUNET_TESTING_NotifyTopology) (void *cls,
+ const struct GNUNET_PeerIdentity
+ * first,
+ const struct GNUNET_PeerIdentity
+ * second, const char *emsg);
+
/**
* Starts a GNUnet daemon. GNUnet must be installed on the target
*/
struct GNUNET_TESTING_Daemon *
GNUNET_TESTING_daemon_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TIME_Relative timeout,
- int pretend,
- const char *hostname,
- const char *ssh_username,
- uint16_t sshport,
- const char *hostkey,
+ struct GNUNET_TIME_Relative timeout, int pretend,
+ const char *hostname, const char *ssh_username,
+ uint16_t sshport, const char *hostkey,
GNUNET_TESTING_NotifyHostkeyCreated
hostkey_callback, void *hostkey_cls,
GNUNET_TESTING_NotifyDaemonRunning cb,
* @param daemon the daemon to finish starting
*/
void
-GNUNET_TESTING_daemon_continue_startup(struct GNUNET_TESTING_Daemon *daemon);
+GNUNET_TESTING_daemon_continue_startup (struct GNUNET_TESTING_Daemon *daemon);
+
/**
* Check whether the given daemon is running.
*
* @param daemon the daemon to check
- *
* @return GNUNET_YES if the daemon is up, GNUNET_NO if the
* daemon is down, GNUNET_SYSERR on error.
*/
int
-GNUNET_TESTING_daemon_running (struct GNUNET_TESTING_Daemon *daemon);
+GNUNET_TESTING_test_daemon_running (struct GNUNET_TESTING_Daemon *daemon);
+
/**
* Restart (stop and start) a GNUnet daemon.
*/
void
GNUNET_TESTING_daemon_restart (struct GNUNET_TESTING_Daemon *d,
- GNUNET_TESTING_NotifyDaemonRunning cb, void *cb_cls);
+ GNUNET_TESTING_NotifyDaemonRunning cb,
+ void *cb_cls);
+
/**
* Start a peer that has previously been stopped using the daemon_stop
GNUNET_TESTING_NotifyDaemonRunning cb,
void *cb_cls);
+
/**
* Starts a GNUnet daemon's service.
*
*/
void
GNUNET_TESTING_daemon_start_service (struct GNUNET_TESTING_Daemon *d,
- char *service,
+ const char *service,
struct GNUNET_TIME_Relative timeout,
- GNUNET_TESTING_NotifyDaemonRunning cb, void *cb_cls);
+ GNUNET_TESTING_NotifyDaemonRunning cb,
+ void *cb_cls);
+
/**
* Starts a GNUnet daemon's service which has been previously turned off.
void
GNUNET_TESTING_daemon_start_stopped_service (struct GNUNET_TESTING_Daemon *d,
char *service,
- struct GNUNET_TIME_Relative timeout,
- GNUNET_TESTING_NotifyDaemonRunning cb, void *cb_cls);
+ struct GNUNET_TIME_Relative
+ timeout,
+ GNUNET_TESTING_NotifyDaemonRunning
+ cb, void *cb_cls);
+
/**
* Get a certain testing daemon handle.
* @param position the number of the peer to return
*/
struct GNUNET_TESTING_Daemon *
-GNUNET_TESTING_daemon_get (struct GNUNET_TESTING_PeerGroup *pg,
- unsigned int position);
+GNUNET_TESTING_daemon_get (struct GNUNET_TESTING_PeerGroup *pg,
+ unsigned int position);
-/*
+
+/**
* Get a daemon by peer identity, so callers can
* retrieve the daemon without knowing it's offset.
*
*/
struct GNUNET_TESTING_Daemon *
GNUNET_TESTING_daemon_get_by_id (struct GNUNET_TESTING_PeerGroup *pg,
- struct GNUNET_PeerIdentity *peer_id);
+ const struct GNUNET_PeerIdentity *peer_id);
+
/**
* Stops a GNUnet daemon.
* @param cb function called once the configuration was changed
* @param cb_cls closure for cb
*/
-void GNUNET_TESTING_daemon_reconfigure (struct GNUNET_TESTING_Daemon *d,
- struct GNUNET_CONFIGURATION_Handle *cfg,
- GNUNET_TESTING_NotifyCompletion cb,
- void * cb_cls);
+void
+GNUNET_TESTING_daemon_reconfigure (struct GNUNET_TESTING_Daemon *d,
+ struct GNUNET_CONFIGURATION_Handle *cfg,
+ GNUNET_TESTING_NotifyCompletion cb,
+ void *cb_cls);
+
/**
* Stops a single service of a GNUnet daemon. Used like daemon_stop,
*/
void
GNUNET_TESTING_daemon_stop_service (struct GNUNET_TESTING_Daemon *d,
- char *service,
+ const char *service,
struct GNUNET_TIME_Relative timeout,
- GNUNET_TESTING_NotifyCompletion cb, void *cb_cls);
+ GNUNET_TESTING_NotifyCompletion cb,
+ void *cb_cls);
+
/**
* Read a testing hosts file based on a configuration.
hostkey_callback, void *hostkey_cls,
GNUNET_TESTING_NotifyDaemonRunning cb,
void *cb_cls,
- GNUNET_TESTING_NotifyConnection
- connect_callback, void *connect_callback_cls,
+ GNUNET_TESTING_NotifyConnection connect_callback,
+ void *connect_callback_cls,
const struct GNUNET_TESTING_Host *hostnames);
+
/**
* Function which continues a peer group starting up
* after successfully generating hostkeys for each peer.
* @param pg the peer group to continue starting
*/
void
-GNUNET_TESTING_daemons_continue_startup(struct GNUNET_TESTING_PeerGroup *pg);
+GNUNET_TESTING_daemons_continue_startup (struct GNUNET_TESTING_PeerGroup *pg);
+
+
+/**
+ * Handle for an active request to connect two peers.
+ */
+struct GNUNET_TESTING_ConnectContext;
/**
- * Establish a connection between two GNUnet daemons.
+ * Establish a connection between two GNUnet daemons. The daemons
+ * must both be running and not be stopped until either the
+ * 'cb' callback is called OR the connection request has been
+ * explicitly cancelled.
*
* @param d1 handle for the first daemon
* @param d2 handle for the second daemon
* the HELLO has already been exchanged
* @param cb function to call at the end
* @param cb_cls closure for cb
+ * @return handle to cancel the request, NULL on error
*/
-void
+struct GNUNET_TESTING_ConnectContext *
GNUNET_TESTING_daemons_connect (struct GNUNET_TESTING_Daemon *d1,
struct GNUNET_TESTING_Daemon *d2,
struct GNUNET_TIME_Relative timeout,
void *cb_cls);
+
+/**
+ * Cancel an attempt to connect two daemons.
+ *
+ * @param cc connect context
+ */
+void
+GNUNET_TESTING_daemons_connect_cancel (struct GNUNET_TESTING_ConnectContext
+ *cc);
+
+
+
/**
* Restart all peers in the given group.
*
* @param cb_cls closure for cb
*/
void
-GNUNET_TESTING_daemons_stop (struct GNUNET_TESTING_PeerGroup *pg,
+GNUNET_TESTING_daemons_stop (struct GNUNET_TESTING_PeerGroup *pg,
struct GNUNET_TIME_Relative timeout,
- GNUNET_TESTING_NotifyCompletion cb,
- void *cb_cls);
+ GNUNET_TESTING_NotifyCompletion cb, void *cb_cls);
/**
unsigned int
GNUNET_TESTING_daemons_running (struct GNUNET_TESTING_PeerGroup *pg);
+
/**
* Simulate churn by stopping some peers (and possibly
* re-starting others if churn is called multiple times). This
*/
void
GNUNET_TESTING_daemons_churn (struct GNUNET_TESTING_PeerGroup *pg,
- char *service,
- unsigned int voff,
+ char *service, unsigned int voff,
unsigned int von,
struct GNUNET_TIME_Relative timeout,
- GNUNET_TESTING_NotifyCompletion cb,
- void *cb_cls);
-/*
+ GNUNET_TESTING_NotifyCompletion cb, void *cb_cls);
+
+
+/**
* Start a given service for each of the peers in the peer group.
*
* @param pg handle for the peer group
GNUNET_TESTING_NotifyCompletion cb,
void *cb_cls);
+
/**
* Callback function to process statistic values.
*
* @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration
*/
typedef int (*GNUNET_TESTING_STATISTICS_Iterator) (void *cls,
- const struct GNUNET_PeerIdentity *peer,
+ const struct
+ GNUNET_PeerIdentity * peer,
const char *subsystem,
const char *name,
uint64_t value,
int is_persistent);
+
/**
* Iterate over all (running) peers in the peer group, retrieve
* all statistics from each.
void
GNUNET_TESTING_get_statistics (struct GNUNET_TESTING_PeerGroup *pg,
GNUNET_STATISTICS_Callback cont,
- GNUNET_TESTING_STATISTICS_Iterator proc, void *cls);
+ GNUNET_TESTING_STATISTICS_Iterator proc,
+ void *cls);
+
/**
* Topologies supported for testbeds.
* known topology, GNUNET_NO if not
*/
int
-GNUNET_TESTING_topology_get(enum GNUNET_TESTING_Topology *topology,
- const char * topology_string);
+GNUNET_TESTING_topology_get (enum GNUNET_TESTING_Topology *topology,
+ const char *topology_string);
+
/**
* Get connect topology option from string input.
* known topology, GNUNET_NO if not
*/
int
-GNUNET_TESTING_topology_option_get(enum GNUNET_TESTING_TopologyOption *topology_option,
- const char * topology_string);
+GNUNET_TESTING_topology_option_get (enum GNUNET_TESTING_TopologyOption
+ *topology_option,
+ const char *topology_string);
/**
enum GNUNET_TESTING_Topology restrict_topology,
const char *restrict_transports);
+
/**
* Iterate over all (running) peers in the peer group, retrieve
* all connections that each currently has.
*/
void
GNUNET_TESTING_get_topology (struct GNUNET_TESTING_PeerGroup *pg,
- GNUNET_TESTING_NotifyTopology cb, void *cls);
+ GNUNET_TESTING_NotifyTopology cb, void *cls);
+
/**
* Stop the connection process temporarily.
*
* @param pg the peer group to stop connecting
*/
-void GNUNET_TESTING_stop_connections(struct GNUNET_TESTING_PeerGroup *pg);
+void
+GNUNET_TESTING_stop_connections (struct GNUNET_TESTING_PeerGroup *pg);
+
/**
* Resume the connection process.
*
* @param pg the peer group to resume connecting
*/
-void GNUNET_TESTING_resume_connections(struct GNUNET_TESTING_PeerGroup *pg);
+void
+GNUNET_TESTING_resume_connections (struct GNUNET_TESTING_PeerGroup *pg);
+
/**
* There are many ways to connect peers that are supported by this function.
GNUNET_TESTING_NotifyCompletion
notify_callback, void *notify_cls);
+
/**
* Start or stop an individual peer from the given group.
*
* @param cb_cls closure for cb
*/
void
-GNUNET_TESTING_daemons_vary (struct GNUNET_TESTING_PeerGroup *pg,
- unsigned int offset,
- int desired_status,
- struct GNUNET_TIME_Relative timeout,
- GNUNET_TESTING_NotifyCompletion cb,
- void *cb_cls);
+GNUNET_TESTING_daemons_vary (struct GNUNET_TESTING_PeerGroup *pg,
+ unsigned int offset, int desired_status,
+ struct GNUNET_TIME_Relative timeout,
+ GNUNET_TESTING_NotifyCompletion cb, void *cb_cls);
+
/**
* Start a peer group with a given number of peers. Notify
* @return NULL on error, otherwise handle to control peer group
*/
struct GNUNET_TESTING_PeerGroup *
-GNUNET_TESTING_peergroup_start(
- const struct GNUNET_CONFIGURATION_Handle *cfg,
- unsigned int total,
- struct GNUNET_TIME_Relative timeout,
- GNUNET_TESTING_NotifyConnection connect_cb,
- GNUNET_TESTING_NotifyCompletion peergroup_cb,
- void *peergroup_cls,
- const struct GNUNET_TESTING_Host *hostnames);
+GNUNET_TESTING_peergroup_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
+ unsigned int total,
+ struct GNUNET_TIME_Relative timeout,
+ GNUNET_TESTING_NotifyConnection connect_cb,
+ GNUNET_TESTING_NotifyCompletion peergroup_cb,
+ void *peergroup_cls,
+ const struct GNUNET_TESTING_Host *hostnames);
+
/**
* Print current topology to a graphviz readable file.
*
*/
void
-GNUNET_TESTING_peergroup_topology_to_file(struct GNUNET_TESTING_PeerGroup *pg,
- const char *output_filename,
- GNUNET_TESTING_NotifyCompletion notify_cb,
- void *notify_cb_cls);
+GNUNET_TESTING_peergroup_topology_to_file (struct GNUNET_TESTING_PeerGroup *pg,
+ const char *output_filename,
+ GNUNET_TESTING_NotifyCompletion
+ notify_cb, void *notify_cb_cls);
#if 0 /* keep Emacsens' auto-indent happy */
projects / oweals / gnunet.git / blobdiff