[GNUnet-SVN] r8324 - GNUnet/src/include

[gnunet]

Author: nevans
Date: 2009-03-11 14:48:21 -0600 (Wed, 11 Mar 2009)
New Revision: 8324

Modified:
   GNUnet/src/include/dv.h
   GNUnet/src/include/gnunet_dv_lib.h
   GNUnet/src/include/gnunet_remote_lib.h
Log:


Modified: GNUnet/src/include/dv.h
===================================================================
--- GNUnet/src/include/dv.h     2009-03-11 20:46:18 UTC (rev 8323)
+++ GNUnet/src/include/dv.h     2009-03-11 20:48:21 UTC (rev 8324)
@@ -61,6 +61,11 @@
   GNUNET_MessageHeader header GNUNET_PACKED;
 
   /**
+   * Identity of peer that sent the message
+   */
+  GNUNET_PeerIdentity sender GNUNET_PACKED;
+
+  /**
    * Identity of neighbor this message is going to
    */
   GNUNET_PeerIdentity recipient GNUNET_PACKED;

Modified: GNUnet/src/include/gnunet_dv_lib.h
===================================================================
--- GNUnet/src/include/gnunet_dv_lib.h  2009-03-11 20:46:18 UTC (rev 8323)
+++ GNUnet/src/include/gnunet_dv_lib.h  2009-03-11 20:48:21 UTC (rev 8324)
@@ -36,8 +36,19 @@
  * @message the message being sent
  */
 int GNUNET_DV_send_message (const GNUNET_PeerIdentity * recipient,
-                            char *message);
+                            const GNUNET_MessageHeader * message,
+                            unsigned int importance, unsigned int maxdelay);
 
+/**
+ * Calls a given method for each dv connected host.
+ *
+ * @param method method to call for each connected peer
+ * @param arg second argument to method
+ * @return number of connected nodes
+ */
+int
+GNUNET_DV_connection_iterate_peers (GNUNET_NodeIteratorCallback method,
+                                    void *arg);
 
 #endif
 

Modified: GNUnet/src/include/gnunet_remote_lib.h
===================================================================
--- GNUnet/src/include/gnunet_remote_lib.h      2009-03-11 20:46:18 UTC (rev 
8323)
+++ GNUnet/src/include/gnunet_remote_lib.h      2009-03-11 20:48:21 UTC (rev 
8324)
@@ -44,10 +44,25 @@
   GNUNET_REMOTE_RING,
   GNUNET_REMOTE_2D_TORUS,
   GNUNET_REMOTE_ERDOS_RENYI,
+  GNUNET_REMOTE_NONE,
 
 } GNUNET_REMOTE_TOPOLOGIES;
 
 /**
+ * Linked list of information about daemon processes.
+ */
+struct GNUNET_REMOTE_TESTING_DaemonContext
+{
+  struct GNUNET_REMOTE_TESTING_DaemonContext *next;
+  struct GNUNET_GC_Configuration *config;
+  GNUNET_PeerIdentity *peer;
+  unsigned short port;
+  char *pid;
+  char *hostname;
+  char *username;
+};
+
+/**
  * Starts a single gnunet daemon on a remote machine
  *
  * @param gnunetd_home directory where gnunetd is on remote machine
@@ -66,11 +81,15 @@
 /**
  * Main start function to be called.  Needs a remote config specified, as well
  * as the number of daemons to start and the type of topology.  Available 
topology
- * types are defined in gnunet_remote_lib.h
+ * types are defined in gnunet_remote_lib.h  Returns a linked list of hosts 
started
  */
-int GNUNET_REMOTE_start_daemons (struct GNUNET_GC_Configuration *newcfg,
-                                 unsigned long long number_of_daemons);
+struct GNUNET_REMOTE_TESTING_DaemonContext
+  *GNUNET_REMOTE_start_daemons (struct GNUNET_GC_Configuration *newcfg,
+                                unsigned long long number_of_daemons);
 
+int
+GNUNET_REMOTE_kill_daemon (struct GNUNET_REMOTE_TESTING_DaemonContext
+                           *tokill);
 
 #if 0                           /* keep Emacsens' auto-indent happy */
 {