aboutsummaryrefslogtreecommitdiff
path: root/src/testbed/testbed_api_peers.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/testbed_api_peers.c
parent43d558efd13a3245e65efd0acdc9c4ba59cd2bee (diff)
downloadgnunet-30c5c323f28ade8a1e7c6c593778793e44accb3a.tar.gz
gnunet-30c5c323f28ade8a1e7c6c593778793e44accb3a.zip
- indent
Diffstat (limited to 'src/testbed/testbed_api_peers.c')
-rw-r--r--src/testbed/testbed_api_peers.c36
1 files changed, 16 insertions, 20 deletions
diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c
index 1c0e87557..9105793f1 100644
--- a/src/testbed/testbed_api_peers.c
+++ b/src/testbed/testbed_api_peers.c
@@ -378,8 +378,8 @@ oprelease_overlay_connect (void *cls)
378 break; 378 break;
379 case OPC_STATE_FINISHED: 379 case OPC_STATE_FINISHED:
380 duration = GNUNET_TIME_absolute_get_duration (data->tstart); 380 duration = GNUNET_TIME_absolute_get_duration (data->tstart);
381 GNUNET_TESTBED_update_time_slot_ (opc->c, data->tslot_index, 381 GNUNET_TESTBED_update_time_slot_ (opc->c, data->tslot_index, data, duration,
382 data, duration, data->failed); 382 data->failed);
383 } 383 }
384 GNUNET_free (data); 384 GNUNET_free (data);
385 GNUNET_free (opc); 385 GNUNET_free (opc);
@@ -435,7 +435,7 @@ GNUNET_TESTBED_peer_create (struct GNUNET_TESTBED_Controller *controller,
435 const struct GNUNET_CONFIGURATION_Handle *cfg, 435 const struct GNUNET_CONFIGURATION_Handle *cfg,
436 GNUNET_TESTBED_PeerCreateCallback cb, void *cls) 436 GNUNET_TESTBED_PeerCreateCallback cb, void *cls)
437{ 437{
438 438
439 struct GNUNET_TESTBED_Peer *peer; 439 struct GNUNET_TESTBED_Peer *peer;
440 struct PeerCreateData *data; 440 struct PeerCreateData *data;
441 struct OperationContext *opc; 441 struct OperationContext *opc;
@@ -478,14 +478,12 @@ GNUNET_TESTBED_peer_create (struct GNUNET_TESTBED_Controller *controller,
478 * @return handle to the operation 478 * @return handle to the operation
479 */ 479 */
480struct GNUNET_TESTBED_Operation * 480struct GNUNET_TESTBED_Operation *
481GNUNET_TESTBED_peer_start (void *op_cls, 481GNUNET_TESTBED_peer_start (void *op_cls, struct GNUNET_TESTBED_Peer *peer,
482 struct GNUNET_TESTBED_Peer *peer, 482 GNUNET_TESTBED_PeerChurnCallback pcc, void *pcc_cls)
483 GNUNET_TESTBED_PeerChurnCallback pcc,
484 void *pcc_cls)
485{ 483{
486 struct OperationContext *opc; 484 struct OperationContext *opc;
487 struct PeerEventData *data; 485 struct PeerEventData *data;
488 486
489 data = GNUNET_malloc (sizeof (struct PeerEventData)); 487 data = GNUNET_malloc (sizeof (struct PeerEventData));
490 data->peer = peer; 488 data->peer = peer;
491 data->pcc = pcc; 489 data->pcc = pcc;
@@ -518,12 +516,11 @@ GNUNET_TESTBED_peer_start (void *op_cls,
518 */ 516 */
519struct GNUNET_TESTBED_Operation * 517struct GNUNET_TESTBED_Operation *
520GNUNET_TESTBED_peer_stop (struct GNUNET_TESTBED_Peer *peer, 518GNUNET_TESTBED_peer_stop (struct GNUNET_TESTBED_Peer *peer,
521 GNUNET_TESTBED_PeerChurnCallback pcc, 519 GNUNET_TESTBED_PeerChurnCallback pcc, void *pcc_cls)
522 void *pcc_cls)
523{ 520{
524 struct OperationContext *opc; 521 struct OperationContext *opc;
525 struct PeerEventData *data; 522 struct PeerEventData *data;
526 523
527 data = GNUNET_malloc (sizeof (struct PeerEventData)); 524 data = GNUNET_malloc (sizeof (struct PeerEventData));
528 data->peer = peer; 525 data->peer = peer;
529 data->pcc = pcc; 526 data->pcc = pcc;
@@ -558,10 +555,9 @@ GNUNET_TESTBED_peer_stop (struct GNUNET_TESTBED_Peer *peer,
558 */ 555 */
559struct GNUNET_TESTBED_Operation * 556struct GNUNET_TESTBED_Operation *
560GNUNET_TESTBED_peer_get_information (struct GNUNET_TESTBED_Peer *peer, 557GNUNET_TESTBED_peer_get_information (struct GNUNET_TESTBED_Peer *peer,
561 enum GNUNET_TESTBED_PeerInformationType 558 enum GNUNET_TESTBED_PeerInformationType
562 pit, 559 pit, GNUNET_TESTBED_PeerInfoCallback cb,
563 GNUNET_TESTBED_PeerInfoCallback cb, 560 void *cb_cls)
564 void *cb_cls)
565{ 561{
566 struct OperationContext *opc; 562 struct OperationContext *opc;
567 struct PeerInfoData *data; 563 struct PeerInfoData *data;
@@ -676,9 +672,8 @@ GNUNET_TESTBED_underlay_configure_link (void *op_cls,
676struct GNUNET_TESTBED_Operation * 672struct GNUNET_TESTBED_Operation *
677GNUNET_TESTBED_overlay_connect (void *op_cls, 673GNUNET_TESTBED_overlay_connect (void *op_cls,
678 GNUNET_TESTBED_OperationCompletionCallback cb, 674 GNUNET_TESTBED_OperationCompletionCallback cb,
679 void *cb_cls, 675 void *cb_cls, struct GNUNET_TESTBED_Peer *p1,
680 struct GNUNET_TESTBED_Peer *p1, 676 struct GNUNET_TESTBED_Peer *p2)
681 struct GNUNET_TESTBED_Peer *p2)
682{ 677{
683 struct OperationContext *opc; 678 struct OperationContext *opc;
684 struct OverlayConnectData *data; 679 struct OverlayConnectData *data;
@@ -698,8 +693,9 @@ GNUNET_TESTBED_overlay_connect (void *op_cls,
698 opc->op = 693 opc->op =
699 GNUNET_TESTBED_operation_create_ (opc, &opstart_overlay_connect, 694 GNUNET_TESTBED_operation_create_ (opc, &opstart_overlay_connect,
700 &oprelease_overlay_connect); 695 &oprelease_overlay_connect);
701 GNUNET_TESTBED_operation_queue_insert_ 696 GNUNET_TESTBED_operation_queue_insert_ (opc->
702 (opc->c->opq_parallel_overlay_connect_operations, opc->op); 697 c->opq_parallel_overlay_connect_operations,
698 opc->op);
703 GNUNET_TESTBED_operation_begin_wait_ (opc->op); 699 GNUNET_TESTBED_operation_begin_wait_ (opc->op);
704 return opc->op; 700 return opc->op;
705} 701}