/*
- This file is part of GNUnet.
- (C) 2010,2011 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
- by the Free Software Foundation; either version 3, 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.
-*/
+ This file is part of GNUnet.
+ Copyright (C) 2010,2011 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
+ by the Free Software Foundation; either version 3, 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.
+ */
/**
* @file ats/ats_api_performance.c
* @brief automatic transport selection and outbound bandwidth determination
* @author Christian Grothoff
* @author Matthias Wachs
- */
+ */
#include "platform.h"
#include "gnunet_ats_service.h"
#include "ats.h"
-
/**
* Message in linked list we should send to the ATS service. The
* actual binary message follows this struct.
GNUNET_ATS_ReservationCallback rcb;
/**
- * Closure for 'rcb'
+ * Closure for @e rcb
*/
void *rcb_cls;
/**
* Do we need to undo this reservation if it succeeded? Set to
- * GNUNET_YES if a reservation is cancelled. (at that point, 'info'
+ * #GNUNET_YES if a reservation is cancelled. (at that point, 'info'
* is also set to NULL; however, info will ALSO be NULL for the
* reservation context that is created to undo the original request,
* so 'info' being NULL cannot be used to check if undo is
GNUNET_ATS_AddressInformationCallback cb;
/**
- * Callback closure
+ * Callback closure for @e cb
*/
void *cb_cls;
};
-
/**
* ATS Handle to obtain and/or modify performance information.
*/
GNUNET_ATS_AddressInformationCallback addr_info_cb;
/**
- * Closure for 'addr_info_cb'.
+ * Closure for @e addr_info_cb.
*/
void *addr_info_cb_cls;
*/
struct GNUNET_ATS_AddressListHandle *addresslist_tail;
-
/**
* Current request for transmission to ATS.
*/
/**
* Task to trigger reconnect.
*/
- GNUNET_SCHEDULER_TaskIdentifier task;
+ struct GNUNET_SCHEDULER_Task * task;
/**
* Monitor request multiplexing
uint32_t id;
};
-
/**
* Re-establish the connection to the ATS service.
*
* @param tc scheduler context
*/
static void
-reconnect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+reconnect_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_ATS_PerformanceHandle *ph = cls;
- ph->task = GNUNET_SCHEDULER_NO_TASK;
+ ph->task = NULL;
reconnect (ph);
}
* Type of a function to call when we receive a message
* from the service.
*
- * @param cls the 'struct GNUNET_ATS_SchedulingHandle'
+ * @param cls the `struct GNUNET_ATS_SchedulingHandle`
* @param msg message received, NULL on timeout or fatal error
*/
static void
-process_ats_message (void *cls, const struct GNUNET_MessageHeader *msg);
+process_ats_message (void *cls,
+ const struct GNUNET_MessageHeader *msg);
+
/**
* We can now transmit a message to ATS. Do it.
*
- * @param cls the 'struct GNUNET_ATS_SchedulingHandle'
+ * @param cls the `struct GNUNET_ATS_PerformanceHandle`
* @param size number of bytes we can transmit to ATS
* @param buf where to copy the messages
- * @return number of bytes copied into buf
+ * @return number of bytes copied into @a buf
*/
static size_t
-transmit_message_to_ats (void *cls, size_t size, void *buf)
+transmit_message_to_ats (void *cls,
+ size_t size,
+ void *buf)
{
struct GNUNET_ATS_PerformanceHandle *ph = cls;
struct PendingMessage *p;
memcpy (&cbuf[ret], &p[1], p->size);
ret += p->size;
size -= p->size;
- GNUNET_CONTAINER_DLL_remove (ph->pending_head, ph->pending_tail, p);
- GNUNET_CLIENT_receive (ph->client, &process_ats_message, ph,
- GNUNET_TIME_UNIT_FOREVER_REL);
-
- GNUNET_free (p);
+ GNUNET_CONTAINER_DLL_remove (ph->pending_head,
+ ph->pending_tail,
+ p);
+ GNUNET_free(p);
}
do_transmit (ph);
return ret;
if (NULL == (p = ph->pending_head))
return;
if (NULL == ph->client)
- return; /* currently reconnecting */
- ph->th =
- GNUNET_CLIENT_notify_transmit_ready (ph->client, p->size,
- GNUNET_TIME_UNIT_FOREVER_REL,
- GNUNET_YES, &transmit_message_to_ats,
- ph);
+ return; /* currently reconnecting */
+ ph->th = GNUNET_CLIENT_notify_transmit_ready (ph->client,
+ p->size,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_YES,
+ &transmit_message_to_ats, ph);
}
*
* @param ph our context with the callback
* @param msg the message
- * @return GNUNET_OK if the message was well-formed
+ * @return #GNUNET_OK if the message was well-formed
*/
static int
process_pi_message (struct GNUNET_ATS_PerformanceHandle *ph,
uint32_t ats_count;
int addr_active;
- if (ntohs (msg->size) < sizeof (struct PeerInformationMessage))
+ if (ntohs (msg->size) < sizeof(struct PeerInformationMessage))
{
- GNUNET_break (0);
+ GNUNET_break(0);
return GNUNET_SYSERR;
}
ats_count = ntohl (pi->ats_count);
plugin_address_length = ntohs (pi->address_length);
plugin_name_length = ntohs (pi->plugin_name_length);
- addr_active = ntohl (pi->address_active);
+ addr_active = (int) ntohl (pi->address_active);
atsi = (const struct GNUNET_ATS_Information *) &pi[1];
plugin_address = (const char *) &atsi[ats_count];
plugin_name = &plugin_address[plugin_address_length];
- if ((plugin_address_length + plugin_name_length +
- ats_count * sizeof (struct GNUNET_ATS_Information) +
- sizeof (struct PeerInformationMessage) != ntohs (msg->size)) ||
- (ats_count >
- GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_ATS_Information))
+ if ((plugin_address_length + plugin_name_length
+ + ats_count * sizeof(struct GNUNET_ATS_Information)
+ + sizeof(struct PeerInformationMessage) != ntohs (msg->size))
+ || (ats_count
+ > GNUNET_SERVER_MAX_MESSAGE_SIZE
+ / sizeof(struct GNUNET_ATS_Information))
|| (plugin_name[plugin_name_length - 1] != '\0'))
{
- GNUNET_break (0);
+ GNUNET_break(0);
return GNUNET_SYSERR;
}
if (NULL != ph->addr_info_cb)
{
- address.peer = pi->peer;
- address.address = plugin_address;
- address.address_length = plugin_address_length;
- address.transport_name = plugin_name;
-
- ph->addr_info_cb (ph->addr_info_cb_cls, &address, addr_active, pi->bandwidth_out, pi->bandwidth_in,
- atsi, ats_count);
+ address.peer = pi->peer;
+ address.address = plugin_address;
+ address.address_length = plugin_address_length;
+ address.transport_name = plugin_name;
+ ph->addr_info_cb (ph->addr_info_cb_cls,
+ &address,
+ addr_active,
+ pi->bandwidth_out,
+ pi->bandwidth_in,
+ atsi, ats_count);
}
return GNUNET_OK;
}
*
* @param ph our context with the callback
* @param msg the message
- * @return GNUNET_OK if the message was well-formed
+ * @return #GNUNET_OK if the message was well-formed
*/
static int
process_rr_message (struct GNUNET_ATS_PerformanceHandle *ph,
struct GNUNET_ATS_ReservationContext *rc;
int32_t amount;
- if (ntohs (msg->size) < sizeof (struct ReservationResultMessage))
+ if (ntohs (msg->size) < sizeof(struct ReservationResultMessage))
{
- GNUNET_break (0);
+ GNUNET_break(0);
return GNUNET_SYSERR;
}
rr = (const struct ReservationResultMessage *) msg;
amount = ntohl (rr->amount);
rc = ph->reservation_head;
- if (0 != memcmp (&rr->peer, &rc->peer, sizeof (struct GNUNET_PeerIdentity)))
+ if (0 != memcmp (&rr->peer, &rc->peer, sizeof(struct GNUNET_PeerIdentity)))
{
- GNUNET_break (0);
+ GNUNET_break(0);
return GNUNET_SYSERR;
}
- GNUNET_CONTAINER_DLL_remove (ph->reservation_head, ph->reservation_tail, rc);
- if ((amount == 0) || (rc->rcb != NULL))
+ GNUNET_CONTAINER_DLL_remove (ph->reservation_head,
+ ph->reservation_tail,
+ rc);
+ if ( (0 == amount) ||
+ (NULL != rc->rcb) )
{
/* tell client if not cancelled */
- if (rc->rcb != NULL)
- rc->rcb (rc->rcb_cls, &rr->peer, amount,
+ if (rc->rcb != NULL )
+ rc->rcb (rc->rcb_cls,
+ &rr->peer,
+ amount,
GNUNET_TIME_relative_ntoh (rr->res_delay));
- GNUNET_free (rc);
+ GNUNET_free(rc);
return GNUNET_OK;
}
/* amount non-zero, but client cancelled, consider undo! */
if (GNUNET_YES != rc->undo)
{
- GNUNET_free (rc);
- return GNUNET_OK; /* do not try to undo failed undos or negative amounts */
+ GNUNET_free(rc);
+ return GNUNET_OK; /* do not try to undo failed undos or negative amounts */
}
- GNUNET_free (rc);
- (void) GNUNET_ATS_reserve_bandwidth (ph, &rr->peer, -amount, NULL, NULL);
+ GNUNET_free(rc);
+ (void) GNUNET_ATS_reserve_bandwidth (ph,
+ &rr->peer,
+ -amount,
+ NULL, NULL);
return GNUNET_OK;
}
*
* @param ph our context with the callback
* @param msg the message
- * @return GNUNET_OK if the message was well-formed
+ * @return #GNUNET_OK if the message was well-formed
*/
static int
process_ar_message (struct GNUNET_ATS_PerformanceHandle *ph,
uint32_t active;
uint32_t id;
- if (ntohs (msg->size) < sizeof (struct PeerInformationMessage))
+ if (ntohs (msg->size) < sizeof(struct PeerInformationMessage))
{
- GNUNET_break (0);
+ GNUNET_break(0);
return GNUNET_SYSERR;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Received %s message\n"), "ATS_ADDRESSLIST_RESPONSE");
-
pi = (const struct PeerInformationMessage *) msg;
id = ntohl (pi->id);
ats_count = ntohl (pi->ats_count);
atsi = (const struct GNUNET_ATS_Information *) &pi[1];
plugin_address = (const char *) &atsi[ats_count];
plugin_name = &plugin_address[plugin_address_length];
- if ((plugin_address_length + plugin_name_length +
- ats_count * sizeof (struct GNUNET_ATS_Information) +
- sizeof (struct PeerInformationMessage) != ntohs (msg->size)) ||
- (ats_count >
- GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_ATS_Information))
- || (plugin_name[plugin_name_length - 1] != '\0'))
+ if ( (plugin_address_length + plugin_name_length
+ + ats_count * sizeof(struct GNUNET_ATS_Information)
+ + sizeof (struct PeerInformationMessage) != ntohs (msg->size)) ||
+ (ats_count > GNUNET_SERVER_MAX_MESSAGE_SIZE
+ / sizeof(struct GNUNET_ATS_Information)) ||
+ (plugin_name[plugin_name_length - 1] != '\0') )
{
- GNUNET_break (0);
+ GNUNET_break(0);
return GNUNET_SYSERR;
}
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received %s message for peer %s and plugin %s\n",
+ "ATS_ADDRESSLIST_RESPONSE",
+ GNUNET_i2s (&pi->peer),
+ plugin_name);
next = ph->addresslist_head;
while (NULL != (alh = next))
{
- next = alh->next;
- if (alh->id == id)
- break;
+ next = alh->next;
+ if (alh->id == id)
+ break;
}
if (NULL == alh)
{
- /* was canceled */
- return GNUNET_SYSERR;
+ /* was canceled */
+ return GNUNET_SYSERR;
}
memset (&allzeros, '\0', sizeof (allzeros));
- if ((0 == memcmp (&allzeros, &pi->peer, sizeof (allzeros))) &&
- (0 == plugin_name_length) &&
- (0 == plugin_address_length) &&
- (0 == ats_count))
+ if ( (0 == memcmp (&allzeros, &pi->peer, sizeof(allzeros))) &&
+ (0 == plugin_name_length) &&
+ (0 == plugin_address_length) &&
+ (0 == ats_count) )
{
- /* Done */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- _("Received last message for %s \n"), "ATS_ADDRESSLIST_RESPONSE");
- bandwidth_zero.value__ = htonl (0);
- if (NULL != alh->cb)
- alh->cb (ph->addr_info_cb_cls,
- NULL,
- GNUNET_NO,
- bandwidth_zero, bandwidth_zero,
- NULL, 0);
- GNUNET_CONTAINER_DLL_remove (ph->addresslist_head, ph->addresslist_tail, alh);
- GNUNET_free (alh);
- return GNUNET_OK;
+ /* Done */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received last message for %s\n",
+ "ATS_ADDRESSLIST_RESPONSE");
+ bandwidth_zero.value__ = htonl (0);
+ GNUNET_CONTAINER_DLL_remove (ph->addresslist_head,
+ ph->addresslist_tail,
+ alh);
+ if (NULL != alh->cb)
+ alh->cb (ph->addr_info_cb_cls,
+ NULL,
+ GNUNET_NO,
+ bandwidth_zero,
+ bandwidth_zero,
+ NULL, 0);
+ GNUNET_free (alh);
+ return GNUNET_OK;
}
address.peer = pi->peer;
address.address = plugin_address;
address.address_length = plugin_address_length;
address.transport_name = plugin_name;
-
- if ((GNUNET_YES == alh->all_addresses) || (GNUNET_YES == active))
- {
- if (NULL != alh->cb)
- alh->cb (ph->addr_info_cb_cls,
- &address,
- active,
- pi->bandwidth_out, pi->bandwidth_in,
- atsi, ats_count);
- }
+ if ( ( (GNUNET_YES == alh->all_addresses) ||
+ (GNUNET_YES == active) ) &&
+ (NULL != alh->cb) )
+ alh->cb (ph->addr_info_cb_cls,
+ &address,
+ active,
+ pi->bandwidth_out,
+ pi->bandwidth_in,
+ atsi, ats_count);
return GNUNET_OK;
}
* @param msg message received, NULL on timeout or fatal error
*/
static void
-process_ats_message (void *cls, const struct GNUNET_MessageHeader *msg)
+process_ats_message (void *cls,
+ const struct GNUNET_MessageHeader *msg)
{
struct GNUNET_ATS_PerformanceHandle *ph = cls;
goto reconnect;
break;
default:
- GNUNET_break (0);
+ GNUNET_break(0);
goto reconnect;
}
- GNUNET_CLIENT_receive (ph->client, &process_ats_message, ph,
+ GNUNET_CLIENT_receive (ph->client,
+ &process_ats_message,
+ ph,
GNUNET_TIME_UNIT_FOREVER_REL);
return;
-reconnect:
+
+ reconnect:
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Reconnecting!\n");
if (NULL != ph->th)
{
GNUNET_CLIENT_notify_transmit_ready_cancel (ph->th);
}
GNUNET_CLIENT_disconnect (ph->client);
ph->client = NULL;
- ph->task =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &reconnect_task,
- ph);
+ if (NULL != ph->addr_info_cb)
+ {
+ /* Indicate reconnect */
+ ph->addr_info_cb (ph->addr_info_cb_cls,
+ NULL,
+ GNUNET_NO,
+ GNUNET_BANDWIDTH_value_init (0),
+ GNUNET_BANDWIDTH_value_init (0),
+ NULL, 0);
+ }
+ ph->task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+ &reconnect_task, ph);
}
struct ClientStartMessage *init;
GNUNET_assert (NULL == ph->client);
- ph->client = GNUNET_CLIENT_connect ("ats", ph->cfg);
+ ph->client = GNUNET_CLIENT_connect ("ats",
+ ph->cfg);
GNUNET_assert (NULL != ph->client);
+ GNUNET_CLIENT_receive (ph->client,
+ &process_ats_message,
+ ph,
+ GNUNET_TIME_UNIT_FOREVER_REL);
if ((NULL == (p = ph->pending_head)) || (GNUNET_YES != p->is_init))
{
p = GNUNET_malloc (sizeof (struct PendingMessage) +
- sizeof (struct ClientStartMessage));
- p->size = sizeof (struct ClientStartMessage);
+ sizeof (struct ClientStartMessage));
+ p->size = sizeof(struct ClientStartMessage);
p->is_init = GNUNET_YES;
init = (struct ClientStartMessage *) &p[1];
init->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_START);
- init->header.size = htons (sizeof (struct ClientStartMessage));
- init->start_flag =
- htonl ((NULL ==ph->addr_info_cb) ?
- START_FLAG_PERFORMANCE_NO_PIC : START_FLAG_PERFORMANCE_WITH_PIC);
- GNUNET_CONTAINER_DLL_insert (ph->pending_head, ph->pending_tail, p);
+ init->header.size = htons (sizeof(struct ClientStartMessage));
+ init->start_flag = htonl ( (NULL == ph->addr_info_cb)
+ ? START_FLAG_PERFORMANCE_NO_PIC
+ : START_FLAG_PERFORMANCE_WITH_PIC);
+ GNUNET_CONTAINER_DLL_insert (ph->pending_head,
+ ph->pending_tail,
+ p);
}
do_transmit (ph);
}
-
/**
* Get handle to access performance API of the ATS subsystem.
*
* @param cfg configuration to use
* @param addr_info_cb callback called when performance characteristics for
* an address change
- * @param addr_info_cb_cls closure for infocb
+ * @param addr_info_cb_cls closure for @a addr_info_cb
* @return ats performance context
*/
struct GNUNET_ATS_PerformanceHandle *
{
struct GNUNET_ATS_PerformanceHandle *ph;
- ph = GNUNET_malloc (sizeof (struct GNUNET_ATS_PerformanceHandle));
+ ph = GNUNET_new (struct GNUNET_ATS_PerformanceHandle);
ph->cfg = cfg;
ph->addr_info_cb = addr_info_cb;
ph->addr_info_cb_cls = addr_info_cb_cls;
- ph->id = 0;
+ ph->id = 0;
reconnect (ph);
return ph;
}
+
/**
* Client is done using the ATS performance subsystem, release resources.
*
while (NULL != (p = ph->pending_head))
{
- GNUNET_CONTAINER_DLL_remove (ph->pending_head, ph->pending_tail, p);
+ GNUNET_CONTAINER_DLL_remove (ph->pending_head,
+ ph->pending_tail,
+ p);
GNUNET_free (p);
}
while (NULL != (alh = ph->addresslist_head))
{
- GNUNET_CONTAINER_DLL_remove (ph->addresslist_head, ph->addresslist_tail,
+ GNUNET_CONTAINER_DLL_remove (ph->addresslist_head,
+ ph->addresslist_tail,
alh);
GNUNET_free (alh);
}
while (NULL != (rc = ph->reservation_head))
{
- GNUNET_CONTAINER_DLL_remove (ph->reservation_head, ph->reservation_tail,
+ GNUNET_CONTAINER_DLL_remove (ph->reservation_head,
+ ph->reservation_tail,
rc);
GNUNET_break (NULL == rc->rcb);
GNUNET_free (rc);
}
- if (GNUNET_SCHEDULER_NO_TASK != ph->task)
+ if (NULL != ph->task)
{
GNUNET_SCHEDULER_cancel (ph->task);
- ph->task = GNUNET_SCHEDULER_NO_TASK;
+ ph->task = NULL;
}
if (NULL != ph->client)
{
* @param amount reserve N bytes for receiving, negative
* amounts can be used to undo a (recent) reservation;
* @param rcb function to call with the resulting reservation information
- * @param rcb_cls closure for info
+ * @param rcb_cls closure for @a rcb
* @return NULL on error
* @deprecated will be replaced soon
*/
struct PendingMessage *p;
struct ReservationRequestMessage *m;
- rc = GNUNET_malloc (sizeof (struct GNUNET_ATS_ReservationContext));
+ rc = GNUNET_new (struct GNUNET_ATS_ReservationContext);
rc->size = amount;
rc->peer = *peer;
rc->rcb = rcb;
rc->rcb_cls = rcb_cls;
- if ((rcb != NULL) && (amount > 0))
+ if ( (NULL != rcb) &&
+ (amount > 0) )
rc->undo = GNUNET_YES;
- GNUNET_CONTAINER_DLL_insert_tail (ph->reservation_head, ph->reservation_tail,
+ GNUNET_CONTAINER_DLL_insert_tail (ph->reservation_head,
+ ph->reservation_tail,
rc);
p = GNUNET_malloc (sizeof (struct PendingMessage) +
- sizeof (struct ReservationRequestMessage));
- p->size = sizeof (struct ReservationRequestMessage);
+ sizeof (struct ReservationRequestMessage));
+ p->size = sizeof(struct ReservationRequestMessage);
p->is_init = GNUNET_NO;
m = (struct ReservationRequestMessage *) &p[1];
m->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_RESERVATION_REQUEST);
- m->header.size = htons (sizeof (struct ReservationRequestMessage));
+ m->header.size = htons (sizeof(struct ReservationRequestMessage));
m->amount = htonl (amount);
m->peer = *peer;
- GNUNET_CONTAINER_DLL_insert_tail (ph->pending_head, ph->pending_tail, p);
+ GNUNET_CONTAINER_DLL_insert_tail (ph->pending_head,
+ ph->pending_tail,
+ p);
do_transmit (ph);
return rc;
}
rc->rcb = NULL;
}
+
/**
* Get information about addresses known to the ATS subsystem.
*
* @param handle the performance handle to use
* @param peer peer idm can be NULL for all peers
- * @param all GNUNET_YES to get information about all addresses or GNUNET_NO to
+ * @param all #GNUNET_YES to get information about all addresses or #GNUNET_NO to
* get only address currently used
* @param infocb callback to call with the addresses,
* will callback with address == NULL when done
- * @param infocb_cls closure for infocb
+ * @param infocb_cls closure for @a infocb
* @return ats performance context
*/
struct GNUNET_ATS_AddressListHandle*
struct PendingMessage *p;
struct AddressListRequestMessage *m;
- GNUNET_assert (NULL != handle);
if (NULL == infocb)
return NULL;
-
- alh = GNUNET_malloc (sizeof (struct GNUNET_ATS_AddressListHandle));
+ alh = GNUNET_new (struct GNUNET_ATS_AddressListHandle);
alh->id = handle->id;
- handle->id ++;
+ handle->id++;
alh->cb = infocb;
alh->cb_cls = infocb_cls;
alh->ph = handle;
alh->all_addresses = all;
if (NULL == peer)
+ {
alh->all_peers = GNUNET_YES;
+ }
else
{
- alh->all_peers = GNUNET_NO;
- alh->peer = (*peer);
+ alh->all_peers = GNUNET_NO;
+ alh->peer = *peer;
}
-
- GNUNET_CONTAINER_DLL_insert (handle->addresslist_head, handle->addresslist_tail, alh);
+ GNUNET_CONTAINER_DLL_insert (handle->addresslist_head,
+ handle->addresslist_tail,
+ alh);
p = GNUNET_malloc (sizeof (struct PendingMessage) +
sizeof (struct AddressListRequestMessage));
p->size = sizeof (struct AddressListRequestMessage);
m = (struct AddressListRequestMessage *) &p[1];
m->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_ADDRESSLIST_REQUEST);
- m->header.size = htons (sizeof (struct AddressListRequestMessage));
+ m->header.size = htons (sizeof(struct AddressListRequestMessage));
m->all = htonl (all);
m->id = htonl (alh->id);
if (NULL != peer)
m->peer = *peer;
- else
- {
- memset (&m->peer, '\0', sizeof (struct GNUNET_PeerIdentity));
- }
- GNUNET_CONTAINER_DLL_insert_tail (handle->pending_head, handle->pending_tail, p);
-
+ GNUNET_CONTAINER_DLL_insert_tail (handle->pending_head,
+ handle->pending_tail,
+ p);
do_transmit (handle);
return alh;
/**
* Cancel a pending address listing operation
*
- * @param handle the GNUNET_ATS_AddressListHandle handle to cancel
+ * @param handle the handle of the request to cancel
*/
void
GNUNET_ATS_performance_list_addresses_cancel (struct GNUNET_ATS_AddressListHandle *handle)
{
- GNUNET_assert (NULL != handle);
-
- GNUNET_CONTAINER_DLL_remove (handle->ph->addresslist_head, handle->ph->addresslist_tail, handle);
+ GNUNET_CONTAINER_DLL_remove (handle->ph->addresslist_head,
+ handle->ph->addresslist_tail,
+ handle);
GNUNET_free (handle);
}
/**
- * Convert a GNUNET_ATS_PreferenceType to a string
+ * Convert a `enum GNUNET_ATS_PreferenceType` to a string
*
* @param type the preference type
* @return a string or NULL if invalid
*/
void
GNUNET_ATS_performance_change_preference (struct GNUNET_ATS_PerformanceHandle *ph,
- const struct GNUNET_PeerIdentity *peer, ...)
+ const struct GNUNET_PeerIdentity *peer, ...)
{
struct PendingMessage *p;
struct ChangePreferenceMessage *m;
enum GNUNET_ATS_PreferenceKind kind;
count = 0;
- va_start (ap, peer);
- while (GNUNET_ATS_PREFERENCE_END !=
- (kind = va_arg (ap, enum GNUNET_ATS_PreferenceKind)))
+ va_start(ap, peer);
+ while (GNUNET_ATS_PREFERENCE_END != (kind =
+ va_arg (ap, enum GNUNET_ATS_PreferenceKind) ))
{
switch (kind)
{
break;
default:
- GNUNET_assert (0);
+ GNUNET_assert(0);
}
}
- va_end (ap);
- msize =
- count * sizeof (struct PreferenceInformation) +
- sizeof (struct ChangePreferenceMessage);
+ va_end(ap);
+ msize = count * sizeof(struct PreferenceInformation)
+ + sizeof(struct ChangePreferenceMessage);
p = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
p->size = msize;
p->is_init = GNUNET_NO;
m->peer = *peer;
pi = (struct PreferenceInformation *) &m[1];
count = 0;
- va_start (ap, peer);
- while (GNUNET_ATS_PREFERENCE_END !=
- (kind = va_arg (ap, enum GNUNET_ATS_PreferenceKind)))
+ va_start(ap, peer);
+ while (GNUNET_ATS_PREFERENCE_END != (kind =
+ va_arg (ap, enum GNUNET_ATS_PreferenceKind) ))
{
pi[count].preference_kind = htonl (kind);
switch (kind)
count++;
break;
default:
- GNUNET_assert (0);
+ GNUNET_assert(0);
}
}
- va_end (ap);
- GNUNET_CONTAINER_DLL_insert_tail (ph->pending_head, ph->pending_tail, p);
+ va_end(ap);
+ GNUNET_CONTAINER_DLL_insert_tail(ph->pending_head, ph->pending_tail, p);
do_transmit (ph);
}
+
/**
* Send feedback to ATS on how good a the requirements for a peer and a
* preference is satisfied by ATS
*/
void
GNUNET_ATS_performance_give_feedback (struct GNUNET_ATS_PerformanceHandle *ph,
- const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_TIME_Relative scope, ...)
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_TIME_Relative scope, ...)
{
struct PendingMessage *p;
struct FeedbackPreferenceMessage *m;
enum GNUNET_ATS_PreferenceKind kind;
count = 0;
- va_start (ap, scope);
- while (GNUNET_ATS_PREFERENCE_END !=
- (kind = va_arg (ap, enum GNUNET_ATS_PreferenceKind)))
+ va_start(ap, scope);
+ while (GNUNET_ATS_PREFERENCE_END != (kind =
+ va_arg (ap, enum GNUNET_ATS_PreferenceKind) ))
{
switch (kind)
{
case GNUNET_ATS_PREFERENCE_BANDWIDTH:
count++;
(void) va_arg (ap, double);
-
break;
case GNUNET_ATS_PREFERENCE_LATENCY:
count++;
(void) va_arg (ap, double);
-
break;
default:
- GNUNET_assert (0);
+ GNUNET_assert(0);
}
}
- va_end (ap);
- msize =
- count * sizeof (struct PreferenceInformation) +
- sizeof (struct FeedbackPreferenceMessage);
+ va_end(ap);
+ msize = count * sizeof(struct PreferenceInformation)
+ + sizeof(struct FeedbackPreferenceMessage);
p = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
p->size = msize;
p->is_init = GNUNET_NO;
m->peer = *peer;
pi = (struct PreferenceInformation *) &m[1];
count = 0;
- va_start (ap, scope);
- while (GNUNET_ATS_PREFERENCE_END !=
- (kind = va_arg (ap, enum GNUNET_ATS_PreferenceKind)))
+ va_start(ap, scope);
+ while (GNUNET_ATS_PREFERENCE_END != (kind =
+ va_arg (ap, enum GNUNET_ATS_PreferenceKind) ))
{
pi[count].preference_kind = htonl (kind);
switch (kind)
count++;
break;
default:
- GNUNET_assert (0);
+ GNUNET_assert(0);
}
}
- va_end (ap);
- GNUNET_CONTAINER_DLL_insert_tail (ph->pending_head, ph->pending_tail, p);
+ va_end(ap);
+ GNUNET_CONTAINER_DLL_insert_tail (ph->pending_head,
+ ph->pending_tail,
+ p);
do_transmit (ph);
}
projects / oweals / gnunet.git / blobdiff