/*
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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, 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 <http://www.gnu.org/licenses/>.
*/
/**
* @file ats/ats_api_scheduling.c
* Session handle. NULL if we have an address but no
* active session for this address.
*/
- struct Session *session;
+ struct GNUNET_ATS_Session *session;
/**
* Performance data about the address.
/**
* Which slot (index) in the session array does
- * this record correspond to? FIXME:
+ * this record correspond to?
* FIXME: a linear search on this is really crappy!
* Maybe switch to a 64-bit global counter and be
* done with it? Or does that then cause too much
*/
void *suggest_cb_cls;
- /**
- * Connection to ATS service.
- */
- struct GNUNET_CLIENT_Connection *client;
-
/**
* Message queue for sending requests to the ATS service.
*/
* 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;
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,
sizeof (struct GNUNET_PeerIdentity)))
{
GNUNET_break (0);
- force_reconnect (sh);
return NULL;
}
return ar;
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]) ) &&
*/
static uint32_t
find_session_id (struct GNUNET_ATS_SchedulingHandle *sh,
- struct Session *session,
+ struct GNUNET_ATS_Session *session,
const struct GNUNET_HELLO_Address *address)
{
uint32_t i;
* 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 SessionReleaseMessage *srm;
- srm = (const struct SessionReleaseMessage *) msg;
/* Note: peer field in srm not necessary right now,
but might be good to have in the future */
release_session (sh,
* 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)
{
{
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);
if (NULL == sh->mq)
return; /* disconnected, skip for now */
+ GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != ar->properties.scope);
namelen = strlen (ar->address->transport_name) + 1;
msize = ar->address->address_length + namelen;
ev = GNUNET_MQ_msg_extra (m, msize, GNUNET_MESSAGE_TYPE_ATS_ADDRESS_ADD);
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);
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 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);
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);
struct GNUNET_ATS_AddressRecord *
GNUNET_ATS_address_add (struct GNUNET_ATS_SchedulingHandle *sh,
const struct GNUNET_HELLO_Address *address,
- struct Session *session,
+ struct GNUNET_ATS_Session *session,
const struct GNUNET_ATS_Properties *prop)
{
struct GNUNET_ATS_AddressRecord *ar;
GNUNET_break (0);
return NULL;
}
+ 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);
{
/* Already existing, nothing todo, but this should not happen */
GNUNET_break (0);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Diagnostics: %s:%s - %p\n",
- GNUNET_i2s (&address->peer),
- address->transport_name,
- session);
return NULL;
}
s = find_empty_session_slot (sh);
*/
void
GNUNET_ATS_address_add_session (struct GNUNET_ATS_AddressRecord *ar,
- struct Session *session)
+ struct GNUNET_ATS_Session *session)
{
GNUNET_break (NULL == ar->session);
ar->session = session;
*/
int
GNUNET_ATS_address_del_session (struct GNUNET_ATS_AddressRecord *ar,
- struct Session *session)
+ struct GNUNET_ATS_Session *session)
{
GNUNET_assert (session == ar->session);
ar->session = NULL;
ar->address->transport_name,
ar->session,
ar->slot);
+ GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != prop->scope);
GNUNET_ATS_properties_hton (&ar->properties,
prop);
if (NULL == sh->mq)
}
-
/**
* An address got destroyed, stop using it as a valid address.
*
projects / oweals / gnunet.git / blobdiff