From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 14 Jun 2012 08:12:16 +0000 (+0000)
Subject: -nicer name
X-Git-Tag: initial-import-from-subversion-38251~13077
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=67c53faae90324e1acbd98a91c1231eddc318d9d;p=oweals%2Fgnunet.git

-nicer name
---

diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index db8c7cff1..665af9d3a 100644
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -77,7 +77,7 @@ handle_init (void *cls,
              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 @@ handle_init (void *cls,
     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 @@ testbed_run (void *cls,
   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}
     };
diff --git a/src/testbed/testbed.h b/src/testbed/testbed.h
index 3c096399a..680649be1 100644
--- a/src/testbed/testbed.h
+++ b/src/testbed/testbed.h
@@ -33,7 +33,7 @@
 /**
  * Initial message from a client to a testing control service.
  */
-struct GNUNET_TESTBED_Message
+struct GNUNET_TESTBED_InitMessage
 {
 
   /**
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index cc4bbbe25..5d34640fa 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -235,16 +235,16 @@ server_mst_cb (void *cls, void *client,
                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);