added peer2_host field in overlay connect message

3 files changed, 8 insertions, 1 deletions

diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index c48a1e27f..6edf8d897 100644
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -1400,7 +1400,8 @@ handle_link_controllers (void *cls, struct GNUNET_SERVER_Client *client,
   if ((delegated_host_id >= host_list_size) ||
       (NULL == host_list[delegated_host_id]))
   {
-    LOG (GNUNET_ERROR_TYPE_WARNING, "Delegated host not registered with us\n");
+    LOG (GNUNET_ERROR_TYPE_WARNING,
+         "Delegated host %u not registered with us\n", delegated_host_id);
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
diff --git a/src/testbed/testbed.h b/src/testbed/testbed.h
index 24183e8d8..27c8e3b93 100644
--- a/src/testbed/testbed.h
+++ b/src/testbed/testbed.h
@@ -397,6 +397,11 @@ struct GNUNET_TESTBED_OverlayConnectMessage
    */
   uint32_t peer2 GNUNET_PACKED;
 
+  /**
+   * The ID of the host which runs peer2
+   */
+  uint32_t peer2_host_id GNUNET_PACKED;
+
 };
 
 
diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c
index 65d4ffbd9..9b35209ca 100644
--- a/src/testbed/testbed_api_peers.c
+++ b/src/testbed/testbed_api_peers.c
@@ -341,6 +341,7 @@ opstart_overlay_connect (void *cls)
   msg->peer1 = htonl (data->p1->unique_id);
   msg->peer2 = htonl (data->p2->unique_id);
   msg->operation_id = GNUNET_htonll (opc->id);
+  msg->peer2_host_id = htonl (GNUNET_TESTBED_host_get_id_ (data->p2->host));
   GNUNET_CONTAINER_DLL_insert_tail (opc->c->ocq_head, opc->c->ocq_tail, opc);
   GNUNET_TESTBED_queue_message_ (opc->c, &msg->header);
 }