/*
This file is part of GNUnet.
- (C) 2011-2014 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011-2014 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
* @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;
}
* clients.
*
* @param peer peer for which this is an address suggestion
- * @param plugin_name 0-termintated string specifying the transport plugin
- * @param plugin_addr binary address for the plugin to use
- * @param plugin_addr_len number of bytes in @a plugin_addr
- * @param local_address_info the local address for the address
* @param session_id session ID to use for the given client
- * @param atsi performance data for the address
- * @param atsi_count number of performance records in @a atsi
* @param bandwidth_out assigned outbound bandwidth
* @param bandwidth_in assigned inbound bandwidth
*/
void
GAS_scheduling_transmit_address_suggestion (const struct GNUNET_PeerIdentity *peer,
- const char *plugin_name,
- const void *plugin_addr,
- size_t plugin_addr_len,
- uint32_t local_address_info,
uint32_t session_id,
- const struct GNUNET_ATS_Information *atsi,
- uint32_t atsi_count,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
{
- struct AddressSuggestionMessage *msg;
- size_t plugin_name_length = strlen (plugin_name) + 1;
- size_t msize =
- sizeof (struct AddressSuggestionMessage) +
- atsi_count * sizeof (struct GNUNET_ATS_Information) + plugin_addr_len +
- plugin_name_length;
- char buf[msize] GNUNET_ALIGN;
- struct GNUNET_ATS_Information *atsp;
- char *addrp;
+ struct AddressSuggestionMessage msg;
- if (my_client == NULL)
+ if (NULL == my_client)
return;
- GNUNET_STATISTICS_update (GSA_stats, "# address suggestions made", 1,
+ GNUNET_STATISTICS_update (GSA_stats,
+ "# address suggestions made",
+ 1,
GNUNET_NO);
- GNUNET_assert (msize < GNUNET_SERVER_MAX_MESSAGE_SIZE);
- GNUNET_assert (atsi_count <
- GNUNET_SERVER_MAX_MESSAGE_SIZE /
- sizeof (struct GNUNET_ATS_Information));
- msg = (struct AddressSuggestionMessage *) buf;
- msg->header.size = htons (msize);
- msg->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_ADDRESS_SUGGESTION);
- msg->ats_count = htonl (atsi_count);
- msg->peer = *peer;
- msg->address_length = htons (plugin_addr_len);
- msg->plugin_name_length = htons (plugin_name_length);
- msg->address_local_info = htonl (local_address_info);
- msg->session_id = htonl (session_id);
- msg->bandwidth_out = bandwidth_out;
- msg->bandwidth_in = bandwidth_in;
- atsp = (struct GNUNET_ATS_Information *) &msg[1];
- memcpy (atsp, atsi, sizeof (struct GNUNET_ATS_Information) * atsi_count);
- addrp = (char *) &atsp[atsi_count];
- memcpy (addrp, plugin_addr, plugin_addr_len);
- strcpy (&addrp[plugin_addr_len], plugin_name);
-
+ msg.header.size = htons (sizeof (struct AddressSuggestionMessage));
+ msg.header.type = htons (GNUNET_MESSAGE_TYPE_ATS_ADDRESS_SUGGESTION);
+ msg.peer = *peer;
+ msg.session_id = htonl (session_id);
+ msg.bandwidth_out = bandwidth_out;
+ msg.bandwidth_in = bandwidth_in;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"ATS sends quota for peer `%s': (in/out) %u/%u\n",
GNUNET_i2s (peer),
(unsigned int) ntohl (bandwidth_in.value__),
(unsigned int) ntohl (bandwidth_out.value__));
-
- GNUNET_SERVER_notification_context_unicast (nc, my_client, &msg->header,
+ GNUNET_SERVER_notification_context_unicast (nc,
+ my_client,
+ &msg.header,
GNUNET_YES);
}
-/**
- * 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.
*
GNUNET_STATISTICS_update (GSA_stats,
"# addresses created", 1,
GNUNET_NO);
- GAS_addresses_add (address_handle,
- &m->peer,
+ 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);
"# address updates received",
1,
GNUNET_NO);
- GAS_addresses_update (address_handle,
- &m->peer,
+ 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);
-}
-
-
/**
* Handle 'address destroyed' messages from clients.
*
{
const struct AddressDestroyedMessage *m;
struct SessionReleaseMessage srm;
- const char *address;
- const char *plugin_name;
- uint16_t address_length;
- uint16_t plugin_name_length;
- uint16_t size;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received `%s' message of size %u %u\n",
- "ADDRESS_DESTROYED",
- ntohs (message->size),
- sizeof (struct AddressDestroyedMessage));
- size = ntohs (message->size);
- if ((size < sizeof (struct AddressDestroyedMessage)) || (client != my_client))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
m = (const struct AddressDestroyedMessage *) message;
- GNUNET_break (0 == ntohl (m->reserved));
- address_length = ntohs (m->address_length);
- plugin_name_length = ntohs (m->plugin_name_length);
- address = (const char *) &m[1];
- if (plugin_name_length != 0)
- plugin_name = &address[address_length];
- else
- plugin_name = "";
- if ((address_length + plugin_name_length +
- sizeof (struct AddressDestroyedMessage) != ntohs (message->size)))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- if ((0 == plugin_name_length) ||
- (plugin_name[plugin_name_length - 1] != '\0'))
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received `%s' message\n",
+ "ADDRESS_DESTROYED");
GNUNET_STATISTICS_update (GSA_stats,
"# addresses destroyed",
1,
GNUNET_NO);
- GAS_addresses_destroy (address_handle,
- &m->peer,
- plugin_name,
- address, address_length,
- ntohl (m->address_local_info),
+ 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));
* @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);
}