X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2Fats_api_scheduling.c;h=783b9f59617c8fcaa6c55f1ba5a55e176ad07844;hb=7a5a724a6f96baf80d2226326124aa01c58ad3fe;hp=d7a5a83a1bf3e3661e22db2396b39f9d08f92b99;hpb=9cd0d5068f3341fe8451a61872894f28a5ac9047;p=oweals%2Fgnunet.git diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c index d7a5a83a1..783b9f596 100644 --- a/src/ats/ats_api_scheduling.c +++ b/src/ats/ats_api_scheduling.c @@ -1,21 +1,19 @@ /* This file is part of GNUnet. - Copyright (C) 2010-2015 Christian Grothoff (and other contributing authors) + Copyright (C) 2010-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. - - 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. + 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 . */ /** * @file ats/ats_api_scheduling.c @@ -117,11 +115,6 @@ struct GNUNET_ATS_SchedulingHandle */ void *suggest_cb_cls; - /** - * Connection to ATS service. - */ - struct GNUNET_CLIENT_Connection *client; - /** * Message queue for sending requests to the ATS service. */ @@ -166,11 +159,9 @@ reconnect (struct GNUNET_ATS_SchedulingHandle *sh); * Re-establish the connection to the ATS service. * * @param cls handle to use to re-connect. - * @param tc scheduler context */ static void -reconnect_task (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +reconnect_task (void *cls) { struct GNUNET_ATS_SchedulingHandle *sh = cls; @@ -192,11 +183,6 @@ force_reconnect (struct GNUNET_ATS_SchedulingHandle *sh) GNUNET_MQ_destroy (sh->mq); sh->mq = NULL; } - if (NULL != sh->client) - { - GNUNET_CLIENT_disconnect (sh->client); - sh->client = NULL; - } sh->suggest_cb (sh->suggest_cb_cls, NULL, NULL, NULL, GNUNET_BANDWIDTH_ZERO, @@ -247,7 +233,6 @@ find_session (struct GNUNET_ATS_SchedulingHandle *sh, sizeof (struct GNUNET_PeerIdentity))) { GNUNET_break (0); - force_reconnect (sh); return NULL; } return ar; @@ -266,6 +251,7 @@ find_empty_session_slot (struct GNUNET_ATS_SchedulingHandle *sh) static uint32_t off; uint32_t i; + GNUNET_assert (0 != sh->session_array_size); i = 0; while ( ( (NOT_FOUND == off) || (NULL != sh->session_array[off % sh->session_array_size]) ) && @@ -360,16 +346,14 @@ release_session (struct GNUNET_ATS_SchedulingHandle *sh, * message from the service. * * @param cls the `struct GNUNET_ATS_SchedulingHandle` - * @param msg message received, NULL on timeout or fatal error + * @param srm message received */ static void -process_ats_session_release_message (void *cls, - const struct GNUNET_MessageHeader *msg) +handle_ats_session_release (void *cls, + const struct GNUNET_ATS_SessionReleaseMessage *srm) { struct GNUNET_ATS_SchedulingHandle *sh = cls; - const struct GNUNET_ATS_SessionReleaseMessage *srm; - srm = (const struct GNUNET_ATS_SessionReleaseMessage *) msg; /* Note: peer field in srm not necessary right now, but might be good to have in the future */ release_session (sh, @@ -382,18 +366,16 @@ process_ats_session_release_message (void *cls, * message from the service. * * @param cls the `struct GNUNET_ATS_SchedulingHandle` - * @param msg message received, NULL on timeout or fatal error + * @param m message received */ static void -process_ats_address_suggestion_message (void *cls, - const struct GNUNET_MessageHeader *msg) +handle_ats_address_suggestion (void *cls, + const struct AddressSuggestionMessage *m) { struct GNUNET_ATS_SchedulingHandle *sh = cls; - const struct AddressSuggestionMessage *m; struct GNUNET_ATS_AddressRecord *ar; uint32_t session_id; - m = (const struct AddressSuggestionMessage *) msg; session_id = ntohl (m->session_id); if (0 == session_id) { @@ -468,7 +450,7 @@ error_handler (void *cls, { struct GNUNET_ATS_SchedulingHandle *sh = cls; - LOG (GNUNET_ERROR_TYPE_ERROR, + LOG (GNUNET_ERROR_TYPE_DEBUG, "ATS connection died (code %d), reconnecting\n", (int) error); force_reconnect (sh); @@ -512,11 +494,11 @@ send_add_address_message (struct GNUNET_ATS_SchedulingHandle *sh, ar->session, ar->slot); pm = (char *) &m[1]; - memcpy (pm, + GNUNET_memcpy (pm, ar->address->address, ar->address->address_length); if (NULL != ar->address->transport_name) - memcpy (&pm[ar->address->address_length], + GNUNET_memcpy (&pm[ar->address->address_length], ar->address->transport_name, namelen); GNUNET_MQ_send (sh->mq, ev); @@ -531,32 +513,34 @@ send_add_address_message (struct GNUNET_ATS_SchedulingHandle *sh, static void reconnect (struct GNUNET_ATS_SchedulingHandle *sh) { - static const struct GNUNET_MQ_MessageHandler handlers[] = - { { &process_ats_session_release_message, - GNUNET_MESSAGE_TYPE_ATS_SESSION_RELEASE, - sizeof (struct GNUNET_ATS_SessionReleaseMessage) }, - { &process_ats_address_suggestion_message, - GNUNET_MESSAGE_TYPE_ATS_ADDRESS_SUGGESTION, - sizeof (struct AddressSuggestionMessage) }, - { NULL, 0, 0 } }; + struct GNUNET_MQ_MessageHandler handlers[] = { + GNUNET_MQ_hd_fixed_size (ats_session_release, + GNUNET_MESSAGE_TYPE_ATS_SESSION_RELEASE, + struct GNUNET_ATS_SessionReleaseMessage, + sh), + GNUNET_MQ_hd_fixed_size (ats_address_suggestion, + GNUNET_MESSAGE_TYPE_ATS_ADDRESS_SUGGESTION, + struct AddressSuggestionMessage, + sh), + GNUNET_MQ_handler_end () + }; struct GNUNET_MQ_Envelope *ev; struct ClientStartMessage *init; unsigned int i; struct GNUNET_ATS_AddressRecord *ar; - GNUNET_assert (NULL == sh->client); - sh->client = GNUNET_CLIENT_connect ("ats", - sh->cfg); - if (NULL == sh->client) + GNUNET_assert (NULL == sh->mq); + sh->mq = GNUNET_CLIENT_connect (sh->cfg, + "ats", + handlers, + &error_handler, + sh); + if (NULL == sh->mq) { GNUNET_break (0); force_reconnect (sh); return; } - sh->mq = GNUNET_MQ_queue_for_connection_client (sh->client, - handlers, - &error_handler, - sh); ev = GNUNET_MQ_msg (init, GNUNET_MESSAGE_TYPE_ATS_START); init->start_flag = htonl (START_FLAG_SCHEDULING); @@ -618,11 +602,6 @@ GNUNET_ATS_scheduling_done (struct GNUNET_ATS_SchedulingHandle *sh) GNUNET_MQ_destroy (sh->mq); sh->mq = NULL; } - if (NULL != sh->client) - { - GNUNET_CLIENT_disconnect (sh->client); - sh->client = NULL; - } if (NULL != sh->task) { GNUNET_SCHEDULER_cancel (sh->task); @@ -676,9 +655,9 @@ GNUNET_ATS_address_add (struct GNUNET_ATS_SchedulingHandle *sh, GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != prop->scope); namelen = strlen (address->transport_name) + 1; msize = address->address_length + namelen; - if ((msize + sizeof (struct AddressUpdateMessage) >= GNUNET_SERVER_MAX_MESSAGE_SIZE) || - (address->address_length >= GNUNET_SERVER_MAX_MESSAGE_SIZE) || - (namelen >= GNUNET_SERVER_MAX_MESSAGE_SIZE) ) + if ((msize + sizeof (struct AddressUpdateMessage) >= GNUNET_MAX_MESSAGE_SIZE) || + (address->address_length >= GNUNET_MAX_MESSAGE_SIZE) || + (namelen >= GNUNET_MAX_MESSAGE_SIZE) ) { /* address too large for us, this should not happen */ GNUNET_break (0);