/*
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 <http://www.gnu.org/licenses/>.
- 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
*/
/**
* @file ats/gnunet-service-ats_performance.c
* @brief ats service, interaction with 'performance' API
* @author Matthias Wachs
* @author Christian Grothoff
+ *
+ * TODO:
+ * - simplify functions by passing a `struct GNUNET_HELLO_Address`
*/
#include "platform.h"
#include "gnunet-service-ats.h"
/**
* Context for sending messages to performance clients without PIC.
*/
-static struct GNUNET_SERVER_NotificationContext *nc_no_pic;
+static struct GNUNET_NotificationContext *nc_no_pic;
/**
* Context for sending messages to performance clients with PIC.
*/
-static struct GNUNET_SERVER_NotificationContext *nc_pic;
+static struct GNUNET_NotificationContext *nc_pic;
/**
* Transmit the given performance information to all performance
* clients.
*
- * @param pc client to send to, NULL for all
+ * @param client client to send to, NULL for all
* @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
* #GNUNET_NO if the address is not actively used;
* #GNUNET_SYSERR if this address is no longer available for ATS
* @param prop performance data for the address
+ * @param local_address_info information about the local flags for the address
* @param bandwidth_out assigned outbound bandwidth
* @param bandwidth_in assigned inbound bandwidth
*/
static void
-notify_client (struct GNUNET_SERVER_Client *client,
+notify_client (struct GNUNET_SERVICE_Client *client,
const struct GNUNET_PeerIdentity *peer,
const char *plugin_name,
const void *plugin_addr,
size_t plugin_addr_len,
int active,
const struct GNUNET_ATS_Properties *prop,
+ enum GNUNET_HELLO_AddressInfo local_address_info,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
{
plugin_addr_len +
plugin_name_length;
char buf[msize] GNUNET_ALIGN;
- struct GNUNET_SERVER_NotificationContext *nc;
char *addrp;
- GNUNET_assert (msize < GNUNET_SERVER_MAX_MESSAGE_SIZE);
+ if (NULL != prop)
+ GNUNET_break (GNUNET_NT_UNSPECIFIED != prop->scope);
+ GNUNET_assert (msize < GNUNET_MAX_MESSAGE_SIZE);
msg = (struct PeerInformationMessage *) buf;
msg->header.size = htons (msize);
msg->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_PEER_INFORMATION);
msg->plugin_name_length = htons (plugin_name_length);
msg->bandwidth_out = bandwidth_out;
msg->bandwidth_in = bandwidth_in;
- GNUNET_ATS_properties_hton (&msg->properties,
- prop);
+ if (NULL != prop)
+ GNUNET_ATS_properties_hton (&msg->properties,
+ prop);
+ else
+ memset (&msg->properties,
+ 0,
+ sizeof (struct GNUNET_ATS_Properties));
+ msg->address_local_info = htonl (local_address_info);
addrp = (char *) &msg[1];
- memcpy (addrp, plugin_addr, plugin_addr_len);
+ GNUNET_memcpy (addrp, plugin_addr, plugin_addr_len);
strcpy (&addrp[plugin_addr_len], plugin_name);
if (NULL == client)
{
- GNUNET_SERVER_notification_context_broadcast (nc_pic,
- &msg->header,
- GNUNET_YES);
+ GNUNET_notification_context_broadcast (nc_pic,
+ &msg->header,
+ GNUNET_YES);
}
else
{
- nc = *GNUNET_SERVER_client_get_user_context (client,
- struct GNUNET_SERVER_NotificationContext *);
- if (NULL == nc)
- {
- GNUNET_break (0);
- return;
- }
- GNUNET_SERVER_notification_context_unicast (nc,
- client,
- &msg->header,
- GNUNET_YES);
+ struct GNUNET_MQ_Envelope *env;
+
+ env = GNUNET_MQ_msg_copy (&msg->header);
+ GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
+ env);
}
}
* #GNUNET_NO if the address is not actively used;
* #GNUNET_SYSERR if this address is no longer available for ATS
* @param prop performance data for the address
+ * @param local_address_info information about the local flags for the address
* @param bandwidth_out assigned outbound bandwidth
* @param bandwidth_in assigned inbound bandwidth
*/
size_t plugin_addr_len,
int active,
const struct GNUNET_ATS_Properties *prop,
+ enum GNUNET_HELLO_AddressInfo local_address_info,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
{
+ GNUNET_break ( (NULL == prop) ||
+ (GNUNET_NT_UNSPECIFIED != prop->scope) );
notify_client (NULL,
peer,
plugin_name,
plugin_addr_len,
active,
prop,
+ local_address_info,
bandwidth_out,
bandwidth_in);
GNUNET_STATISTICS_update (GSA_stats,
/**
* Iterator for called from #GAS_addresses_get_peer_info()
*
- * @param cls closure with the `struct GNUNET_SERVER_Client *` to inform.
+ * @param cls closure with the `struct GNUNET_SERVICE_Client *` to inform.
* @param id the peer id
* @param plugin_name plugin name
* @param plugin_addr address
* @param plugin_addr_len length of @a plugin_addr
* @param active is address actively used
* @param prop performance information
+ * @param local_address_info information about the local flags for the address
* @param bandwidth_out current outbound bandwidth assigned to address
* @param bandwidth_in current inbound bandwidth assigned to address
*/
size_t plugin_addr_len,
int active,
const struct GNUNET_ATS_Properties *prop,
+ enum GNUNET_HELLO_AddressInfo local_address_info,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
{
- struct GNUNET_SERVER_Client *client = cls;
+ struct GNUNET_SERVICE_Client *client = cls;
if (NULL == id)
return;
plugin_name,
(unsigned int) ntohl (bandwidth_out.value__),
(unsigned int) ntohl (bandwidth_in.value__));
+ GNUNET_break (GNUNET_NT_UNSPECIFIED != prop->scope);
notify_client (client,
id,
plugin_name,
plugin_addr_len,
active,
prop,
+ local_address_info,
bandwidth_out,
bandwidth_in);
}
* @param flag flag specifying the type of the client
*/
void
-GAS_performance_add_client (struct GNUNET_SERVER_Client *client,
+GAS_performance_add_client (struct GNUNET_SERVICE_Client *client,
enum StartFlag flag)
{
+ struct GNUNET_MQ_Handle *mq;
+
+ mq = GNUNET_SERVICE_client_get_mq (client);
if (START_FLAG_PERFORMANCE_WITH_PIC == flag)
{
- GNUNET_SERVER_notification_context_add (nc_pic,
- client);
- GNUNET_SERVER_client_set_user_context (client,
- &nc_pic);
+ GNUNET_notification_context_add (nc_pic,
+ mq);
GAS_addresses_get_peer_info (NULL,
&peerinfo_it,
client);
}
else
{
- GNUNET_SERVER_notification_context_add (nc_no_pic,
- client);
- GNUNET_SERVER_client_set_user_context (client,
- &nc_no_pic);
+ GNUNET_notification_context_add (nc_no_pic,
+ mq);
}
}
* @param server handle to our server
*/
void
-GAS_performance_init (struct GNUNET_SERVER_Handle *server)
+GAS_performance_init ()
{
- nc_no_pic = GNUNET_SERVER_notification_context_create (server, 32);
- nc_pic = GNUNET_SERVER_notification_context_create (server, 32);
+ nc_no_pic = GNUNET_notification_context_create (32);
+ nc_pic = GNUNET_notification_context_create (32);
}
void
GAS_performance_done ()
{
- GNUNET_SERVER_notification_context_destroy (nc_no_pic);
+ GNUNET_notification_context_destroy (nc_no_pic);
nc_no_pic = NULL;
- GNUNET_SERVER_notification_context_destroy (nc_pic);
+ GNUNET_notification_context_destroy (nc_pic);
nc_pic = NULL;
}
projects / oweals / gnunet.git / blobdiff