controller hostname in init

3 files changed, 35 insertions, 30 deletions

diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index ff19250aa..c9781ba4e 100644
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -935,8 +935,8 @@ handle_init (void *cls,
 {
   const struct GNUNET_TESTBED_InitMessage *msg;
   struct GNUNET_TESTBED_Host *host;
-  void *addr;
-  size_t addrlen;
+  const char *controller_hostname;
+  uint16_t msize;
 
   if (NULL != master_context)
   {
@@ -944,29 +944,26 @@ handle_init (void *cls,
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
-  msg = (const struct GNUNET_TESTBED_InitMessage *) message;  
+  msg = (const struct GNUNET_TESTBED_InitMessage *) message;
+  msize = ntohs (message->size);
+  if (msize <= sizeof (struct GNUNET_TESTBED_InitMessage))
+  {
+    GNUNET_break (0);
+    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+    return;
+  }
+  msize -= sizeof (struct GNUNET_TESTBED_InitMessage);  
+  controller_hostname = (const char *) &msg[1];
+  if ('\0' != controller_hostname[msize - 1])
+  {
+    GNUNET_break (0);
+    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+    return;
+  }    
   master_context = GNUNET_malloc (sizeof (struct Context));
   master_context->client = client;
   master_context->host_id = ntohl (msg->host_id);
-  GNUNET_assert (GNUNET_OK == 
-                 GNUNET_SERVER_client_get_address (client, &addr, &addrlen));
-  master_context->master_ip = GNUNET_malloc (NI_MAXHOST);
-  if (0 != getnameinfo (addr, addrlen, master_context->master_ip, NI_MAXHOST,
-                        NULL, 0, NI_NUMERICHOST))
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         "Cannot determine the ip of master controller: %s\n", STRERROR (errno));
-    GNUNET_free (addr);
-    GNUNET_free (master_context->master_ip);
-    GNUNET_assert (0);
-  }
-  GNUNET_free (addr);
-  if (0 == strcasecmp (master_context->master_ip, "localhost"))
-  {                             /* Hack for connections via unix sockets */
-    LOG_DEBUG ("May be using local sockets - assuming loopback for master ip\n");
-    GNUNET_free (master_context->master_ip);
-    master_context->master_ip = strdup ("127.0.0.1");
-  }
+  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);
@@ -2031,8 +2028,7 @@ testbed_run (void *cls,
 {
   static const struct GNUNET_SERVER_MessageHandler message_handlers[] =
     {
-      {&handle_init, NULL, GNUNET_MESSAGE_TYPE_TESTBED_INIT,
-       sizeof (struct GNUNET_TESTBED_InitMessage)},
+      {&handle_init, NULL, GNUNET_MESSAGE_TYPE_TESTBED_INIT, 0},
       {&handle_add_host, NULL, GNUNET_MESSAGE_TYPE_TESTBED_ADDHOST, 0},
       {&handle_configure_shared_service, NULL,
        GNUNET_MESSAGE_TYPE_TESTBED_SERVICESHARE, 0},
diff --git a/src/testbed/testbed.h b/src/testbed/testbed.h
index d4d081b08..d0f2accb4 100644
--- a/src/testbed/testbed.h
+++ b/src/testbed/testbed.h
@@ -54,6 +54,8 @@ struct GNUNET_TESTBED_InitMessage
    * is interested in.  In NBO.
    */
   uint64_t event_mask GNUNET_PACKED;
+
+  /* Followed by 0-terminated hostname of the controller */
 };
 
 
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index 2269db8e7..7f1c292be 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -997,6 +997,7 @@ GNUNET_TESTBED_controller_connect (const struct GNUNET_CONFIGURATION_Handle *cfg
 {
   struct GNUNET_TESTBED_Controller *controller;
   struct GNUNET_TESTBED_InitMessage *msg;
+  const char *controller_hostname;
   unsigned long long max_parallel_peer_create;
 
   if (GNUNET_OK !=
@@ -1021,7 +1022,7 @@ GNUNET_TESTBED_controller_connect (const struct GNUNET_CONFIGURATION_Handle *cfg
   if (NULL == host)
   {
     host = GNUNET_TESTBED_host_create_by_id_ (0);
-    if (NULL == host)
+    if (NULL == host)           /* If the above host create fails */
     {
       LOG (GNUNET_ERROR_TYPE_WARNING,
            "Treating NULL host as localhost. Multiple references to localhost "
@@ -1037,14 +1038,19 @@ GNUNET_TESTBED_controller_connect (const struct GNUNET_CONFIGURATION_Handle *cfg
   controller->opq_peer_create =
     GNUNET_TESTBED_operation_queue_create_ ((unsigned int)
                                             max_parallel_peer_create);
-  msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_InitMessage));
+  controller_hostname = GNUNET_TESTBED_host_get_hostname_ (host);
+  if (NULL == controller_hostname)
+    controller_hostname = "127.0.0.1";
+  msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_InitMessage)
+                       + strlen (controller_hostname) + 1);
   msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_INIT);
-  msg->header.size = htons (sizeof (struct GNUNET_TESTBED_InitMessage));
+  msg->header.size = htons (sizeof (struct GNUNET_TESTBED_InitMessage)
+                            + strlen (controller_hostname) + 1);
   msg->host_id = htonl (GNUNET_TESTBED_host_get_id_ (host));
   msg->event_mask = GNUNET_htonll (controller->event_mask);
+  strcpy ((char *) &msg[1], controller_hostname);
   GNUNET_TESTBED_queue_message_ (controller, (struct GNUNET_MessageHeader *)
-                                 msg);
-  
+                                 msg);  
   return controller;
 }
 
@@ -1342,7 +1348,8 @@ GNUNET_TESTBED_overlay_write_topology_to_file (struct GNUNET_TESTBED_Controller
 
 
 /**
- * Creates a helper initialization message. Only for testing.
+ * Creates a helper initialization message. This function is here because we
+ * want to use this in testing
  *
  * @param cname the ip address of the controlling host
  * @param cfg the configuration that has to used to start the testbed service