[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r10255 - gnunet/src/include
From: |
gnunet |
Subject: |
[GNUnet-SVN] r10255 - gnunet/src/include |
Date: |
Mon, 8 Feb 2010 17:51:40 +0100 |
Author: nevans
Date: 2010-02-08 17:51:40 +0100 (Mon, 08 Feb 2010)
New Revision: 10255
Modified:
gnunet/src/include/gnunet_testing_lib.h
Log:
testing related changes
Modified: gnunet/src/include/gnunet_testing_lib.h
===================================================================
--- gnunet/src/include/gnunet_testing_lib.h 2010-02-08 16:51:20 UTC (rev
10254)
+++ gnunet/src/include/gnunet_testing_lib.h 2010-02-08 16:51:40 UTC (rev
10255)
@@ -70,6 +70,28 @@
/**
+ * Prototype of a function that will be called whenever
+ * two daemons are connected by the testing library.
+ *
+ * @param cls closure
+ * @param first peer id for first daemon
+ * @param second peer id for the second daemon
+ * @param first_cfg config for the first daemon
+ * @param second_cfg config for the second daemon
+ * @param first_daemon handle for the first daemon
+ * @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,
+ 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);
+
+/**
* Starts a GNUnet daemon. GNUnet must be installed on the target
* system and available in the PATH. The machine must furthermore be
* reachable via "ssh" (unless the hostname is "NULL") without the
@@ -127,6 +149,13 @@
GNUNET_TESTING_NotifyCompletion cb,
void * cb_cls);
+/*
+ * Get the short name of a running peer
+ *
+ * @param d the daemon handle
+ */
+char *
+GNUNET_TESTING_daemon_get_shortname(struct GNUNET_TESTING_Daemon *d);
/**
* Establish a connection between two GNUnet daemons.
@@ -141,7 +170,7 @@
void GNUNET_TESTING_daemons_connect (struct GNUNET_TESTING_Daemon *d1,
struct GNUNET_TESTING_Daemon *d2,
struct GNUNET_TIME_Relative timeout,
- GNUNET_TESTING_NotifyCompletion cb,
+ GNUNET_TESTING_NotifyConnection cb,
void *cb_cls);
@@ -163,6 +192,8 @@
* @param total number of daemons to start
* @param cb function to call on each daemon that was started
* @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 space-separated list of hostnames to use,
* NULL to use localhost only
* @return NULL on error, otherwise handle to control peer group
@@ -173,6 +204,8 @@
unsigned int total,
GNUNET_TESTING_NotifyDaemonRunning cb,
void *cb_cls,
+ GNUNET_TESTING_NotifyConnection connect_callback,
+ void *connect_callback_cls,
const char *hostnames);
@@ -221,6 +254,12 @@
*/
GNUNET_TESTING_TOPOLOGY_ERDOS_RENYI,
+ /*
+ * Certain percentage of peers are unable to communicate directly
+ * replicating NAT conditions
+ */
+ GNUNET_TESTING_TOPOLOGY_INTERNAT,
+
/**
* All peers are disconnected.
*/
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r10255 - gnunet/src/include,
gnunet <=