- distribute peers equally among island nodes on SuperMUC

[oweals/gnunet.git] / src / testbed / testbed_helper.h

diff --git a/src/testbed/testbed_helper.h b/src/testbed/testbed_helper.h
index f4f8abd3983689234d657a58742454298d338ae8..f2c85dfcbd29a7d504fb064f841cc0a96455b458 100644 (file)
--- a/src/testbed/testbed_helper.h
+++ b/src/testbed/testbed_helper.h
@@ -1,6 +1,6 @@
 /*
       This file is part of GNUnet
-      (C) 2012 Christian Grothoff (and other contributing authors)
+      (C) 2008--2013 Christian Grothoff (and other contributing authors)
 
       GNUnet is free software; you can redistribute it and/or modify
       it under the terms of the GNU General Public License as published
@@ -19,16 +19,20 @@
  */
 
 /**
- * @file testbed/testbed_helper.c
+ * @file testbed/testbed_helper.h
  * @brief Message formats for communication between testbed api and
- *          gnunet-testbed-helper process
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ *          gnunet-helper-testbed process
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  */
 
 #ifndef TESTBED_HELPER_H
 #define TESTBED_HELPER_H
 
-struct GNUNET_TESTBED_HelperInit
+GNUNET_NETWORK_STRUCT_BEGIN
+/**
+ * Initialization message for gnunet-helper-testbed to start testbed service
+ */
+    struct GNUNET_TESTBED_HelperInit
 {
   /**
    * Type is GNUNET_MESSAGE_TYPE_TESTBED_HELPER_INIT
@@ -37,19 +41,49 @@ struct GNUNET_TESTBED_HelperInit
 
   /**
    * The controller hostname size excluding the NULL termination character -
-   * strlen (hostname); cannot be zero 
+   * strlen (hostname); cannot be zero
+   */
+  uint16_t trusted_ip_size GNUNET_PACKED;
+
+  /**
+   * The hostname size excluding the NULL termination character - strlen
+   * (hostname); cannot be zero
    */
-  uint16_t cname_size GNUNET_PACKED;
+  uint16_t hostname_size GNUNET_PACKED;
 
   /**
-   * The sizeof the configuration following
+   * The size of the uncompressed configuration
    */
   uint16_t config_size GNUNET_PACKED;
 
-  /* Followed by NULL terminated controller hostname */
-  
+  /* Followed by NULL terminated trusted ip */
+
+  /* Followed by hostname of the machine on which helper runs. This is not NULL
+   * terminated */
+
   /* Followed by serialized and compressed configuration which should be
-     config_size long */
+   * config_size long when un-compressed */
+};
+
+/**
+ * Reply message from helper process
+ */
+struct GNUNET_TESTBED_HelperReply
+{
+  /**
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_HELPER_REPLY
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Size of the uncompressed configuration
+   */
+  uint16_t config_size GNUNET_PACKED;
+
+  /* Followed by compressed configuration which should be config_size long when
+   * un-compressed */
 };
 
+GNUNET_NETWORK_STRUCT_END
 #endif
+/* end of testbed_helper.h */