diff options
Diffstat (limited to 'src/testbed/testbed_api_peers.c')
-rw-r--r-- | src/testbed/testbed_api_peers.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c index 5d55e3ef6..a8a87c057 100644 --- a/src/testbed/testbed_api_peers.c +++ b/src/testbed/testbed_api_peers.c | |||
@@ -167,7 +167,7 @@ opstart_peer_destroy (void *cls) | |||
167 | GNUNET_assert (OP_PEER_DESTROY == opc->type); | 167 | GNUNET_assert (OP_PEER_DESTROY == opc->type); |
168 | GNUNET_assert (NULL != peer); | 168 | GNUNET_assert (NULL != peer); |
169 | opc->state = OPC_STATE_STARTED; | 169 | opc->state = OPC_STATE_STARTED; |
170 | msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerDestroyMessage)); | 170 | msg = GNUNET_new (struct GNUNET_TESTBED_PeerDestroyMessage); |
171 | msg->header.size = htons (sizeof (struct GNUNET_TESTBED_PeerDestroyMessage)); | 171 | msg->header.size = htons (sizeof (struct GNUNET_TESTBED_PeerDestroyMessage)); |
172 | msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_DESTROY_PEER); | 172 | msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_DESTROY_PEER); |
173 | msg->peer_id = htonl (peer->unique_id); | 173 | msg->peer_id = htonl (peer->unique_id); |
@@ -219,7 +219,7 @@ opstart_peer_start (void *cls) | |||
219 | GNUNET_assert (NULL != (peer = data->peer)); | 219 | GNUNET_assert (NULL != (peer = data->peer)); |
220 | GNUNET_assert ((TESTBED_PS_CREATED == peer->state) || (TESTBED_PS_STOPPED == peer->state)); | 220 | GNUNET_assert ((TESTBED_PS_CREATED == peer->state) || (TESTBED_PS_STOPPED == peer->state)); |
221 | opc->state = OPC_STATE_STARTED; | 221 | opc->state = OPC_STATE_STARTED; |
222 | msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerStartMessage)); | 222 | msg = GNUNET_new (struct GNUNET_TESTBED_PeerStartMessage); |
223 | msg->header.size = htons (sizeof (struct GNUNET_TESTBED_PeerStartMessage)); | 223 | msg->header.size = htons (sizeof (struct GNUNET_TESTBED_PeerStartMessage)); |
224 | msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_START_PEER); | 224 | msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_START_PEER); |
225 | msg->peer_id = htonl (peer->unique_id); | 225 | msg->peer_id = htonl (peer->unique_id); |
@@ -271,7 +271,7 @@ opstart_peer_stop (void *cls) | |||
271 | GNUNET_assert (NULL != (peer = data->peer)); | 271 | GNUNET_assert (NULL != (peer = data->peer)); |
272 | GNUNET_assert (TESTBED_PS_STARTED == peer->state); | 272 | GNUNET_assert (TESTBED_PS_STARTED == peer->state); |
273 | opc->state = OPC_STATE_STARTED; | 273 | opc->state = OPC_STATE_STARTED; |
274 | msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_PeerStopMessage)); | 274 | msg = GNUNET_new (struct GNUNET_TESTBED_PeerStopMessage); |
275 | msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_STOP_PEER); | 275 | msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_STOP_PEER); |
276 | msg->header.size = htons (sizeof (struct GNUNET_TESTBED_PeerStopMessage)); | 276 | msg->header.size = htons (sizeof (struct GNUNET_TESTBED_PeerStopMessage)); |
277 | msg->peer_id = htonl (peer->unique_id); | 277 | msg->peer_id = htonl (peer->unique_id); |
@@ -410,7 +410,7 @@ opstart_overlay_connect (void *cls) | |||
410 | opc->state = OPC_STATE_STARTED; | 410 | opc->state = OPC_STATE_STARTED; |
411 | data = opc->data; | 411 | data = opc->data; |
412 | GNUNET_assert (NULL != data); | 412 | GNUNET_assert (NULL != data); |
413 | msg = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_OverlayConnectMessage)); | 413 | msg = GNUNET_new (struct GNUNET_TESTBED_OverlayConnectMessage); |
414 | msg->header.size = | 414 | msg->header.size = |
415 | htons (sizeof (struct GNUNET_TESTBED_OverlayConnectMessage)); | 415 | htons (sizeof (struct GNUNET_TESTBED_OverlayConnectMessage)); |
416 | msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_OVERLAY_CONNECT); | 416 | msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_OVERLAY_CONNECT); |
@@ -570,18 +570,18 @@ GNUNET_TESTBED_peer_create (struct GNUNET_TESTBED_Controller *controller, | |||
570 | struct OperationContext *opc; | 570 | struct OperationContext *opc; |
571 | static uint32_t id_gen; | 571 | static uint32_t id_gen; |
572 | 572 | ||
573 | peer = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_Peer)); | 573 | peer = GNUNET_new (struct GNUNET_TESTBED_Peer); |
574 | peer->controller = controller; | 574 | peer->controller = controller; |
575 | peer->host = host; | 575 | peer->host = host; |
576 | peer->unique_id = id_gen++; | 576 | peer->unique_id = id_gen++; |
577 | peer->state = TESTBED_PS_INVALID; | 577 | peer->state = TESTBED_PS_INVALID; |
578 | data = GNUNET_malloc (sizeof (struct PeerCreateData)); | 578 | data = GNUNET_new (struct PeerCreateData); |
579 | data->host = host; | 579 | data->host = host; |
580 | data->cfg = cfg; | 580 | data->cfg = cfg; |
581 | data->cb = cb; | 581 | data->cb = cb; |
582 | data->cls = cls; | 582 | data->cls = cls; |
583 | data->peer = peer; | 583 | data->peer = peer; |
584 | opc = GNUNET_malloc (sizeof (struct OperationContext)); | 584 | opc = GNUNET_new (struct OperationContext); |
585 | opc->c = controller; | 585 | opc->c = controller; |
586 | opc->data = data; | 586 | opc->data = data; |
587 | opc->id = GNUNET_TESTBED_get_next_op_id (controller); | 587 | opc->id = GNUNET_TESTBED_get_next_op_id (controller); |
@@ -613,11 +613,11 @@ GNUNET_TESTBED_peer_start (void *op_cls, struct GNUNET_TESTBED_Peer *peer, | |||
613 | struct OperationContext *opc; | 613 | struct OperationContext *opc; |
614 | struct PeerEventData *data; | 614 | struct PeerEventData *data; |
615 | 615 | ||
616 | data = GNUNET_malloc (sizeof (struct PeerEventData)); | 616 | data = GNUNET_new (struct PeerEventData); |
617 | data->peer = peer; | 617 | data->peer = peer; |
618 | data->pcc = pcc; | 618 | data->pcc = pcc; |
619 | data->pcc_cls = pcc_cls; | 619 | data->pcc_cls = pcc_cls; |
620 | opc = GNUNET_malloc (sizeof (struct OperationContext)); | 620 | opc = GNUNET_new (struct OperationContext); |
621 | opc->c = peer->controller; | 621 | opc->c = peer->controller; |
622 | opc->data = data; | 622 | opc->data = data; |
623 | opc->op_cls = op_cls; | 623 | opc->op_cls = op_cls; |
@@ -653,11 +653,11 @@ GNUNET_TESTBED_peer_stop (void *op_cls, | |||
653 | struct OperationContext *opc; | 653 | struct OperationContext *opc; |
654 | struct PeerEventData *data; | 654 | struct PeerEventData *data; |
655 | 655 | ||
656 | data = GNUNET_malloc (sizeof (struct PeerEventData)); | 656 | data = GNUNET_new (struct PeerEventData); |
657 | data->peer = peer; | 657 | data->peer = peer; |
658 | data->pcc = pcc; | 658 | data->pcc = pcc; |
659 | data->pcc_cls = pcc_cls; | 659 | data->pcc_cls = pcc_cls; |
660 | opc = GNUNET_malloc (sizeof (struct OperationContext)); | 660 | opc = GNUNET_new (struct OperationContext); |
661 | opc->c = peer->controller; | 661 | opc->c = peer->controller; |
662 | opc->data = data; | 662 | opc->data = data; |
663 | opc->op_cls = op_cls; | 663 | opc->op_cls = op_cls; |
@@ -698,12 +698,12 @@ GNUNET_TESTBED_peer_get_information (struct GNUNET_TESTBED_Peer *peer, | |||
698 | 698 | ||
699 | GNUNET_assert (GNUNET_TESTBED_PIT_GENERIC != pit); | 699 | GNUNET_assert (GNUNET_TESTBED_PIT_GENERIC != pit); |
700 | GNUNET_assert (NULL != cb); | 700 | GNUNET_assert (NULL != cb); |
701 | data = GNUNET_malloc (sizeof (struct PeerInfoData)); | 701 | data = GNUNET_new (struct PeerInfoData); |
702 | data->peer = peer; | 702 | data->peer = peer; |
703 | data->pit = pit; | 703 | data->pit = pit; |
704 | data->cb = cb; | 704 | data->cb = cb; |
705 | data->cb_cls = cb_cls; | 705 | data->cb_cls = cb_cls; |
706 | opc = GNUNET_malloc (sizeof (struct OperationContext)); | 706 | opc = GNUNET_new (struct OperationContext); |
707 | opc->c = peer->controller; | 707 | opc->c = peer->controller; |
708 | opc->data = data; | 708 | opc->data = data; |
709 | opc->type = OP_PEER_INFO; | 709 | opc->type = OP_PEER_INFO; |
@@ -737,7 +737,7 @@ GNUNET_TESTBED_peer_update_configuration (struct GNUNET_TESTBED_Peer *peer, | |||
737 | struct PeerReconfigureData *data; | 737 | struct PeerReconfigureData *data; |
738 | size_t csize; | 738 | size_t csize; |
739 | 739 | ||
740 | data = GNUNET_malloc (sizeof (struct PeerReconfigureData)); | 740 | data = GNUNET_new (struct PeerReconfigureData); |
741 | data->peer = peer; | 741 | data->peer = peer; |
742 | data->config = GNUNET_CONFIGURATION_serialize (cfg, &csize); | 742 | data->config = GNUNET_CONFIGURATION_serialize (cfg, &csize); |
743 | if (NULL == data->config) | 743 | if (NULL == data->config) |
@@ -753,7 +753,7 @@ GNUNET_TESTBED_peer_update_configuration (struct GNUNET_TESTBED_Peer *peer, | |||
753 | return NULL; | 753 | return NULL; |
754 | } | 754 | } |
755 | data->cfg_size = (uint16_t) csize; | 755 | data->cfg_size = (uint16_t) csize; |
756 | opc = GNUNET_malloc (sizeof (struct OperationContext)); | 756 | opc = GNUNET_new (struct OperationContext); |
757 | opc->c = peer->controller; | 757 | opc->c = peer->controller; |
758 | opc->data = data; | 758 | opc->data = data; |
759 | opc->type = OP_PEER_RECONFIGURE; | 759 | opc->type = OP_PEER_RECONFIGURE; |
@@ -780,7 +780,7 @@ GNUNET_TESTBED_peer_destroy (struct GNUNET_TESTBED_Peer *peer) | |||
780 | { | 780 | { |
781 | struct OperationContext *opc; | 781 | struct OperationContext *opc; |
782 | 782 | ||
783 | opc = GNUNET_malloc (sizeof (struct OperationContext)); | 783 | opc = GNUNET_new (struct OperationContext); |
784 | opc->data = peer; | 784 | opc->data = peer; |
785 | opc->c = peer->controller; | 785 | opc->c = peer->controller; |
786 | opc->id = GNUNET_TESTBED_get_next_op_id (peer->controller); | 786 | opc->id = GNUNET_TESTBED_get_next_op_id (peer->controller); |
@@ -843,12 +843,12 @@ GNUNET_TESTBED_overlay_connect (void *op_cls, | |||
843 | struct OverlayConnectData *data; | 843 | struct OverlayConnectData *data; |
844 | 844 | ||
845 | GNUNET_assert ((TESTBED_PS_STARTED == p1->state) && (TESTBED_PS_STARTED == p2->state)); | 845 | GNUNET_assert ((TESTBED_PS_STARTED == p1->state) && (TESTBED_PS_STARTED == p2->state)); |
846 | data = GNUNET_malloc (sizeof (struct OverlayConnectData)); | 846 | data = GNUNET_new (struct OverlayConnectData); |
847 | data->p1 = p1; | 847 | data->p1 = p1; |
848 | data->p2 = p2; | 848 | data->p2 = p2; |
849 | data->cb = cb; | 849 | data->cb = cb; |
850 | data->cb_cls = cb_cls; | 850 | data->cb_cls = cb_cls; |
851 | opc = GNUNET_malloc (sizeof (struct OperationContext)); | 851 | opc = GNUNET_new (struct OperationContext); |
852 | opc->data = data; | 852 | opc->data = data; |
853 | opc->c = p1->controller; | 853 | opc->c = p1->controller; |
854 | opc->id = GNUNET_TESTBED_get_next_op_id (opc->c); | 854 | opc->id = GNUNET_TESTBED_get_next_op_id (opc->c); |
@@ -953,14 +953,14 @@ GNUNET_TESTBED_peer_manage_service (void *op_cls, | |||
953 | msize += sizeof (struct GNUNET_TESTBED_ManagePeerServiceMessage); | 953 | msize += sizeof (struct GNUNET_TESTBED_ManagePeerServiceMessage); |
954 | if (GNUNET_SERVER_MAX_MESSAGE_SIZE < msize) | 954 | if (GNUNET_SERVER_MAX_MESSAGE_SIZE < msize) |
955 | return NULL; | 955 | return NULL; |
956 | data = GNUNET_malloc (sizeof (struct ManageServiceData)); | 956 | data = GNUNET_new (struct ManageServiceData); |
957 | data->cb = cb; | 957 | data->cb = cb; |
958 | data->cb_cls = cb_cls; | 958 | data->cb_cls = cb_cls; |
959 | data->peer = peer; | 959 | data->peer = peer; |
960 | data->service_name = GNUNET_strdup (service_name); | 960 | data->service_name = GNUNET_strdup (service_name); |
961 | data->start = start; | 961 | data->start = start; |
962 | data->msize = (uint16_t) msize; | 962 | data->msize = (uint16_t) msize; |
963 | opc = GNUNET_malloc (sizeof (struct OperationContext)); | 963 | opc = GNUNET_new (struct OperationContext); |
964 | opc->data = data; | 964 | opc->data = data; |
965 | opc->c = peer->controller; | 965 | opc->c = peer->controller; |
966 | opc->id = GNUNET_TESTBED_get_next_op_id (opc->c); | 966 | opc->id = GNUNET_TESTBED_get_next_op_id (opc->c); |