X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftestbed%2Ftestbed_api_services.c;h=2c9a90fd454133e378e23889e9ffae5b5b82e6bf;hb=d17a17ea785f91c18b5694eab3372c4e4564d95e;hp=1a94ecc0ffd1bc097f365afe5a7e40e84bb96d84;hpb=bb5fe91d23b0938baa3c4f0e92a83df659df216a;p=oweals%2Fgnunet.git diff --git a/src/testbed/testbed_api_services.c b/src/testbed/testbed_api_services.c index 1a94ecc0f..2c9a90fd4 100644 --- a/src/testbed/testbed_api_services.c +++ b/src/testbed/testbed_api_services.c @@ -2,20 +2,20 @@ This file is part of GNUnet Copyright (C) 2008--2013 GNUnet e.V. - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. + GNUnet is free software: you can redistribute it and/or modify it + under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, + or (at your option) any later version. GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + Affero General Public License for more details. - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + + SPDX-License-Identifier: AGPL3.0-or-later */ /** @@ -120,7 +120,6 @@ struct ServiceConnectData * State information */ enum State state; - }; @@ -149,9 +148,9 @@ configuration_receiver (void *cls, const struct GNUNET_MessageHeader *msg) if (GNUNET_MESSAGE_TYPE_TESTBED_OPERATION_FAIL_EVENT == mtype) { emsg = - GNUNET_TESTBED_parse_error_string_ ((const struct - GNUNET_TESTBED_OperationFailureEventMessage - *) msg); + GNUNET_TESTBED_parse_error_string_ ((const struct + GNUNET_TESTBED_OperationFailureEventMessage + *) msg); if (NULL == emsg) emsg = "Unknown error"; info.details.operation_finished.emsg = emsg; @@ -192,10 +191,10 @@ opstart_service_connect (void *cls) c = data->peer->controller; op_id = GNUNET_TESTBED_get_next_op_id (c); msg = - GNUNET_TESTBED_generate_peergetconfig_msg_ (data->peer->unique_id, op_id); + GNUNET_TESTBED_generate_peergetconfig_msg_ (data->peer->unique_id, op_id); data->opc = - GNUNET_TESTBED_forward_operation_msg_ (c, op_id, &msg->header, - &configuration_receiver, data); + GNUNET_TESTBED_forward_operation_msg_ (c, op_id, &msg->header, + &configuration_receiver, data); GNUNET_free (msg); data->state = CFG_REQUEST_QUEUED; } @@ -216,10 +215,12 @@ oprelease_service_connect (void *cls) { case INIT: break; + case CFG_REQUEST_QUEUED: GNUNET_assert (NULL != data->opc); GNUNET_TESTBED_forward_operation_msg_cancel_ (data->opc); break; + case SERVICE_CONNECTED: GNUNET_assert (NULL != data->cfg); GNUNET_CONFIGURATION_destroy (data->cfg); @@ -273,10 +274,11 @@ GNUNET_TESTBED_service_connect (void *op_cls, struct GNUNET_TESTBED_Peer *peer, data->cb = cb; data->cb_cls = cb_cls; data->operation = - GNUNET_TESTBED_operation_create_ (data, &opstart_service_connect, - &oprelease_service_connect); + GNUNET_TESTBED_operation_create_ (data, &opstart_service_connect, + &oprelease_service_connect); GNUNET_TESTBED_operation_queue_insert_ (peer-> - controller->opq_parallel_service_connections, + controller-> + opq_parallel_service_connections, data->operation); GNUNET_TESTBED_operation_queue_insert_ (peer-> controller->opq_parallel_operations, @@ -285,4 +287,5 @@ GNUNET_TESTBED_service_connect (void *op_cls, struct GNUNET_TESTBED_Peer *peer, return data->operation; } + /* end of testbed_api_services.c */