diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2012-10-20 09:31:31 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2012-10-20 09:31:31 +0000 |
commit | 2d428fd66f0b9aef8182f3fc16471280902f7383 (patch) | |
tree | a123e2c2765b28b2158dfc484da7015ab43ff2fb /src | |
parent | 07b49ea52c868ec2e357f543c4865913c0946d33 (diff) | |
download | gnunet-2d428fd66f0b9aef8182f3fc16471280902f7383.tar.gz gnunet-2d428fd66f0b9aef8182f3fc16471280902f7383.zip |
removed duplicate definition
Diffstat (limited to 'src')
-rw-r--r-- | src/testbed/testbed_api.c | 14 | ||||
-rw-r--r-- | src/testbed/testbed_api.h | 37 | ||||
-rw-r--r-- | src/testbed/testbed_api_topology.c | 1 |
3 files changed, 1 insertions, 51 deletions
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index ebb9496f2..fdb0b406f 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c | |||
@@ -2232,21 +2232,7 @@ GNUNET_TESTBED_operation_cancel (struct GNUNET_TESTBED_Operation *operation) | |||
2232 | void | 2232 | void |
2233 | GNUNET_TESTBED_operation_done (struct GNUNET_TESTBED_Operation *operation) | 2233 | GNUNET_TESTBED_operation_done (struct GNUNET_TESTBED_Operation *operation) |
2234 | { | 2234 | { |
2235 | switch (operation->type) | ||
2236 | { | ||
2237 | case OP_PEER_CREATE: | ||
2238 | case OP_PEER_DESTROY: | ||
2239 | case OP_PEER_START: | ||
2240 | case OP_PEER_STOP: | ||
2241 | case OP_PEER_INFO: | ||
2242 | case OP_OVERLAY_CONNECT: | ||
2243 | case OP_LINK_CONTROLLERS: | ||
2244 | GNUNET_TESTBED_operation_release_ (operation); | 2235 | GNUNET_TESTBED_operation_release_ (operation); |
2245 | return; | ||
2246 | default: | ||
2247 | GNUNET_assert (0); | ||
2248 | break; | ||
2249 | } | ||
2250 | } | 2236 | } |
2251 | 2237 | ||
2252 | 2238 | ||
diff --git a/src/testbed/testbed_api.h b/src/testbed/testbed_api.h index 7b92ff51b..ba9ee0dcf 100644 --- a/src/testbed/testbed_api.h +++ b/src/testbed/testbed_api.h | |||
@@ -84,43 +84,6 @@ enum OperationType | |||
84 | 84 | ||
85 | 85 | ||
86 | /** | 86 | /** |
87 | * Testbed operation structure | ||
88 | */ | ||
89 | struct GNUNET_TESTBED_Operation | ||
90 | { | ||
91 | /** | ||
92 | * next pointer for DLL | ||
93 | */ | ||
94 | struct GNUNET_TESTBED_Operation *next; | ||
95 | |||
96 | /** | ||
97 | * prev pointer for DLL | ||
98 | */ | ||
99 | struct GNUNET_TESTBED_Operation *prev; | ||
100 | |||
101 | /** | ||
102 | * The controller on which this operation operates | ||
103 | */ | ||
104 | struct GNUNET_TESTBED_Controller *controller; | ||
105 | |||
106 | /** | ||
107 | * The ID for the operation; | ||
108 | */ | ||
109 | uint64_t operation_id; | ||
110 | |||
111 | /** | ||
112 | * The type of operation | ||
113 | */ | ||
114 | enum OperationType type; | ||
115 | |||
116 | /** | ||
117 | * Data specific to OperationType | ||
118 | */ | ||
119 | void *data; | ||
120 | }; | ||
121 | |||
122 | |||
123 | /** | ||
124 | * The message queue for sending messages to the controller service | 87 | * The message queue for sending messages to the controller service |
125 | */ | 88 | */ |
126 | struct MessageQueue; | 89 | struct MessageQueue; |
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c index adef374db..bc766dedb 100644 --- a/src/testbed/testbed_api_topology.c +++ b/src/testbed/testbed_api_topology.c | |||
@@ -269,6 +269,7 @@ GNUNET_TESTBED_overlay_configure_topology_va (void *op_cls, | |||
269 | { | 269 | { |
270 | tc->link_array[cnt-1].A = cnt-1; | 270 | tc->link_array[cnt-1].A = cnt-1; |
271 | tc->link_array[cnt-1].B = cnt; | 271 | tc->link_array[cnt-1].B = cnt; |
272 | tc->link_array[cnt-1].tc = tc; | ||
272 | } | 273 | } |
273 | break; | 274 | break; |
274 | case GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI: | 275 | case GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI: |