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

[gnunet]

Author: grothoff
Date: 2012-06-14 10:12:16 +0200 (Thu, 14 Jun 2012)
New Revision: 21986

Modified:
   gnunet/src/testbed/gnunet-service-testbed.c
   gnunet/src/testbed/testbed.h
   gnunet/src/testbed/testbed_api.c
Log:
-nicer name

Modified: gnunet/src/testbed/gnunet-service-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed.c 2012-06-14 08:09:25 UTC (rev 
21985)
+++ gnunet/src/testbed/gnunet-service-testbed.c 2012-06-14 08:12:16 UTC (rev 
21986)
@@ -77,7 +77,7 @@
              struct GNUNET_SERVER_Client *client,
              const struct GNUNET_MessageHeader *message)
 {
-  const struct GNUNET_TESTBED_Message *msg;
+  const struct GNUNET_TESTBED_InitMessage *msg;
 
   if (NULL != master_context)
   {
@@ -85,7 +85,7 @@
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
-  msg = (const struct GNUNET_TESTBED_Message *) message;  
+  msg = (const struct GNUNET_TESTBED_InitMessage *) message;  
   master_context = GNUNET_malloc (sizeof (struct Context));
   master_context->client = client;
   master_context->host_id = ntohl (msg->host_id);
@@ -193,7 +193,7 @@
   static const struct GNUNET_SERVER_MessageHandler message_handlers[] =
     {
       {&handle_init, NULL, GNUNET_MESSAGE_TYPE_TESTBED_INIT,
-       sizeof (struct GNUNET_TESTBED_Message)},
+       sizeof (struct GNUNET_TESTBED_InitMessage)},
       {&handle_addhost, NULL, GNUNET_MESSAGE_TYPE_TESTBED_ADDHOST, 0},
       {NULL}
     };

Modified: gnunet/src/testbed/testbed.h
===================================================================
--- gnunet/src/testbed/testbed.h        2012-06-14 08:09:25 UTC (rev 21985)
+++ gnunet/src/testbed/testbed.h        2012-06-14 08:12:16 UTC (rev 21986)
@@ -33,7 +33,7 @@
 /**
  * Initial message from a client to a testing control service.
  */
-struct GNUNET_TESTBED_Message
+struct GNUNET_TESTBED_InitMessage
 {
 
   /**

Modified: gnunet/src/testbed/testbed_api.c
===================================================================
--- gnunet/src/testbed/testbed_api.c    2012-06-14 08:09:25 UTC (rev 21985)
+++ gnunet/src/testbed/testbed_api.c    2012-06-14 08:12:16 UTC (rev 21986)
@@ -235,16 +235,16 @@
                const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_TESTBED_Controller *c = cls;
-  struct GNUNET_TESTBED_Message *msg;
+  struct GNUNET_TESTBED_InitMessage *msg;
   
   c->client = GNUNET_CLIENT_connect ("testbed", c->cfg);
   if (NULL == c->client)
     return GNUNET_SYSERR;       /* FIXME: Call controller startup_cb ? */
   GNUNET_CLIENT_receive (c->client, &message_handler, c,
                          GNUNET_TIME_UNIT_FOREVER_REL);
-  msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Message));
+  msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_InitMessage));
   msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_INIT);
-  msg->header.size = htons (sizeof (struct GNUNET_TESTBED_Message));
+  msg->header.size = htons (sizeof (struct GNUNET_TESTBED_InitMessage));
   msg->host_id = htonl (GNUNET_TESTBED_host_get_id_ (c->host));
   msg->event_mask = GNUNET_htonll (c->event_mask);
   queue_message (c, (struct GNUNET_MessageHeader *) msg);