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

[gnunet]

Author: harsha
Date: 2012-10-20 11:31:31 +0200 (Sat, 20 Oct 2012)
New Revision: 24436

Modified:
   gnunet/src/testbed/testbed_api.c
   gnunet/src/testbed/testbed_api.h
   gnunet/src/testbed/testbed_api_topology.c
Log:
removed duplicate definition

Modified: gnunet/src/testbed/testbed_api.c
===================================================================
--- gnunet/src/testbed/testbed_api.c    2012-10-19 20:19:09 UTC (rev 24435)
+++ gnunet/src/testbed/testbed_api.c    2012-10-20 09:31:31 UTC (rev 24436)
@@ -2232,21 +2232,7 @@
 void
 GNUNET_TESTBED_operation_done (struct GNUNET_TESTBED_Operation *operation)
 {
-  switch (operation->type)
-  {
-  case OP_PEER_CREATE:
-  case OP_PEER_DESTROY:
-  case OP_PEER_START:
-  case OP_PEER_STOP:
-  case OP_PEER_INFO:
-  case OP_OVERLAY_CONNECT:
-  case OP_LINK_CONTROLLERS:
     GNUNET_TESTBED_operation_release_ (operation);
-    return;
-  default:
-    GNUNET_assert (0);
-    break;
-  }
 }
 
 

Modified: gnunet/src/testbed/testbed_api.h
===================================================================
--- gnunet/src/testbed/testbed_api.h    2012-10-19 20:19:09 UTC (rev 24435)
+++ gnunet/src/testbed/testbed_api.h    2012-10-20 09:31:31 UTC (rev 24436)
@@ -84,43 +84,6 @@
 
 
 /**
- * Testbed operation structure
- */
-struct GNUNET_TESTBED_Operation
-{
-  /**
-   * next pointer for DLL
-   */
-  struct GNUNET_TESTBED_Operation *next;
-
-  /**
-   * prev pointer for DLL
-   */
-  struct GNUNET_TESTBED_Operation *prev;
-
-  /**
-   * The controller on which this operation operates
-   */
-  struct GNUNET_TESTBED_Controller *controller;
-
-  /**
-   * The ID for the operation;
-   */
-  uint64_t operation_id;
-
-  /**
-   * The type of operation
-   */
-  enum OperationType type;
-
-  /**
-   * Data specific to OperationType
-   */
-  void *data;
-};
-
-
-/**
  * The message queue for sending messages to the controller service
  */
 struct MessageQueue;

Modified: gnunet/src/testbed/testbed_api_topology.c
===================================================================
--- gnunet/src/testbed/testbed_api_topology.c   2012-10-19 20:19:09 UTC (rev 
24435)
+++ gnunet/src/testbed/testbed_api_topology.c   2012-10-20 09:31:31 UTC (rev 
24436)
@@ -269,6 +269,7 @@
     {
       tc->link_array[cnt-1].A = cnt-1;
       tc->link_array[cnt-1].B = cnt;
+      tc->link_array[cnt-1].tc = tc;
     }
     break;
   case GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI: