/*
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
};
-/**
- * Context for blacklist checks and the #try_connect_bl_check_cont()
- * function. Stores information about ongoing blacklist checks.
- */
-struct BlackListCheckContext
-{
-
- /**
- * We keep blacklist checks in a DLL.
- */
- struct BlackListCheckContext *next;
-
- /**
- * We keep blacklist checks in a DLL.
- */
- struct BlackListCheckContext *prev;
-
- /**
- * Address that is being checked.
- */
- struct NeighbourAddress na;
-
- /**
- * Handle to the ongoing blacklist check.
- */
- struct GST_BlacklistCheck *bc;
-};
-
-
/**
* Hash map from peer identities to the respective `struct NeighbourMapEntry`.
*/
static struct GNUNET_CONTAINER_MultiPeerMap *neighbours;
-/**
- * We keep blacklist checks in a DLL so that we can find
- * the 'sessions' in their 'struct NeighbourAddress' if
- * a session goes down.
- */
-static struct BlackListCheckContext *bc_head;
-
-/**
- * We keep blacklist checks in a DLL.
- */
-static struct BlackListCheckContext *bc_tail;
-
/**
* List of pending blacklist checks: head
*/
* clean up after disconnect).
*
* @param cls the `struct NeighbourMapEntry` for which we are running
- * @param tc scheduler context (unused)
*/
static void
-master_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc);
+master_task (void *cls);
/**
if (bytes_in_send_queue < mq->message_buf_size)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Bytes_in_send_queue `%u', Message_size %u, result: %s, payload %u, on wire %u\n",
+ "Bytes_in_send_queue `%llu', Message_size %u, result: %s, payload %u, on wire %u\n",
bytes_in_send_queue,
- mq->message_buf_size,
+ (unsigned int) mq->message_buf_size,
(GNUNET_OK == success) ? "OK" : "FAIL",
- size_payload,
- physical);
+ (unsigned int) size_payload,
+ (unsigned int) physical);
GNUNET_break (0);
}
"Sending message to `%s' of type %u with %u bytes was a %s\n",
GNUNET_i2s (receiver),
ntohs (((struct GNUNET_MessageHeader *) mq->message_buf)->type),
- mq->message_buf_size,
+ (unsigned int) mq->message_buf_size,
(success == GNUNET_OK) ? "success" : "FAILURE");
if (NULL != mq->cont)
mq->cont (mq->cont_cls,
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Giving message with %u bytes to plugin session %p\n",
- mq->message_buf_size,
+ (unsigned int) mq->message_buf_size,
n->primary_address.session);
(void) send_with_session (n,
mq->message_buf,
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Enqueueing %u bytes to send to peer %s\n",
- msg_size,
+ (unsigned int) msg_size,
GNUNET_i2s (target));
GNUNET_CONTAINER_DLL_insert_tail (n->messages_head,
n->messages_tail,
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"New inbound delay for peer `%s' is %llu ms\n",
GNUNET_i2s (&n->id),
- delay.rel_value_us / 1000);
+ (unsigned long long) delay.rel_value_us / 1000LL);
papi->update_inbound_delay (papi->cls,
&n->id,
n->primary_address.session,
* Task transmitting utilization in a regular interval
*
* @param cls the 'struct NeighbourMapEntry' for which we are running
- * @param tc scheduler context (unused)
*/
static void
-utilization_transmission (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+utilization_transmission (void *cls)
{
util_transmission_tk = NULL;
GNUNET_CONTAINER_multipeermap_iterate (neighbours,
* clean up after disconnect).
*
* @param cls the 'struct NeighbourMapEntry' for which we are running
- * @param tc scheduler context (unused)
*/
static void
-master_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+master_task (void *cls)
{
struct NeighbourMapEntry *n = cls;
struct GNUNET_TIME_Relative delay;
struct GNUNET_ATS_Session *session)
{
struct NeighbourMapEntry *n;
- struct BlackListCheckContext *bcc;
- struct BlackListCheckContext *bcc_next;
- /* make sure to cancel all ongoing blacklist checks involving 'session' */
- bcc_next = bc_head;
- while (NULL != (bcc = bcc_next))
- {
- bcc_next = bcc->next;
- if (bcc->na.session == session)
- {
- if (NULL != bcc->bc)
- GST_blacklist_test_cancel (bcc->bc);
- GNUNET_HELLO_address_free (bcc->na.address);
- GNUNET_CONTAINER_DLL_remove (bc_head,
- bc_tail,
- bcc);
- GNUNET_free (bcc);
- }
- }
if (NULL == (n = lookup_neighbour (peer)))
return GNUNET_NO; /* can't affect us */
if (session != n->primary_address.session)
/* The session used to send the SYN terminated:
* this implies a connect error*/
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Failed to send SYN in %s with `%s' %p: session terminated\n",
- "CONNECT_SENT",
+ "Failed to send SYN in CONNECT_SENT with `%s' %p: session terminated\n",
GST_plugins_a2s (n->primary_address.address),
- n->primary_address.session,
- GNUNET_i2s (peer));
+ n->primary_address.session);
/* Destroy the address since it cannot be used */
unset_primary_address (n);
break;
case GNUNET_TRANSPORT_PS_RECONNECT_SENT:
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Failed to send SYN in %s with `%s' %p: session terminated\n",
- "RECONNECT_SENT",
+ "Failed to send SYN in RECONNECT_SENT with `%s' %p: session terminated\n",
GST_plugins_a2s (n->primary_address.address),
- n->primary_address.session,
- GNUNET_i2s (peer));
+ n->primary_address.session);
/* Destroy the address since it cannot be used */
unset_primary_address (n);
set_state_and_timeout (n,
* Task to asynchronously run #free_neighbour().
*
* @param cls the `struct NeighbourMapEntry` to free
- * @param tc unused
*/
static void
-delayed_disconnect (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext* tc)
+delayed_disconnect (void *cls)
{
struct NeighbourMapEntry *n = cls;
void
GST_neighbours_stop ()
{
- struct BlacklistCheckSwitchContext *cur;
- struct BlacklistCheckSwitchContext *next;
-
if (NULL == neighbours)
return;
if (NULL != util_transmission_tk)
NULL);
GNUNET_CONTAINER_multipeermap_destroy (neighbours);
neighbours = NULL;
- next = pending_bc_head;
- for (cur = next; NULL != cur; cur = next)
- {
- next = cur->next;
- GNUNET_CONTAINER_DLL_remove (pending_bc_head,
- pending_bc_tail,
- cur);
-
- if (NULL != cur->blc)
- {
- GST_blacklist_test_cancel (cur->blc);
- cur->blc = NULL;
- }
- GNUNET_free (cur);
- }
}