[GNUnet-SVN] r23990 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2012-09-25 14:09:42 +0200 (Tue, 25 Sep 2012)
New Revision: 23990

Modified:
   gnunet/src/testbed/gnunet-service-testbed.c
   gnunet/src/testbed/testbed.h
   gnunet/src/testbed/testbed_api_peers.c
Log:
added peer2_host field in overlay connect message

Modified: gnunet/src/testbed/gnunet-service-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed.c 2012-09-25 11:44:58 UTC (rev 
23989)
+++ gnunet/src/testbed/gnunet-service-testbed.c 2012-09-25 12:09:42 UTC (rev 
23990)
@@ -1400,7 +1400,8 @@
   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;
   }

Modified: gnunet/src/testbed/testbed.h
===================================================================
--- gnunet/src/testbed/testbed.h        2012-09-25 11:44:58 UTC (rev 23989)
+++ gnunet/src/testbed/testbed.h        2012-09-25 12:09:42 UTC (rev 23990)
@@ -397,6 +397,11 @@
    */
   uint32_t peer2 GNUNET_PACKED;
 
+  /**
+   * The ID of the host which runs peer2
+   */
+  uint32_t peer2_host_id GNUNET_PACKED;
+
 };
 
 

Modified: gnunet/src/testbed/testbed_api_peers.c
===================================================================
--- gnunet/src/testbed/testbed_api_peers.c      2012-09-25 11:44:58 UTC (rev 
23989)
+++ gnunet/src/testbed/testbed_api_peers.c      2012-09-25 12:09:42 UTC (rev 
23990)
@@ -341,6 +341,7 @@
   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);
 }