6 files changed, 65 insertions, 9 deletions

diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c
index bc7f223af..0e70645c7 100644
--- a/src/testbed/gnunet-helper-testbed.c
+++ b/src/testbed/gnunet-helper-testbed.c
@@ -226,14 +226,18 @@ tokenizer_cb (void *cls, void *client,
   struct GNUNET_CONFIGURATION_Handle *cfg;
   struct WriteContext *wc;
   char *controller;
+  char *hostname;
   char *config;
   char *xconfig;
   size_t config_size;
   uLongf ul_config_size;
   size_t xconfig_size;
   uint16_t cname_size;
-
-  if ((sizeof (struct GNUNET_TESTBED_HelperInit) >= ntohs (message->size)) ||
+  uint16_t hostname_size;
+  uint16_t msize;
+  
+  msize = ntohs (message->size);
+  if ((sizeof (struct GNUNET_TESTBED_HelperInit) >= msize) ||
       (GNUNET_MESSAGE_TYPE_TESTBED_HELPER_INIT != ntohs (message->type)))
   {
     LOG (GNUNET_ERROR_TYPE_WARNING, "Received unexpected message -- exiting\n");
@@ -248,6 +252,14 @@ tokenizer_cb (void *cls, void *client,
          "Controller name cannot be empty -- exiting\n");
     goto error;
   }
+  hostname_size = ntohs (msg->hostname_size);
+  if ((sizeof (struct GNUNET_TESTBED_HelperInit) + cname_size + 1 +
+       hostname_size) >= msize)
+  {
+    GNUNET_break (0);
+    LOG (GNUNET_ERROR_TYPE_WARNING, "Received unexpected message -- exiting\n");
+    goto error;
+  }  
   ul_config_size = (uLongf) ntohs (msg->config_size);
   config = GNUNET_malloc (ul_config_size);
   xconfig_size =
@@ -255,7 +267,7 @@ tokenizer_cb (void *cls, void *client,
                                sizeof (struct GNUNET_TESTBED_HelperInit));
   if (Z_OK !=
       uncompress ((Bytef *) config, &ul_config_size,
-                  (const Bytef *) (controller + cname_size + 1),
+                  (const Bytef *) (controller + cname_size + 1 + hostname_size),
                   (uLongf) xconfig_size))
   {
     LOG (GNUNET_ERROR_TYPE_WARNING,
@@ -273,7 +285,17 @@ tokenizer_cb (void *cls, void *client,
     goto error;
   }
   GNUNET_free (config);
-  test_system = GNUNET_TESTING_system_create ("testbed-helper", controller);
+  hostname = NULL;
+  if (0 != hostname_size)
+  {
+    hostname = GNUNET_malloc (hostname_size + 1);
+    (void) strncpy (hostname, ((char *) &msg[1]) + cname_size + 1, hostname_size);
+    hostname[hostname_size] = '\0';
+  }
+  test_system = GNUNET_TESTING_system_create ("testbed-helper", controller,
+                                              hostname);
+  GNUNET_free_non_null (hostname);
+  hostname = NULL;
   GNUNET_assert (NULL != test_system);
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_TESTING_configuration_create (test_system, cfg));
diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index c4a30f12c..0736f5997 100644
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -538,6 +538,11 @@ struct LinkControllersContext
  */
 static struct Context *master_context;
 
+/**
+ * Our hostname; we give this to all the peers we start
+ */
+static char *hostname;
+
 /***********/
 /* Handles */
 /***********/
@@ -1237,7 +1242,7 @@ handle_init (void *cls, struct GNUNET_SERVER_Client *client,
   master_context->master_ip = GNUNET_strdup (controller_hostname);
   LOG_DEBUG ("Master Controller IP: %s\n", master_context->master_ip);
   master_context->system =
-      GNUNET_TESTING_system_create ("testbed", master_context->master_ip);
+      GNUNET_TESTING_system_create ("testbed", master_context->master_ip, hostname);
   host =
       GNUNET_TESTBED_host_create_with_id (master_context->host_id, NULL, NULL,
                                           0);
@@ -2832,6 +2837,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_free (master_context);
     master_context = NULL;
   }
+  GNUNET_free_non_null (hostname);
 }
 
 
@@ -2896,6 +2902,8 @@ testbed_run (void *cls, struct GNUNET_SERVER_Handle *server,
     {NULL}
   };
 
+  GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string 
+                 (cfg, "testbed", "HOSTNAME", &hostname));
   GNUNET_SERVER_add_handlers (server, message_handlers);
   GNUNET_SERVER_disconnect_notify (server, &client_disconnect_cb, NULL);
   ss_map = GNUNET_CONTAINER_multihashmap_create (5);
diff --git a/src/testbed/test_gnunet_helper_testbed.c b/src/testbed/test_gnunet_helper_testbed.c
index 7fce9a5d8..db889c1ec 100644
--- a/src/testbed/test_gnunet_helper_testbed.c
+++ b/src/testbed/test_gnunet_helper_testbed.c
@@ -212,7 +212,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                            &mst_cb, &exp_cb, NULL);
   GNUNET_assert (NULL != helper);
   cfg = GNUNET_CONFIGURATION_dup (cfg2);
-  msg = GNUNET_TESTBED_create_helper_init_msg_ (controller_name, cfg);
+  msg = GNUNET_TESTBED_create_helper_init_msg_ (controller_name, NULL, cfg);
   shandle =
       GNUNET_HELPER_send (helper, &msg->header, GNUNET_NO, &cont_cb, NULL);
   GNUNET_assert (NULL != shandle);
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index 953488af1..1d99c7e3f 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -1338,10 +1338,12 @@ GNUNET_TESTBED_controller_start (const char *controller_ip,
 {
   struct GNUNET_TESTBED_ControllerProc *cp;
   struct GNUNET_TESTBED_HelperInit *msg;
+  const char *hostname;
   static char *const binary_argv[] = {
     HELPER_TESTBED_BINARY, NULL
   };
   
+  hostname = NULL;
   cp = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_ControllerProc));
   if ((NULL == host) || (0 == GNUNET_TESTBED_host_get_id_ (host)))
     cp->helper =
