[GNUnet-SVN] r23724 - in gnunet/src: include testbed

[gnunet]

Author: harsha
Date: 2012-09-09 15:52:13 +0200 (Sun, 09 Sep 2012)
New Revision: 23724

Modified:
   gnunet/src/include/gnunet_protocols.h
   gnunet/src/testbed/gnunet-service-testbed.c
   gnunet/src/testbed/testbed.h
   gnunet/src/testbed/testbed_api.c
   gnunet/src/testbed/testbed_api_services.c
Log:
renamed GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONEVENT to 
GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONFAILEVENT

Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h       2012-09-09 13:46:21 UTC (rev 
23723)
+++ gnunet/src/include/gnunet_protocols.h       2012-09-09 13:52:13 UTC (rev 
23724)
@@ -1503,7 +1503,7 @@
 /**
  * Message for operation events
  */
-#define GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONEVENT 474
+#define GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONFAILEVENT 474
 
 /**
  * Message to signal successful peer creation

Modified: gnunet/src/testbed/gnunet-service-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed.c 2012-09-09 13:46:21 UTC (rev 
23723)
+++ gnunet/src/testbed/gnunet-service-testbed.c 2012-09-09 13:52:13 UTC (rev 
23724)
@@ -856,7 +856,7 @@
   msize += emsg_len;
   msg = GNUNET_malloc (msize);
   msg->header.size = htons (msize);
-  msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONEVENT);
+  msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONFAILEVENT);
   msg->event_type = htonl (GNUNET_TESTBED_ET_OPERATION_FINISHED);
   msg->operation_id = GNUNET_htonll (operation_id);
   if (0 != emsg_len)

Modified: gnunet/src/testbed/testbed.h
===================================================================
--- gnunet/src/testbed/testbed.h        2012-09-09 13:46:21 UTC (rev 23723)
+++ gnunet/src/testbed/testbed.h        2012-09-09 13:52:13 UTC (rev 23724)
@@ -477,7 +477,7 @@
 {
 
   /**
-   * Type is GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONEVENT
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONFAILEVENT
    */
   struct GNUNET_MessageHeader header;
 

Modified: gnunet/src/testbed/testbed_api.c
===================================================================
--- gnunet/src/testbed/testbed_api.c    2012-09-09 13:46:21 UTC (rev 23723)
+++ gnunet/src/testbed/testbed_api.c    2012-09-09 13:52:13 UTC (rev 23724)
@@ -612,7 +612,7 @@
 
 
 /**
- * Handler for GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONEVENT message from
+ * Handler for GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONFAILEVENT message from
  * controller (testbed service)
  *
  * @param c the controller handler
@@ -757,7 +757,7 @@
                               (const struct
                                GNUNET_TESTBED_ConnectionEventMessage *) msg);
     break;
-  case GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONEVENT:
+  case GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONFAILEVENT:
     GNUNET_assert (msize >=
                    sizeof (struct 
GNUNET_TESTBED_OperationFailureEventMessage));
     status =

Modified: gnunet/src/testbed/testbed_api_services.c
===================================================================
--- gnunet/src/testbed/testbed_api_services.c   2012-09-09 13:46:21 UTC (rev 
23723)
+++ gnunet/src/testbed/testbed_api_services.c   2012-09-09 13:52:13 UTC (rev 
23724)
@@ -142,7 +142,7 @@
   uint16_t mtype;
 
   mtype = ntohs (msg->type);
-  if (GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONEVENT == mtype)
+  if (GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONFAILEVENT == mtype)
   {
     GNUNET_assert (0);                 /* FIXME: Add notification for failure 
*/
   }