/*
This file is part of GNUnet.
- (C) 2011-2014 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011-2014 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
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.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @author Christian Grothoff
*/
#include "platform.h"
-#include "gnunet-service-ats.h"
#include "gnunet-service-ats_addresses.h"
#include "gnunet-service-ats_scheduling.h"
#include "ats.h"
*/
static struct GNUNET_SERVER_Client *my_client;
-/**
- * Handle to address subsystem
- */
-static struct GAS_Addresses_Handle *address_handle;
-
/**
* Register a new scheduling client.
int
GAS_scheduling_add_client (struct GNUNET_SERVER_Client *client)
{
- if (my_client != NULL)
+ if (NULL != my_client)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"This ATS already has a scheduling client, refusing new scheduling client for now.\n");
return GNUNET_SYSERR;
}
my_client = client;
- GNUNET_SERVER_notification_context_add (nc, client);
+ GNUNET_SERVER_notification_context_add (nc,
+ client);
+ GNUNET_SERVER_client_set_user_context (client,
+ &nc);
return GNUNET_OK;
}
{
if (my_client != client)
return;
- GAS_addresses_destroy_all (address_handle);
+ GAS_addresses_destroy_all ();
my_client = NULL;
}
if (NULL == my_client)
return;
GNUNET_STATISTICS_update (GSA_stats,
- "# address suggestions made", 1,
+ "# address suggestions made",
+ 1,
GNUNET_NO);
msg.header.size = htons (sizeof (struct AddressSuggestionMessage));
msg.header.type = htons (GNUNET_MESSAGE_TYPE_ATS_ADDRESS_SUGGESTION);
}
-/**
- * Handle '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)
-{
- const struct RequestAddressMessage *msg =
- (const struct RequestAddressMessage *) message;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n",
- "REQUEST_ADDRESS");
- GNUNET_break (0 == ntohl (msg->reserved));
- GAS_addresses_request_address (address_handle, &msg->peer);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
-}
-
-
-/**
- * Handle '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_cancel (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
-{
- const struct RequestAddressMessage *msg =
- (const struct RequestAddressMessage *) message;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n",
- "REQUEST_ADDRESS_CANCEL");
- GNUNET_break (0 == ntohl (msg->reserved));
-
- GAS_addresses_request_address_cancel (address_handle, &msg->peer);
-
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
-}
-
-
-/**
- * Handle 'reset backoff' messages from clients.
- *
- * @param cls unused, NULL
- * @param client client that sent the request
- * @param message the request message
- */
-void
-GAS_handle_reset_backoff (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
-{
- const struct ResetBackoffMessage *msg =
- (const struct ResetBackoffMessage *) message;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received `%s' message\n",
- "RESET_BACKOFF");
- GNUNET_break (0 == ntohl (msg->reserved));
- GAS_addresses_handle_backoff_reset (address_handle, &msg->peer);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
-}
-
-
/**
* Handle 'address add' messages from clients.
*
const struct GNUNET_MessageHeader *message)
{
const struct AddressAddMessage *m;
- const struct GNUNET_ATS_Information *atsi;
const char *address;
const char *plugin_name;
uint16_t address_length;
uint16_t plugin_name_length;
- uint32_t ats_count;
uint16_t size;
+ struct GNUNET_ATS_Properties prop;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received `%s' message\n",
return;
}
m = (const struct AddressAddMessage *) message;
- ats_count = ntohl (m->ats_count);
address_length = ntohs (m->address_length);
plugin_name_length = ntohs (m->plugin_name_length);
- atsi = (const struct GNUNET_ATS_Information *) &m[1];
- address = (const char *) &atsi[ats_count];
+ address = (const char *) &m[1];
if (plugin_name_length != 0)
plugin_name = &address[address_length];
else
plugin_name = "";
if ((address_length + plugin_name_length +
- ats_count * sizeof (struct GNUNET_ATS_Information) +
sizeof (struct AddressAddMessage) != ntohs (message->size)) ||
- (ats_count >
- GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_ATS_Information)) ||
- ((plugin_name_length > 0) && (plugin_name[plugin_name_length - 1] != '\0')))
+ ( (plugin_name_length > 0) &&
+ (plugin_name[plugin_name_length - 1] != '\0') ) )
{
GNUNET_break (0);
GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
return;
}
GNUNET_STATISTICS_update (GSA_stats,
- "# addresses created", 1,
+ "# addresses created",
+ 1,
GNUNET_NO);
- GAS_addresses_add (address_handle,
- &m->peer,
+ GNUNET_ATS_properties_ntoh (&prop,
+ &m->properties);
+ GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != prop.scope);
+ GAS_addresses_add (&m->peer,
plugin_name,
address,
address_length,
- ntohl(m->address_local_info),
+ ntohl (m->address_local_info),
ntohl (m->session_id),
- atsi, ats_count);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ &prop);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
}
const struct GNUNET_MessageHeader *message)
{
const struct AddressUpdateMessage *m;
- const struct GNUNET_ATS_Information *atsi;
- uint32_t ats_count;
- uint16_t size;
+ struct GNUNET_ATS_Properties prop;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received `%s' message\n",
- "ADDRESS_UPDATE");
- size = ntohs (message->size);
- if (size < sizeof (struct AddressUpdateMessage))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
m = (const struct AddressUpdateMessage *) message;
- ats_count = ntohl (m->ats_count);
- atsi = (const struct GNUNET_ATS_Information *) &m[1];
-
- if ((ats_count * sizeof (struct GNUNET_ATS_Information) +
- sizeof (struct AddressUpdateMessage) != ntohs (message->size)) ||
- (ats_count >
- GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_ATS_Information)))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
GNUNET_STATISTICS_update (GSA_stats,
"# address updates received",
1,
GNUNET_NO);
- GAS_addresses_update (address_handle,
- &m->peer,
+ GNUNET_ATS_properties_ntoh (&prop,
+ &m->properties);
+ GAS_addresses_update (&m->peer,
ntohl (m->session_id),
- atsi, ats_count);
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
-}
-
-
-/**
- * Handle 'address in use' messages from clients.
- *
- * @param cls unused, NULL
- * @param client client that sent the request
- * @param message the request message
- */
-void
-GAS_handle_address_in_use (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
-{
- const struct AddressUseMessage *m;
- int res;
-
- m = (const struct AddressUseMessage *) message;
- res = GAS_addresses_in_use (address_handle,
- &m->peer,
- ntohl (m->session_id),
- ntohl (m->in_use));
- if (GNUNET_OK != res)
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ &prop);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_OK);
}
const struct GNUNET_MessageHeader *message)
{
const struct AddressDestroyedMessage *m;
- struct SessionReleaseMessage srm;
+ struct GNUNET_ATS_SessionReleaseMessage srm;
m = (const struct AddressDestroyedMessage *) message;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"# addresses destroyed",
1,
GNUNET_NO);
- GAS_addresses_destroy (address_handle,
- &m->peer,
+ GAS_addresses_destroy (&m->peer,
ntohl (m->session_id));
srm.header.type = ntohs (GNUNET_MESSAGE_TYPE_ATS_SESSION_RELEASE);
- srm.header.size = ntohs (sizeof (struct SessionReleaseMessage));
+ srm.header.size = ntohs (sizeof (struct GNUNET_ATS_SessionReleaseMessage));
srm.session_id = m->session_id;
srm.peer = m->peer;
GNUNET_SERVER_notification_context_unicast (nc,
* @param ah the address handle to use
*/
void
-GAS_scheduling_init (struct GNUNET_SERVER_Handle *server,
- struct GAS_Addresses_Handle *ah)
+GAS_scheduling_init (struct GNUNET_SERVER_Handle *server)
{
- GNUNET_assert (NULL != ah);
- address_handle = ah;
nc = GNUNET_SERVER_notification_context_create (server, 128);
}
projects / oweals / gnunet.git / blobdiff