X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2Fgnunet-service-ats_connectivity.c;h=3853aeb0eb0a3ae1f5b6e66ab7f3e6a5a67eae7f;hb=c29a8124f885f28f287e91ce7a0dabcdd6b17d50;hp=e9f1e5398ba7442e9ef414bcb1562f514df73b0f;hpb=fa6adc986653bf97b55723e53314d34d2a78115b;p=oweals%2Fgnunet.git diff --git a/src/ats/gnunet-service-ats_connectivity.c b/src/ats/gnunet-service-ats_connectivity.c index e9f1e5398..3853aeb0e 100644 --- a/src/ats/gnunet-service-ats_connectivity.c +++ b/src/ats/gnunet-service-ats_connectivity.c @@ -1,21 +1,21 @@ /* This file is part of GNUnet. - Copyright (C) 2011-2015 Christian Grothoff (and other contributing authors) + Copyright (C) 2011-2015 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 Affero General Public License + along with this program. If not, see . - 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., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + SPDX-License-Identifier: AGPL3.0-or-later */ /** @@ -40,7 +40,7 @@ struct ConnectionRequest /** * Client that made the request. */ - struct GNUNET_SERVER_Client *client; + struct GNUNET_SERVICE_Client *client; /* TODO: allow client to express a 'strength' for this request */ }; @@ -73,25 +73,21 @@ GAS_connectivity_has_peer (void *cls, /** - * Handle 'request address' messages from clients. + * Handle #GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS messages from clients. * - * @param cls unused, NULL * @param client client that sent the request * @param message the request message */ void -GAS_handle_request_address (void *cls, - struct GNUNET_SERVER_Client *client, - const struct GNUNET_MessageHeader *message) +GAS_handle_request_address (struct GNUNET_SERVICE_Client *client, + const struct RequestAddressMessage *msg) { - const struct RequestAddressMessage *msg = - (const struct RequestAddressMessage *) message; struct ConnectionRequest *cr; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", - "REQUEST_ADDRESS"); - GNUNET_break (0 == ntohl (msg->reserved)); + "GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS"); + /* FIXME: should not ignore "msg->strength" */ cr = GNUNET_new (struct ConnectionRequest); cr->client = client; (void) GNUNET_CONTAINER_multipeermap_put (connection_requests, @@ -99,7 +95,6 @@ GAS_handle_request_address (void *cls, cr, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); GAS_plugin_request_connect_start (&msg->peer); - GNUNET_SERVER_receive_done (client, GNUNET_OK); } @@ -117,7 +112,7 @@ free_matching_requests (void *cls, const struct GNUNET_PeerIdentity *pid, void *value) { - struct GNUNET_SERVER_Client *client = cls; + struct GNUNET_SERVICE_Client *client = cls; struct ConnectionRequest *cr = value; if (cr->client == client) @@ -137,29 +132,24 @@ free_matching_requests (void *cls, /** - * Handle 'request address cancel' messages from clients. + * Handle #GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS_CANCEL messages + * from clients. * - * @param cls unused, NULL - * @param client client that sent the request - * @param message the request message + * @param client the client that sent the request + * @param msg the request message */ void -GAS_handle_request_address_cancel (void *cls, - struct GNUNET_SERVER_Client *client, - const struct GNUNET_MessageHeader *message) +GAS_handle_request_address_cancel (struct GNUNET_SERVICE_Client *client, + const struct RequestAddressMessage *msg) { - const struct RequestAddressMessage *msg = - (const struct RequestAddressMessage *) message; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received REQUEST_ADDRESS_CANCEL message for peer %s\n", + "Received GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS_CANCEL message for peer %s\n", GNUNET_i2s (&msg->peer)); - GNUNET_break (0 == ntohl (msg->reserved)); + GNUNET_break (0 == ntohl (msg->strength)); GNUNET_CONTAINER_multipeermap_get_multiple (connection_requests, &msg->peer, &free_matching_requests, client); - GNUNET_SERVER_receive_done (client, GNUNET_OK); } @@ -170,7 +160,7 @@ GAS_handle_request_address_cancel (void *cls, * @param client handle of the (now dead) client */ void -GAS_connectivity_remove_client (struct GNUNET_SERVER_Client *client) +GAS_connectivity_remove_client (struct GNUNET_SERVICE_Client *client) { GNUNET_CONTAINER_multipeermap_iterate (connection_requests, &free_matching_requests, @@ -184,7 +174,9 @@ GAS_connectivity_remove_client (struct GNUNET_SERVER_Client *client) void GAS_connectivity_init () { - connection_requests = GNUNET_CONTAINER_multipeermap_create (32, GNUNET_NO); + connection_requests + = GNUNET_CONTAINER_multipeermap_create (32, + GNUNET_NO); } @@ -216,9 +208,11 @@ free_request (void *cls, void GAS_connectivity_done () { + GAS_plugin_solver_lock (); GNUNET_CONTAINER_multipeermap_iterate (connection_requests, &free_request, NULL); + GAS_plugin_solver_unlock (); GNUNET_CONTAINER_multipeermap_destroy (connection_requests); connection_requests = NULL; }