[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12979 - gnunet/src/include
From: |
gnunet |
Subject: |
[GNUnet-SVN] r12979 - gnunet/src/include |
Date: |
Tue, 14 Sep 2010 10:45:38 +0200 |
Author: nevans
Date: 2010-09-14 10:45:38 +0200 (Tue, 14 Sep 2010)
New Revision: 12979
Modified:
gnunet/src/include/gnunet_testing_lib.h
Log:
testing lib changes
Modified: gnunet/src/include/gnunet_testing_lib.h
===================================================================
--- gnunet/src/include/gnunet_testing_lib.h 2010-09-14 08:45:05 UTC (rev
12978)
+++ gnunet/src/include/gnunet_testing_lib.h 2010-09-14 08:45:38 UTC (rev
12979)
@@ -51,12 +51,30 @@
struct GNUNET_TESTING_Daemon;
/**
- * Linked list of hostnames to use for starting daemons.
+ * Linked list of hostnames and ports to use for starting daemons.
*/
struct GNUNET_TESTING_Host
{
+ /**
+ * Pointer to next item in the list.
+ */
struct GNUNET_TESTING_Host *next;
+
+ /**
+ * Hostname to connect to.
+ */
char *hostname;
+
+ /**
+ * Username to use when connecting (may be null).
+ */
+ char *username;
+
+ /**
+ * Port to use for SSH connection (used for ssh
+ * connection forwarding, 0 to let ssh decide)
+ */
+ uint16_t port;
};
/**
@@ -207,6 +225,11 @@
char *hostname;
/**
+ * Port to use for ssh, NULL to let system choose default.
+ */
+ char *ssh_port_str;
+
+ /**
* Result of GNUNET_i2s of this peer,
* for printing
*/
@@ -392,11 +415,13 @@
* @param timeout how long to wait starting up peers
* @param hostname name of the machine where to run GNUnet
* (use NULL for localhost).
+ * @param ssh_username ssh username to use when connecting to hostname
+ * @param sshport port to pass to ssh process when connecting to hostname
* @param hostkey_callback function to call once the hostkey has been
* generated for this peer, but it hasn't yet been started
* (NULL to start immediately, otherwise waits on
GNUNET_TESTING_daemon_continue_start)
* @param hostkey_cls closure for hostkey callback
- * @param cb function to call with the result
+ * @param cb function to call once peer is up, or failed to start
* @param cb_cls closure for cb
* @return handle to the daemon (actual start will be completed asynchronously)
*/
@@ -405,6 +430,8 @@
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TIME_Relative timeout,
const char *hostname,
+ const char *ssh_username,
+ uint16_t sshport,
GNUNET_TESTING_NotifyHostkeyCreated
hostkey_callback,
void *hostkey_cls,
GNUNET_TESTING_NotifyDaemonRunning cb,
@@ -599,6 +626,16 @@
/**
+ * Count the number of running peers.
+ *
+ * @param pg handle for the peer group
+ *
+ * @return the number of currently running peers in the peer group
+ */
+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
* function can only be used to create leave-join churn (peers "never"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r12979 - gnunet/src/include,
gnunet <=