aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/test_testbed_api_test.c
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2013-01-25 15:28:08 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2013-01-25 15:28:08 +0000
commit30c5c323f28ade8a1e7c6c593778793e44accb3a (patch)
tree845955ec895d221338b44f0cadce7932932e78cc /src/testbed/test_testbed_api_test.c
parent43d558efd13a3245e65efd0acdc9c4ba59cd2bee (diff)
downloadgnunet-30c5c323f28ade8a1e7c6c593778793e44accb3a.tar.gz
gnunet-30c5c323f28ade8a1e7c6c593778793e44accb3a.zip
- indent
Diffstat (limited to 'src/testbed/test_testbed_api_test.c')
-rw-r--r--src/testbed/test_testbed_api_test.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/testbed/test_testbed_api_test.c b/src/testbed/test_testbed_api_test.c
index e4cee9ab0..705f52fa3 100644
--- a/src/testbed/test_testbed_api_test.c
+++ b/src/testbed/test_testbed_api_test.c
@@ -74,7 +74,7 @@ static int result;
74 */ 74 */
75static void 75static void
76do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 76do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
77{ 77{
78 shutdown_task = GNUNET_SCHEDULER_NO_TASK; 78 shutdown_task = GNUNET_SCHEDULER_NO_TASK;
79 if (GNUNET_SCHEDULER_NO_TASK != abort_task) 79 if (GNUNET_SCHEDULER_NO_TASK != abort_task)
80 GNUNET_SCHEDULER_cancel (abort_task); 80 GNUNET_SCHEDULER_cancel (abort_task);
@@ -111,7 +111,7 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
111 LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); 111 LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n");
112 abort_task = GNUNET_SCHEDULER_NO_TASK; 112 abort_task = GNUNET_SCHEDULER_NO_TASK;
113 if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) 113 if (GNUNET_SCHEDULER_NO_TASK != shutdown_task)
114 GNUNET_SCHEDULER_cancel (shutdown_task); 114 GNUNET_SCHEDULER_cancel (shutdown_task);
115 shutdown_task = GNUNET_SCHEDULER_add_now (do_shutdown, NULL); 115 shutdown_task = GNUNET_SCHEDULER_add_now (do_shutdown, NULL);
116} 116}
117 117
@@ -125,10 +125,10 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
125 * @param emsg error message if the operation has failed; will be NULL if the 125 * @param emsg error message if the operation has failed; will be NULL if the
126 * operation is successfull 126 * operation is successfull
127 */ 127 */
128static void 128static void
129peerinfo_cb (void *cb_cls, struct GNUNET_TESTBED_Operation *op_, 129peerinfo_cb (void *cb_cls, struct GNUNET_TESTBED_Operation *op_,
130 const struct GNUNET_TESTBED_PeerInformation *pinfo, 130 const struct GNUNET_TESTBED_PeerInformation *pinfo,
131 const char *emsg) 131 const char *emsg)
132{ 132{
133 FAIL_TEST (op == op_); 133 FAIL_TEST (op == op_);
134 FAIL_TEST (NULL == cb_cls); 134 FAIL_TEST (NULL == cb_cls);
@@ -150,7 +150,7 @@ peerinfo_cb (void *cb_cls, struct GNUNET_TESTBED_Operation *op_,
150 * @param emsg error message in case the operation has failed; will be NULL if 150 * @param emsg error message in case the operation has failed; will be NULL if
151 * operation has executed successfully. 151 * operation has executed successfully.
152 */ 152 */
153static void 153static void
154op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op_, const char *emsg) 154op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op_, const char *emsg)
155{ 155{
156 FAIL_TEST (NULL == cls); 156 FAIL_TEST (NULL == cls);
@@ -162,8 +162,8 @@ op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op_, const char *emsg)
162 } 162 }
163 GNUNET_TESTBED_operation_done (op); 163 GNUNET_TESTBED_operation_done (op);
164 op = GNUNET_TESTBED_peer_get_information (peers[0], 164 op = GNUNET_TESTBED_peer_get_information (peers[0],
165 GNUNET_TESTBED_PIT_IDENTITY, 165 GNUNET_TESTBED_PIT_IDENTITY,
166 &peerinfo_cb, NULL); 166 &peerinfo_cb, NULL);
167} 167}
168 168
169 169
@@ -181,11 +181,11 @@ controller_event_cb (void *cls,
181 { 181 {
182 case GNUNET_TESTBED_ET_CONNECT: 182 case GNUNET_TESTBED_ET_CONNECT:
183 FAIL_TEST (event->details.peer_connect.peer1 == peers[0]); 183 FAIL_TEST (event->details.peer_connect.peer1 == peers[0]);
184 FAIL_TEST (event->details.peer_connect.peer2 == peers[1]); 184 FAIL_TEST (event->details.peer_connect.peer2 == peers[1]);
185 break; 185 break;
186 default: 186 default:
187 FAIL_TEST (0); 187 FAIL_TEST (0);
188 } 188 }
189} 189}
190 190
191 191
@@ -208,7 +208,8 @@ test_master (void *cls, unsigned int num_peers,
208 for (peer = 0; peer < num_peers; peer++) 208 for (peer = 0; peer < num_peers; peer++)
209 FAIL_TEST (NULL != peers_[peer]); 209 FAIL_TEST (NULL != peers_[peer]);
210 peers = peers_; 210 peers = peers_;
211 op = GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL, peers[0], peers[1]); 211 op = GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL, peers[0],
212 peers[1]);
212 abort_task = 213 abort_task =
213 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply 214 GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
214 (GNUNET_TIME_UNIT_MINUTES, 3), &do_abort, 215 (GNUNET_TIME_UNIT_MINUTES, 3), &do_abort,
@@ -229,9 +230,8 @@ main (int argc, char **argv)
229 event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT); 230 event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
230 event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); 231 event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
231 (void) GNUNET_TESTBED_test_run ("test_testbed_api_test", 232 (void) GNUNET_TESTBED_test_run ("test_testbed_api_test",
232 "test_testbed_api.conf", 233 "test_testbed_api.conf", NUM_PEERS,
233 NUM_PEERS, event_mask, &controller_event_cb, 234 event_mask, &controller_event_cb, NULL,
234 NULL,
235 &test_master, NULL); 235 &test_master, NULL);
236 if (GNUNET_OK != result) 236 if (GNUNET_OK != result)
237 return 1; 237 return 1;