@@ -1352,7 +1354,6 @@ GNUNET_TESTBED_controller_start (const char *controller_ip,
     char *remote_args[8];
     unsigned int argp;
     const char *username;
-    const char *hostname;
 
     username = GNUNET_TESTBED_host_get_username_ (host);
     hostname = GNUNET_TESTBED_host_get_hostname_ (host);
@@ -1386,7 +1387,7 @@ GNUNET_TESTBED_controller_start (const char *controller_ip,
   cp->host = host;
   cp->cb = cb;
   cp->cls = cls;
-  msg = GNUNET_TESTBED_create_helper_init_msg_ (controller_ip, cfg);
+  msg = GNUNET_TESTBED_create_helper_init_msg_ (controller_ip, hostname, cfg);
   cp->msg = &msg->header;
   cp->shandle =
       GNUNET_HELPER_send (cp->helper, &msg->header, GNUNET_NO, &clear_msg, cp);
@@ -1915,12 +1916,14 @@ GNUNET_TESTBED_overlay_write_topology_to_file (struct GNUNET_TESTBED_Controller
  * want to use this in testing
  *
  * @param cname the ip address of the controlling host
+ * @param hostname the hostname of the destination this message is intended for
  * @param cfg the configuration that has to used to start the testbed service
  *          thru helper
  * @return the initialization message
  */
 struct GNUNET_TESTBED_HelperInit *
 GNUNET_TESTBED_create_helper_init_msg_ (const char *cname,
+                                        const char *hostname,
                                         const struct GNUNET_CONFIGURATION_Handle
                                         *cfg)
 {
@@ -1930,6 +1933,7 @@ GNUNET_TESTBED_create_helper_init_msg_ (const char *cname,
   size_t config_size;
   size_t xconfig_size;
   uint16_t cname_len;
+  uint16_t hostname_len;
   uint16_t msg_size;
 
   config = GNUNET_CONFIGURATION_serialize (cfg, &config_size);
@@ -1938,15 +1942,22 @@ GNUNET_TESTBED_create_helper_init_msg_ (const char *cname,
       GNUNET_TESTBED_compress_config_ (config, config_size, &xconfig);
   GNUNET_free (config);
   cname_len = strlen (cname);
+  hostname_len = (NULL == hostname) ? 0 : strlen (hostname);
   msg_size =
       xconfig_size + cname_len + 1 + sizeof (struct GNUNET_TESTBED_HelperInit);
+  msg_size += hostname_len;
   msg = GNUNET_realloc (xconfig, msg_size);
-  (void) memmove (((void *) &msg[1]) + cname_len + 1, msg, xconfig_size);
+  (void) memmove (((void *) &msg[1]) + cname_len + 1 + hostname_len,
+                  msg,
+                  xconfig_size);
   msg->header.size = htons (msg_size);
   msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_HELPER_INIT);
   msg->cname_size = htons (cname_len);
+  msg->hostname_size = htons (hostname_len);
   msg->config_size = htons (config_size);
   (void) strcpy ((char *) &msg[1], cname);
+  if (0 != hostname_len)
+    (void) strncpy (((char *) &msg[1]) + cname_len + 1, hostname, hostname_len);
   return msg;
 }
 
diff --git a/src/testbed/testbed_api.h b/src/testbed/testbed_api.h
index c464b0ad5..020d951a2 100644
--- a/src/testbed/testbed_api.h
+++ b/src/testbed/testbed_api.h
@@ -356,12 +356,14 @@ GNUNET_TESTBED_operation_add_ (struct GNUNET_TESTBED_Operation *op);
  * Creates a helper initialization message. Only for testing.
  *
  * @param cname the ip address of the controlling host
+ * @param hostname the hostname of the destination this message is intended for
  * @param cfg the configuration that has to used to start the testbed service
  *          thru helper
  * @return the initialization message
  */
 struct GNUNET_TESTBED_HelperInit *
 GNUNET_TESTBED_create_helper_init_msg_ (const char *cname,
+                                        const char *hostname,
                                         const struct GNUNET_CONFIGURATION_Handle
                                         *cfg);
 
diff --git a/src/testbed/testbed_helper.h b/src/testbed/testbed_helper.h
index aee2c5b47..8a3ea55e0 100644
--- a/src/testbed/testbed_helper.h
+++ b/src/testbed/testbed_helper.h
@@ -28,6 +28,8 @@
 #ifndef TESTBED_HELPER_H
 #define TESTBED_HELPER_H
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
  * Initialization message for gnunet-helper-testbed to start testbed service
  */
@@ -45,12 +47,21 @@ struct GNUNET_TESTBED_HelperInit
   uint16_t cname_size GNUNET_PACKED;
 
   /**
+   * The hostname size excluding the NULL termination character - strlen
+   * (hostname); cannot be zero
+   */
+  uint16_t hostname_size GNUNET_PACKED;
+
+  /**
    * The size of the uncompressed configuration
    */
   uint16_t config_size GNUNET_PACKED;
 
   /* Followed by NULL terminated controller hostname */
 
+  /* 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 when un-compressed */
 };
@@ -74,6 +85,8 @@ struct GNUNET_TESTBED_HelperReply
    * un-compressed */
 };
 
+GNUNET_NETWORK_STRUCT_END
+
 #endif
 
 /* end of testbed_helper.h */