/*
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
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.
*/
/**
#include "platform.h"
#include "gnunet_ats_service.h"
#include "gnunet-service-transport_ats.h"
-#include "gnunet-service-transport_blacklist.h"
-#include "gnunet-service-transport_clients.h"
#include "gnunet-service-transport_neighbours.h"
#include "gnunet-service-transport_manipulation.h"
#include "gnunet-service-transport_plugins.h"
#include "gnunet_constants.h"
#include "transport.h"
+/**
+ * Experimental option to ignore SessionQuotaMessages from
+ * the other peer.
+ */
+#define IGNORE_INBOUND_QUOTA GNUNET_YES
/**
* Size of the neighbour hash map.
* When the keep alive response with type is received, transport service
* will call the respective plugin to update the session timeout
*/
-struct SessionKeepAliveMessage
+struct GNUNET_ATS_SessionKeepAliveMessage
{
/**
* Header of type #GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE or
uint32_t nonce GNUNET_PACKED;
};
+
+/**
+ * Message a peer sends to another when connected to indicate that
+ * the other peer should limit transmissions to the indicated
+ * quota.
+ */
+struct GNUNET_ATS_SessionQuotaMessage
+{
+ /**
+ * Header of type #GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_QUOTA.
+ */
+ struct GNUNET_MessageHeader header;
+
+ /**
+ * Quota to use (for sending), in bytes per second.
+ */
+ uint32_t quota GNUNET_PACKED;
+};
+
+
/**
* Message we send to the other peer to notify him that we intentionally
* are disconnecting (to reduce timeouts). This is just a friendly
* notification, peers must not rely on always receiving disconnect
* messages.
*/
-struct SessionDisconnectMessage
+struct GNUNET_ATS_SessionDisconnectMessage
{
/**
* Header of type #GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT
/**
* Active session for this address.
*/
- struct Session *session;
+ struct GNUNET_ATS_Session *session;
/**
* Network-level address information.
/**
* Main task that drives this peer (timeouts, keepalives, etc.).
- * Always runs the 'master_task'.
+ * Always runs the #master_task().
*/
struct GNUNET_SCHEDULER_Task *task;
/**
* Time where we should cut the connection (timeout) if we don't
* make progress in the state machine (or get a KEEPALIVE_RESPONSE
- * if we are in #S_CONNECTED).
+ * if we are in #GNUNET_TRANSPORT_PS_CONNECTED).
*/
struct GNUNET_TIME_Absolute timeout;
*/
unsigned int quota_violation_count;
+ /**
+ * Latest quota the other peer send us in bytes per second.
+ * We should not send more, least the other peer throttle
+ * receiving our traffic.
+ */
+ struct GNUNET_BANDWIDTH_Value32NBO neighbour_receive_quota;
+
/**
* The current state of the peer.
*/
};
-/**
- * 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
*/
}
+/**
+ * Send information about a new outbound quota to our clients.
+ * Note that the outbound quota is enforced client-side (i.e.
+ * in libgnunettransport).
+ *
+ * @param n affected peer
+ */
+static void
+send_outbound_quota_to_clients (struct NeighbourMapEntry *n)
+{
+ struct QuotaSetMessage q_msg;
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_min;
+
+ if (! GNUNET_TRANSPORT_is_connected (n->state))
+ return;
+#if IGNORE_INBOUND_QUOTA
+ bandwidth_min = n->primary_address.bandwidth_out;
+#else
+ bandwidth_min = GNUNET_BANDWIDTH_value_min (n->primary_address.bandwidth_out,
+ n->neighbour_receive_quota);
+#endif
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending outbound quota of %u Bps for peer `%s' to all clients\n",
+ ntohl (bandwidth_min.value__),
+ GNUNET_i2s (&n->id));
+ q_msg.header.size = htons (sizeof (struct QuotaSetMessage));
+ q_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA);
+ q_msg.quota = bandwidth_min;
+ q_msg.peer = n->id;
+ GST_clients_broadcast (&q_msg.header,
+ GNUNET_NO);
+}
+
+
/**
* Notify our clients that another peer connected to us.
*
- * @param peer the peer that connected
- * @param bandwidth_in inbound bandwidth in NBO
- * @param bandwidth_out outbound bandwidth in NBO
+ * @param n the peer that connected
*/
static void
-neighbours_connect_notification (const struct GNUNET_PeerIdentity *peer,
- struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
- struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
+neighbours_connect_notification (struct NeighbourMapEntry *n)
{
size_t len = sizeof(struct ConnectInfoMessage);
char buf[len] GNUNET_ALIGN;
struct ConnectInfoMessage *connect_msg = (struct ConnectInfoMessage *) buf;
-
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_min;
+
+#if IGNORE_INBOUND_QUOTA
+ bandwidth_min = n->primary_address.bandwidth_out;
+#else
+ bandwidth_min = GNUNET_BANDWIDTH_value_min (n->primary_address.bandwidth_out,
+ n->neighbour_receive_quota);
+#endif
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"We are now connected to peer `%s'\n",
- GNUNET_i2s (peer));
+ GNUNET_i2s (&n->id));
connect_msg->header.size = htons (sizeof(buf));
connect_msg->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_CONNECT);
- connect_msg->id = *peer;
- connect_msg->quota_in = bandwidth_in;
- connect_msg->quota_out = bandwidth_out;
- GST_clients_broadcast (&connect_msg->header, GNUNET_NO);
+ connect_msg->id = n->id;
+ connect_msg->quota_in = n->primary_address.bandwidth_in;
+ connect_msg->quota_out = bandwidth_min;
+ GST_clients_broadcast (&connect_msg->header,
+ GNUNET_NO);
}
* Notify our clients (and manipulation) that a peer disconnected from
* us.
*
- * @param peer the peer that disconnected
+ * @param n the peer that disconnected
*/
static void
-neighbours_disconnect_notification (const struct GNUNET_PeerIdentity *peer)
+neighbours_disconnect_notification (struct NeighbourMapEntry *n)
{
- struct DisconnectInfoMessage disconnect_msg;
-
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Peer `%s' disconnected\n",
- GNUNET_i2s (peer));
- GST_manipulation_peer_disconnect (peer);
- disconnect_msg.header.size = htons (sizeof(struct DisconnectInfoMessage));
- disconnect_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT);
- disconnect_msg.reserved = htonl (0);
- disconnect_msg.peer = *peer;
- GST_clients_broadcast (&disconnect_msg.header,
- GNUNET_NO);
+ GNUNET_i2s (&n->id));
+ GST_manipulation_peer_disconnect (&n->id);
+ GST_clients_broadcast_disconnect (&n->id);
}
}
-/**
- * Send information about a new outbound quota to our clients.
- *
- * @param target affected peer
- * @param quota new quota
- */
-static void
-send_outbound_quota (const struct GNUNET_PeerIdentity *target,
- struct GNUNET_BANDWIDTH_Value32NBO quota)
-{
- struct QuotaSetMessage q_msg;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending outbound quota of %u Bps for peer `%s' to all clients\n",
- ntohl (quota.value__),
- GNUNET_i2s (target));
- q_msg.header.size = htons (sizeof (struct QuotaSetMessage));
- q_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA);
- q_msg.quota = quota;
- q_msg.peer = (*target);
- GST_clients_broadcast (&q_msg.header, GNUNET_NO);
-}
-
-
/**
* We don't need a given neighbour address any more.
* Release its resources and give appropriate notifications
* 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 (GNUNET_TRANSPORT_is_connected (s) &&
! GNUNET_TRANSPORT_is_connected (n->state) )
{
- neighbours_connect_notification (&n->id,
- n->primary_address.bandwidth_in,
- n->primary_address.bandwidth_out);
+ neighbours_connect_notification (n);
GNUNET_STATISTICS_set (GST_stats,
gettext_noop ("# peers connected"),
++neighbours_connected,
gettext_noop ("# peers connected"),
--neighbours_connected,
GNUNET_NO);
- neighbours_disconnect_notification (&n->id);
+ neighbours_disconnect_notification (n);
}
n->state = s;
if ( (timeout.abs_value_us < n->timeout.abs_value_us) &&
{
/* new timeout is earlier, reschedule master task */
GNUNET_SCHEDULER_cancel (n->task);
- n->task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining (timeout),
- &master_task,
- n);
+ n->task = GNUNET_SCHEDULER_add_at (timeout,
+ &master_task,
+ n);
}
n->timeout = timeout;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
static void
set_alternative_address (struct NeighbourMapEntry *n,
const struct GNUNET_HELLO_Address *address,
- struct Session *session,
+ struct GNUNET_ATS_Session *session,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
{
n->alternative_address.session = session;
n->alternative_address.ats_active = GNUNET_NO;
n->alternative_address.keep_alive_nonce = 0;
+ GNUNET_assert (GNUNET_YES ==
+ GST_ats_is_known (n->alternative_address.address,
+ n->alternative_address.session));
}
/**
- * Initialize the primary address of a neighbour
+ * Transmit a message using the current session of the given
+ * neighbour.
*
- * @param n the neighbour
- * @param address address of the other peer, NULL if other peer
- * connected to us
- * @param session session to use (or NULL, in which case an
- * address must be setup)
- * @param bandwidth_in inbound quota to be used when connection is up
- * @param bandwidth_out outbound quota to be used when connection is up
- * @param is_active #GNUNET_YES to mark this as the active address with ATS
+ * @param n entry for the recipient
+ * @param msgbuf buffer to transmit
+ * @param msgbuf_size number of bytes in @a msgbuf buffer
+ * @param priority transmission priority
+ * @param timeout transmission timeout
+ * @param use_keepalive_timeout #GNUNET_YES to use plugin-specific keep-alive
+ * timeout (@a timeout is ignored in that case), #GNUNET_NO otherwise
+ * @param cont continuation to call when finished (can be NULL)
+ * @param cont_cls closure for @a cont
+ * @return timeout (copy of @a timeout or a calculated one if
+ * @a use_keepalive_timeout is #GNUNET_YES.
*/
-static void
-set_primary_address (struct NeighbourMapEntry *n,
- const struct GNUNET_HELLO_Address *address,
- struct Session *session,
- struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
- struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
- int is_active)
+static struct GNUNET_TIME_Relative
+send_with_session (struct NeighbourMapEntry *n,
+ const void *msgbuf,
+ size_t msgbuf_size,
+ uint32_t priority,
+ struct GNUNET_TIME_Relative timeout,
+ unsigned int use_keepalive_timeout,
+ GNUNET_TRANSPORT_TransmitContinuation cont,
+ void *cont_cls)
{
- if (session == n->primary_address.session)
- {
- if (is_active != n->primary_address.ats_active)
- {
- n->primary_address.ats_active = is_active;
- GST_validation_set_address_use (n->primary_address.address,
- is_active);
- }
- if (GNUNET_YES == is_active)
- {
- if (n->primary_address.bandwidth_in.value__ != bandwidth_in.value__)
- {
- n->primary_address.bandwidth_in = bandwidth_in;
- GST_neighbours_set_incoming_quota (&address->peer, bandwidth_in);
- }
- if (n->primary_address.bandwidth_out.value__ != bandwidth_out.value__)
- {
- n->primary_address.bandwidth_out = bandwidth_out;
- send_outbound_quota (&address->peer,
- bandwidth_out);
- }
- }
- return;
- }
- if ( (NULL != n->primary_address.address) &&
- (0 == GNUNET_HELLO_address_cmp (address,
- n->primary_address.address)) )
- {
- GNUNET_break (0);
- return;
- }
- if (NULL == session)
- {
- GNUNET_break (0);
- GST_ats_block_address (address,
- session);
- return;
- }
- if (NULL != n->primary_address.address)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Replacing existing primary address with another one\n");
- free_address (&n->primary_address);
- }
- n->primary_address.address = GNUNET_HELLO_address_copy (address);
- n->primary_address.bandwidth_in = bandwidth_in;
- n->primary_address.bandwidth_out = bandwidth_out;
- n->primary_address.session = session;
- n->primary_address.ats_active = is_active;
- n->primary_address.keep_alive_nonce = 0;
- if (GNUNET_YES == is_active)
- {
- /* subsystems about address use */
- GST_validation_set_address_use (n->primary_address.address,
- GNUNET_YES);
- GST_neighbours_set_incoming_quota (&address->peer, bandwidth_in);
- send_outbound_quota (&address->peer,
- bandwidth_out);
- }
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Neighbour `%s' switched to address `%s'\n",
- GNUNET_i2s (&n->id),
- GST_plugins_a2s(address));
+ struct GNUNET_TRANSPORT_PluginFunctions *papi;
+ struct GNUNET_TIME_Relative result = GNUNET_TIME_UNIT_FOREVER_REL;
- neighbours_changed_notification (&n->id,
- n->primary_address.address,
- n->state,
- n->timeout,
- n->primary_address.bandwidth_in,
- n->primary_address.bandwidth_out);
+ GNUNET_assert (NULL != n->primary_address.session);
+ if ( ((NULL == (papi = GST_plugins_find (n->primary_address.address->transport_name)) ||
+ (-1 == papi->send (papi->cls,
+ n->primary_address.session,
+ msgbuf,
+ msgbuf_size,
+ priority,
+ (result = (GNUNET_NO == use_keepalive_timeout) ? timeout :
+ GNUNET_TIME_relative_divide (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
+ papi->query_keepalive_factor (papi->cls))),
+ cont,
+ cont_cls)))) &&
+ (NULL != cont))
+ cont (cont_cls,
+ &n->id,
+ GNUNET_SYSERR,
+ msgbuf_size,
+ 0);
+ GST_neighbours_notify_data_sent (n->primary_address.address,
+ n->primary_address.session,
+ msgbuf_size);
+ GNUNET_break (NULL != papi);
+ return result;
}
}
-/**
- * Transmit a message using the current session of the given
- * neighbour.
- *
- * @param n entry for the recipient
- * @param msgbuf buffer to transmit
- * @param msgbuf_size number of bytes in @a msgbuf buffer
- * @param priority transmission priority
- * @param timeout transmission timeout
- * @param use_keepalive_timeout #GNUNET_YES to use plugin-specific keep-alive
- * timeout (@a timeout is ignored in that case), #GNUNET_NO otherwise
- * @param cont continuation to call when finished (can be NULL)
- * @param cont_cls closure for @a cont
- * @return timeout (copy of @a timeout or a calculated one if
- * @a use_keepalive_timeout is #GNUNET_YES.
- */
-static struct GNUNET_TIME_Relative
-send_with_session (struct NeighbourMapEntry *n,
- const void *msgbuf,
- size_t msgbuf_size,
- uint32_t priority,
- struct GNUNET_TIME_Relative timeout,
- unsigned int use_keepalive_timeout,
- GNUNET_TRANSPORT_TransmitContinuation cont,
- void *cont_cls)
-{
- struct GNUNET_TRANSPORT_PluginFunctions *papi;
- struct GNUNET_TIME_Relative result = GNUNET_TIME_UNIT_FOREVER_REL;
-
- GNUNET_assert (n->primary_address.session != NULL);
- if ( ((NULL == (papi = GST_plugins_find (n->primary_address.address->transport_name)) ||
- (-1 == papi->send (papi->cls,
- n->primary_address.session,
- msgbuf,
- msgbuf_size,
- priority,
- (result = (GNUNET_NO == use_keepalive_timeout) ? timeout :
- GNUNET_TIME_relative_divide (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
- papi->query_keepalive_factor (papi->cls))),
- cont,
- cont_cls)))) &&
- (NULL != cont))
- cont (cont_cls,
- &n->id,
- GNUNET_SYSERR,
- msgbuf_size,
- 0);
- GST_neighbours_notify_data_sent (n->primary_address.address,
- n->primary_address.session,
- msgbuf_size);
- GNUNET_break (NULL != papi);
- return result;
-}
-
-
/**
* Function called when the 'DISCONNECT' message has been sent by the
* plugin. Frees the neighbour --- if the entry still exists.
static void
send_disconnect (struct NeighbourMapEntry *n)
{
- struct SessionDisconnectMessage disconnect_msg;
+ struct GNUNET_ATS_SessionDisconnectMessage disconnect_msg;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Sending DISCONNECT message to peer `%4s'\n",
GNUNET_i2s (&n->id));
- disconnect_msg.header.size = htons (sizeof (struct SessionDisconnectMessage));
+ disconnect_msg.header.size = htons (sizeof (struct GNUNET_ATS_SessionDisconnectMessage));
disconnect_msg.header.type =
htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT);
disconnect_msg.reserved = htonl (0);
}
+/**
+ * Change the incoming quota for the given peer. Updates
+ * our own receive rate and informs the neighbour about
+ * the new quota.
+ *
+ * @param n neighbour entry to change qutoa for
+ * @param quota new quota
+ */
+static void
+set_incoming_quota (struct NeighbourMapEntry *n,
+ struct GNUNET_BANDWIDTH_Value32NBO quota)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Setting inbound quota of %u Bps for peer `%s' to all clients\n",
+ ntohl (quota.value__), GNUNET_i2s (&n->id));
+ GNUNET_BANDWIDTH_tracker_update_quota (&n->in_tracker,
+ quota);
+ if (0 != ntohl (quota.value__))
+ {
+ struct GNUNET_ATS_SessionQuotaMessage sqm;
+
+ sqm.header.size = htons (sizeof (struct GNUNET_ATS_SessionQuotaMessage));
+ sqm.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_QUOTA);
+ sqm.quota = quota.value__;
+ if (NULL != n->primary_address.session)
+ (void) send_with_session (n,
+ &sqm,
+ sizeof (sqm),
+ UINT32_MAX - 1,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_NO,
+ NULL, NULL);
+ return;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Disconnecting peer `%s' due to SET_QUOTA\n",
+ GNUNET_i2s (&n->id));
+ if (GNUNET_YES == test_connected (n))
+ GNUNET_STATISTICS_update (GST_stats,
+ gettext_noop ("# disconnects due to quota of 0"),
+ 1, GNUNET_NO);
+ disconnect_neighbour (n);
+}
+
+
+/**
+ * Initialize the primary address of a neighbour
+ *
+ * @param n the neighbour
+ * @param address address of the other peer, NULL if other peer
+ * connected to us
+ * @param session session to use (or NULL, in which case an
+ * address must be setup)
+ * @param bandwidth_in inbound quota to be used when connection is up
+ * @param bandwidth_out outbound quota to be used when connection is up
+ */
+static void
+set_primary_address (struct NeighbourMapEntry *n,
+ const struct GNUNET_HELLO_Address *address,
+ struct GNUNET_ATS_Session *session,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
+{
+ if (session == n->primary_address.session)
+ {
+ GST_validation_set_address_use (n->primary_address.address,
+ GNUNET_YES);
+ if (n->primary_address.bandwidth_in.value__ != bandwidth_in.value__)
+ {
+ n->primary_address.bandwidth_in = bandwidth_in;
+ set_incoming_quota (n,
+ bandwidth_in);
+ }
+ if (n->primary_address.bandwidth_out.value__ != bandwidth_out.value__)
+ {
+ n->primary_address.bandwidth_out = bandwidth_out;
+ send_outbound_quota_to_clients (n);
+ }
+ return;
+ }
+ if ( (NULL != n->primary_address.address) &&
+ (0 == GNUNET_HELLO_address_cmp (address,
+ n->primary_address.address)) )
+ {
+ GNUNET_break (0);
+ return;
+ }
+ if (NULL == session)
+ {
+ GNUNET_break (0);
+ GST_ats_block_address (address,
+ session);
+ return;
+ }
+ if (NULL != n->primary_address.address)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Replacing existing primary address with another one\n");
+ free_address (&n->primary_address);
+ }
+ n->primary_address.address = GNUNET_HELLO_address_copy (address);
+ n->primary_address.bandwidth_in = bandwidth_in;
+ n->primary_address.bandwidth_out = bandwidth_out;
+ n->primary_address.session = session;
+ n->primary_address.keep_alive_nonce = 0;
+ GNUNET_assert (GNUNET_YES ==
+ GST_ats_is_known (n->primary_address.address,
+ n->primary_address.session));
+ /* subsystems about address use */
+ GST_validation_set_address_use (n->primary_address.address,
+ GNUNET_YES);
+ set_incoming_quota (n,
+ bandwidth_in);
+ send_outbound_quota_to_clients (n);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Neighbour `%s' switched to address `%s'\n",
+ GNUNET_i2s (&n->id),
+ GST_plugins_a2s(address));
+
+ neighbours_changed_notification (&n->id,
+ n->primary_address.address,
+ n->state,
+ n->timeout,
+ n->primary_address.bandwidth_in,
+ n->primary_address.bandwidth_out);
+}
+
+
/**
* We're done with our transmission attempt, continue processing.
*
static void
transmit_send_continuation (void *cls,
const struct GNUNET_PeerIdentity *receiver,
- int success, size_t size_payload, size_t physical)
+ int success,
+ size_t size_payload,
+ size_t physical)
{
struct MessageQueue *mq = cls;
struct NeighbourMapEntry *n;
if (NULL == (n = lookup_neighbour (receiver)))
{
+ if (NULL != mq->cont)
+ mq->cont (mq->cont_cls,
+ GNUNET_SYSERR /* not connected */,
+ size_payload,
+ 0);
GNUNET_free (mq);
return; /* disconnect or other error while transmitting, can happen */
}
n->is_active = NULL;
if (NULL != n->task)
GNUNET_SCHEDULER_cancel (n->task);
- n->task = GNUNET_SCHEDULER_add_now (&master_task, n);
+ n->task = GNUNET_SCHEDULER_add_now (&master_task,
+ n);
}
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);
}
-
GNUNET_break (size_payload == mq->message_buf_size);
bytes_in_send_queue -= mq->message_buf_size;
GNUNET_STATISTICS_set (GST_stats,
- gettext_noop
- ("# bytes in message queue for other peers"),
- bytes_in_send_queue, GNUNET_NO);
+ gettext_noop ("# bytes in message queue for other peers"),
+ bytes_in_send_queue,
+ GNUNET_NO);
if (GNUNET_OK == success)
GNUNET_STATISTICS_update (GST_stats,
- gettext_noop
- ("# messages transmitted to other peers"),
- 1, GNUNET_NO);
+ gettext_noop ("# messages transmitted to other peers"),
+ 1,
+ GNUNET_NO);
else
GNUNET_STATISTICS_update (GST_stats,
gettext_noop
"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, success, size_payload, physical);
+ mq->cont (mq->cont_cls,
+ success,
+ size_payload,
+ physical);
GNUNET_free (mq);
}
timeout = GNUNET_TIME_absolute_get_remaining (mq->timeout);
if (timeout.rel_value_us > 0)
break;
- GNUNET_STATISTICS_update (GST_stats,
- gettext_noop
- ("# messages timed out while in transport queue"),
- 1, GNUNET_NO);
+ GNUNET_STATISTICS_update (GST_stats,
+ gettext_noop ("# messages timed out while in transport queue"),
+ 1,
+ GNUNET_NO);
GNUNET_CONTAINER_DLL_remove (n->messages_head,
n->messages_tail,
mq);
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,
static void
send_keepalive (struct NeighbourMapEntry *n)
{
- struct SessionKeepAliveMessage m;
+ struct GNUNET_ATS_SessionKeepAliveMessage m;
struct GNUNET_TIME_Relative timeout;
uint32_t nonce;
nonce = 0; /* 0 indicates 'not set' */
while (0 == nonce)
- nonce = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
+ nonce = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE,
+ UINT32_MAX);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending keep alive to peer `%s' with nonce %u\n",
+ "Sending KEEPALIVE to peer `%s' with nonce %u\n",
GNUNET_i2s (&n->id),
nonce);
- m.header.size = htons (sizeof (struct SessionKeepAliveMessage));
+ m.header.size = htons (sizeof (struct GNUNET_ATS_SessionKeepAliveMessage));
m.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE);
m.nonce = htonl (nonce);
GNUNET_YES,
NULL, NULL);
GNUNET_STATISTICS_update (GST_stats,
- gettext_noop ("# keepalives sent"),
+ gettext_noop ("# KEEPALIVES sent"),
1,
GNUNET_NO);
n->primary_address.keep_alive_nonce = nonce;
const struct GNUNET_MessageHeader *m)
{
struct NeighbourMapEntry *n;
- const struct SessionKeepAliveMessage *msg_in;
- struct SessionKeepAliveMessage msg;
+ const struct GNUNET_ATS_SessionKeepAliveMessage *msg_in;
+ struct GNUNET_ATS_SessionKeepAliveMessage msg;
- if (sizeof (struct SessionKeepAliveMessage) != ntohs (m->size))
+ if (sizeof (struct GNUNET_ATS_SessionKeepAliveMessage) != ntohs (m->size))
+ {
+ GNUNET_break_op (0);
return;
+ }
- msg_in = (struct SessionKeepAliveMessage *) m;
+ msg_in = (const struct GNUNET_ATS_SessionKeepAliveMessage *) m;
if (NULL == (n = lookup_neighbour (neighbour)))
{
GNUNET_STATISTICS_update (GST_stats,
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received keep alive request from peer `%s' with nonce %u\n",
- GNUNET_i2s (&n->id), ntohl (msg_in->nonce));
+ "Received KEEPALIVE request from peer `%s' with nonce %u\n",
+ GNUNET_i2s (&n->id),
+ ntohl (msg_in->nonce));
+ GNUNET_STATISTICS_update (GST_stats,
+ gettext_noop ("# KEEPALIVES received in good order"),
+ 1,
+ GNUNET_NO);
/* send reply to allow neighbour to measure latency */
- msg.header.size = htons (sizeof (struct SessionKeepAliveMessage));
+ msg.header.size = htons (sizeof (struct GNUNET_ATS_SessionKeepAliveMessage));
msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE_RESPONSE);
msg.nonce = msg_in->nonce;
(void) send_with_session (n,
&msg,
- sizeof (struct SessionKeepAliveMessage),
+ sizeof (struct GNUNET_ATS_SessionKeepAliveMessage),
UINT32_MAX /* priority */,
GNUNET_TIME_UNIT_FOREVER_REL,
GNUNET_YES,
const struct GNUNET_MessageHeader *m)
{
struct NeighbourMapEntry *n;
- const struct SessionKeepAliveMessage *msg;
+ const struct GNUNET_ATS_SessionKeepAliveMessage *msg;
struct GNUNET_TRANSPORT_PluginFunctions *papi;
- struct GNUNET_ATS_Information ats;
struct GNUNET_TIME_Relative latency;
- if (sizeof (struct SessionKeepAliveMessage) != ntohs (m->size))
+ if (sizeof (struct GNUNET_ATS_SessionKeepAliveMessage) != ntohs (m->size))
+ {
+ GNUNET_break_op (0);
return;
+ }
- msg = (const struct SessionKeepAliveMessage *) m;
+ msg = (const struct GNUNET_ATS_SessionKeepAliveMessage *) m;
if (NULL == (n = lookup_neighbour (neighbour)))
{
GNUNET_STATISTICS_update (GST_stats,
- gettext_noop
- ("# KEEPALIVE_RESPONSE messages discarded (not connected)"),
- 1, GNUNET_NO);
+ gettext_noop ("# KEEPALIVE_RESPONSEs discarded (not connected)"),
+ 1,
+ GNUNET_NO);
return;
}
if ( (GNUNET_TRANSPORT_PS_CONNECTED != n->state) ||
(GNUNET_YES != n->expect_latency_response) )
{
GNUNET_STATISTICS_update (GST_stats,
- gettext_noop
- ("# KEEPALIVE_RESPONSE messages discarded (not expected)"),
- 1, GNUNET_NO);
+ gettext_noop ("# KEEPALIVE_RESPONSEs discarded (not expected)"),
+ 1,
+ GNUNET_NO);
return;
}
if (NULL == n->primary_address.address)
{
GNUNET_STATISTICS_update (GST_stats,
- gettext_noop
- ("# KEEPALIVE_RESPONSE messages discarded (address changed)"),
- 1, GNUNET_NO);
+ gettext_noop ("# KEEPALIVE_RESPONSEs discarded (address changed)"),
+ 1,
+ GNUNET_NO);
return;
}
if (n->primary_address.keep_alive_nonce != ntohl (msg->nonce))
{
- GNUNET_STATISTICS_update (GST_stats,
- gettext_noop
- ("# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"),
- 1, GNUNET_NO);
+ if (0 == n->primary_address.keep_alive_nonce)
+ GNUNET_STATISTICS_update (GST_stats,
+ gettext_noop ("# KEEPALIVE_RESPONSEs discarded (no nonce)"),
+ 1,
+ GNUNET_NO);
+ else
+ GNUNET_STATISTICS_update (GST_stats,
+ gettext_noop ("# KEEPALIVE_RESPONSEs discarded (bad nonce)"),
+ 1,
+ GNUNET_NO);
return;
}
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received keep alive response from peer `%s' for session %p\n",
- GNUNET_i2s (&n->id), n->primary_address.session);
+ GNUNET_STATISTICS_update (GST_stats,
+ gettext_noop ("# KEEPALIVE_RESPONSEs received (OK)"),
+ 1,
+ GNUNET_NO);
- }
/* Update session timeout here */
if (NULL != (papi = GST_plugins_find (n->primary_address.address->transport_name)))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Updating session for peer `%s' for session %p\n",
- GNUNET_i2s (&n->id), n->primary_address.session);
- papi->update_session_timeout (papi->cls, &n->id, n->primary_address.session);
+ "Updating session for peer `%s' for session %p\n",
+ GNUNET_i2s (&n->id),
+ n->primary_address.session);
+ papi->update_session_timeout (papi->cls,
+ &n->id,
+ n->primary_address.session);
}
else
{
latency = GNUNET_TIME_absolute_get_duration (n->last_keep_alive_time);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Latency for peer `%s' is %s\n",
+ "Received KEEPALIVE_RESPONSE from peer `%s', latency is %s\n",
GNUNET_i2s (&n->id),
GNUNET_STRINGS_relative_time_to_string (latency,
GNUNET_YES));
- /* append latency */
- ats.type = htonl (GNUNET_ATS_QUALITY_NET_DELAY);
- ats.value = htonl ( (latency.rel_value_us > UINT32_MAX)
- ? UINT32_MAX
- : (uint32_t) latency.rel_value_us );
- GST_ats_update_metrics (n->primary_address.address,
- n->primary_address.session,
- &ats, 1);
+ GST_ats_update_delay (n->primary_address.address,
+ GNUNET_TIME_relative_divide (latency,
+ 2));
}
* @return how long to wait before reading more from this sender
*/
struct GNUNET_TIME_Relative
-GST_neighbours_calculate_receive_delay (const struct GNUNET_PeerIdentity
- *sender, ssize_t size, int *do_forward)
+GST_neighbours_calculate_receive_delay (const struct GNUNET_PeerIdentity *sender,
+ ssize_t size,
+ int *do_forward)
{
struct NeighbourMapEntry *n;
struct GNUNET_TIME_Relative ret;
}
if (NULL == (n = lookup_neighbour (sender)))
{
- GST_neighbours_try_connect (sender);
- if (NULL == (n = lookup_neighbour (sender)))
- {
- GNUNET_STATISTICS_update (GST_stats,
- gettext_noop
- ("# messages discarded due to lack of neighbour record"),
- 1, GNUNET_NO);
- *do_forward = GNUNET_NO;
- return GNUNET_TIME_UNIT_ZERO;
- }
+ GNUNET_STATISTICS_update (GST_stats,
+ gettext_noop ("# messages discarded due to lack of neighbour record"),
+ 1,
+ GNUNET_NO);
+ *do_forward = GNUNET_NO;
+ return GNUNET_TIME_UNIT_ZERO;
}
if (! test_connected (n))
{
{
GNUNET_break (0);
if (NULL != cont)
- cont (cont_cls, GNUNET_SYSERR, msg_size, 0);
+ cont (cont_cls,
+ GNUNET_SYSERR,
+ msg_size,
+ 0);
return;
}
if (GNUNET_YES != test_connected (n))
{
GNUNET_break (0);
if (NULL != cont)
- cont (cont_cls, GNUNET_SYSERR, msg_size, 0);
+ cont (cont_cls,
+ GNUNET_SYSERR,
+ msg_size,
+ 0);
return;
}
bytes_in_send_queue += msg_size;
mq = GNUNET_malloc (sizeof (struct MessageQueue) + msg_size);
mq->cont = cont;
mq->cont_cls = cont_cls;
- memcpy (&mq[1], msg, msg_size);
+ GNUNET_memcpy (&mq[1], msg, msg_size);
mq->message_buf = (const char *) &mq[1];
mq->message_buf_size = msg_size;
mq->timeout = GNUNET_TIME_relative_to_absolute (timeout);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Enqueueing %u bytes to send to peer %s\n",
- msg_size, GNUNET_i2s (target));
-
- GNUNET_CONTAINER_DLL_insert_tail (n->messages_head, n->messages_tail, mq);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Enqueueing %u bytes to send to peer %s\n",
+ (unsigned int) msg_size,
+ GNUNET_i2s (target));
+ GNUNET_CONTAINER_DLL_insert_tail (n->messages_head,
+ n->messages_tail,
+ mq);
if (NULL != n->task)
GNUNET_SCHEDULER_cancel (n->task);
n->task = GNUNET_SCHEDULER_add_now (&master_task, n);
disconnect_neighbour (n);
break;
}
+ return;
}
GST_neighbours_notify_data_sent (na->address,
na->session,
struct GNUNET_TIME_Absolute timestamp)
{
const struct GNUNET_HELLO_Address *address = na->address;
- struct Session *session = na->session;
+ struct GNUNET_ATS_Session *session = na->session;
struct GNUNET_TRANSPORT_PluginFunctions *papi;
struct TransportSynMessage connect_msg;
struct NeighbourMapEntry *n;
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,
{
struct NeighbourMapEntry *n;
+ if (0 ==
+ memcmp (&GST_my_identity,
+ peer,
+ sizeof (struct GNUNET_PeerIdentity)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Cowardly refusing to consider myself my neighbour!\n");
+ return NULL;
+ }
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Creating new neighbour entry for `%s'\n",
GNUNET_i2s (peer));
n->id = *peer;
n->ack_state = ACK_UNDEFINED;
n->last_util_transmission = GNUNET_TIME_absolute_get();
+ n->neighbour_receive_quota = GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT;
GNUNET_BANDWIDTH_tracker_init (&n->in_tracker,
&inbound_bw_tracker_update,
n,
GNUNET_TIME_UNIT_FOREVER_ABS);
GNUNET_assert (GNUNET_OK ==
GNUNET_CONTAINER_multipeermap_put (neighbours,
- &n->id, n,
+ &n->id,
+ n,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
n->suggest_handle = GNUNET_ATS_connectivity_suggest (GST_ats_connect,
- peer);
+ peer,
+ 0);
return n;
}
*/
struct GST_BlacklistCheck *blc;
- /**
- * Address we are asking the blacklist subsystem about.
- */
- struct GNUNET_HELLO_Address *address;
-
- /**
- * Session we should use in conjunction with @e address, can be NULL.
- */
- struct Session *session;
-
/**
* Inbound bandwidth that was assigned to @e address.
*/
};
-/**
- * Black list check result for try_connect call
- * If connection to the peer is allowed request adddress and
- *
- * @param cls blc_ctx bl context
- * @param peer the peer
- * @param result the result
- */
-static void
-try_connect_bl_check_cont (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- int result)
-{
- struct BlacklistCheckSwitchContext *blc_ctx = cls;
- struct NeighbourMapEntry *n;
-
- GNUNET_CONTAINER_DLL_remove (pending_bc_head,
- pending_bc_tail,
- blc_ctx);
- GNUNET_free (blc_ctx);
- if (GNUNET_OK != result)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Blacklisting disapproved to connect to peer `%s'\n"),
- GNUNET_i2s (peer));
- return;
- }
-
- /* Setup a new neighbour */
- if (NULL != lookup_neighbour(peer))
- return; /* The neighbor was created in the meantime while waited for BL clients */
-
- n = setup_neighbour (peer);
-
- /* Request address suggestions for this peer */
- set_state_and_timeout (n,
- GNUNET_TRANSPORT_PS_INIT_ATS,
- GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
-}
-
-
-/**
- * Try to create a connection to the given target (eventually).
- *
- * @param target peer to try to connect to
- */
-void
-GST_neighbours_try_connect (const struct GNUNET_PeerIdentity *target)
-{
- struct NeighbourMapEntry *n;
- struct GST_BlacklistCheck *blc;
- struct BlacklistCheckSwitchContext *blc_ctx;
-
- if (NULL == neighbours)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Asked to connect to peer `%s' during shutdown\n",
- GNUNET_i2s (target));
- return; /* during shutdown, do nothing */
- }
- n = lookup_neighbour (target);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Asked to connect to peer `%s' (state: %s)\n",
- GNUNET_i2s (target),
- (NULL != n) ? GNUNET_TRANSPORT_ps2s(n->state) : "NEW PEER");
- if (NULL != n)
- {
- switch (n->state)
- {
- case GNUNET_TRANSPORT_PS_NOT_CONNECTED:
- /* this should not be possible */
- GNUNET_break (0);
- free_neighbour (n);
- break;
- case GNUNET_TRANSPORT_PS_INIT_ATS:
- case GNUNET_TRANSPORT_PS_SYN_SENT:
- case GNUNET_TRANSPORT_PS_SYN_RECV_ATS:
- case GNUNET_TRANSPORT_PS_SYN_RECV_ACK:
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Ignoring request to try to connect to `%s', already trying!\n",
- GNUNET_i2s (target));
- return; /* already trying */
- case GNUNET_TRANSPORT_PS_CONNECTED:
- case GNUNET_TRANSPORT_PS_RECONNECT_ATS:
- case GNUNET_TRANSPORT_PS_RECONNECT_SENT:
- case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Ignoring request to try to connect, already connected to `%s'!\n",
- GNUNET_i2s (target));
- return; /* already connected */
- case GNUNET_TRANSPORT_PS_DISCONNECT:
- /* get rid of remains, ready to re-try immediately */
- free_neighbour (n);
- break;
- case GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED:
- /* should not be possible */
- GNUNET_assert (0);
- return;
- default:
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Unhandled state `%s'\n",
- GNUNET_TRANSPORT_ps2s (n->state));
- GNUNET_break (0);
- free_neighbour (n);
- break;
- }
- }
-
- /* Do blacklist check if connecting to this peer is allowed */
- blc_ctx = GNUNET_new (struct BlacklistCheckSwitchContext);
- GNUNET_CONTAINER_DLL_insert (pending_bc_head,
- pending_bc_tail,
- blc_ctx);
-
- if (NULL !=
- (blc = GST_blacklist_test_allowed (target,
- NULL,
- &try_connect_bl_check_cont,
- blc_ctx)))
- {
- blc_ctx->blc = blc;
- }
-}
-
-
/**
* We received a 'SYN' message from the other peer.
* Consider switching to it.
*
- * @param message possibly a 'struct TransportSynMessage' (check format)
+ * @param message possibly a `struct TransportSynMessage` (check format)
* @param peer identity of the peer to switch the address for
* @return #GNUNET_OK if the message was fine, #GNUNET_SYSERR on serious error
*/
scm = (const struct TransportSynMessage *) message;
GNUNET_break_op (0 == ntohl (scm->reserved));
ts = GNUNET_TIME_absolute_ntoh (scm->timestamp);
+ if (0 ==
+ memcmp (&GST_my_identity,
+ peer,
+ sizeof (struct GNUNET_PeerIdentity)))
+ {
+ /* loopback connection-to-self, ignore */
+ return GNUNET_SYSERR;
+ }
n = lookup_neighbour (peer);
if (NULL == n)
{
/* This is a new neighbour and set to not connected */
n = setup_neighbour (peer);
+ GNUNET_assert (NULL != n);
}
/* Remember this SYN message in neighbour */
/* Get rid of remains and re-try */
free_neighbour (n);
n = setup_neighbour (peer);
+ GNUNET_assert (NULL != n);
/* Remember the SYN time stamp for ACK message */
n->ack_state = ACK_SEND_SYN_ACK;
n->connect_ack_timestamp = ts;
*/
static int
try_run_fast_ats_update (const struct GNUNET_HELLO_Address *address,
- struct Session *session,
+ struct GNUNET_ATS_Session *session,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
{
/* switch to a different session, but keeping same address; could
happen if there is a 2nd inbound connection */
n->primary_address.session = session;
+ GNUNET_assert (GNUNET_YES ==
+ GST_ats_is_known (n->primary_address.address,
+ n->primary_address.session));
+ }
+ if (n->primary_address.bandwidth_in.value__ != bandwidth_in.value__)
+ {
+ n->primary_address.bandwidth_in = bandwidth_in;
+ set_incoming_quota (n,
+ bandwidth_in);
+ }
+ if (n->primary_address.bandwidth_out.value__ != bandwidth_out.value__)
+ {
+ n->primary_address.bandwidth_out = bandwidth_out;
+ send_outbound_quota_to_clients (n);
}
- n->primary_address.bandwidth_in = bandwidth_in;
- n->primary_address.bandwidth_out = bandwidth_out;
- GST_neighbours_set_incoming_quota (&address->peer,
- bandwidth_in);
- send_outbound_quota (&address->peer,
- bandwidth_out);
return GNUNET_OK;
}
* @param cls the `struct BlacklistCheckSwitchContext` with
* the information about the future address
* @param peer the peer we may switch addresses on
- * @param result #GNUNET_NO if we are not allowed to use the new
- * address
+ * @param address address associated with the request
+ * @param session session associated with the request
+ * @param result #GNUNET_OK if the connection is allowed,
+ * #GNUNET_NO if not,
+ * #GNUNET_SYSERR if operation was aborted
*/
static void
switch_address_bl_check_cont (void *cls,
const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Address *address,
+ struct GNUNET_ATS_Session *session,
int result)
{
struct BlacklistCheckSwitchContext *blc_ctx = cls;
struct GNUNET_TRANSPORT_PluginFunctions *papi;
struct NeighbourMapEntry *n;
- if (result == GNUNET_NO)
+ if (GNUNET_SYSERR == result)
+ goto cleanup;
+
+ papi = GST_plugins_find (address->transport_name);
+ GNUNET_assert (NULL != papi);
+
+ if (GNUNET_NO == result)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Blacklist denied to switch to suggested address `%s' session %p for peer `%s'\n",
- GST_plugins_a2s (blc_ctx->address),
- blc_ctx->session,
- GNUNET_i2s (&blc_ctx->address->peer));
+ GST_plugins_a2s (address),
+ session,
+ GNUNET_i2s (peer));
GNUNET_STATISTICS_update (GST_stats,
"# ATS suggestions ignored (blacklist denied)",
1,
GNUNET_NO);
- /* FIXME: tell plugin to force killing session here and now
- (note: _proper_ plugin API for this does not yet exist) */
- GST_ats_block_address (blc_ctx->address,
- blc_ctx->session);
+ if (NULL != session)
+ papi->disconnect_session (papi->cls,
+ session);
+ if (GNUNET_YES !=
+ GNUNET_HELLO_address_check_option (address,
+ GNUNET_HELLO_ADDRESS_INFO_INBOUND))
+ GST_ats_block_address (address,
+ NULL);
goto cleanup;
}
- papi = GST_plugins_find (blc_ctx->address->transport_name);
- GNUNET_assert (NULL != papi);
- if (NULL == blc_ctx->session)
+ if (NULL == session)
{
/* need to create a session, ATS only gave us an address */
- blc_ctx->session = papi->get_session (papi->cls,
- blc_ctx->address);
+ session = papi->get_session (papi->cls,
+ address);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Obtained new session for peer `%s' and address '%s': %p\n",
- GNUNET_i2s (&blc_ctx->address->peer),
- GST_plugins_a2s (blc_ctx->address),
- blc_ctx->session);
- if (NULL != blc_ctx->session)
- GST_ats_new_session (blc_ctx->address,
- blc_ctx->session);
+ GNUNET_i2s (&address->peer),
+ GST_plugins_a2s (address),
+ session);
+ if (NULL != session)
+ GST_ats_new_session (address,
+ session);
}
- if (NULL == blc_ctx->session)
+ if (NULL == session)
{
/* session creation failed, bad!, fail! */
GNUNET_STATISTICS_update (GST_stats,
/* No session could be obtained, remove blacklist check and clean up */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Failed to obtain new session for peer `%s' and address '%s'\n",
- GNUNET_i2s (&blc_ctx->address->peer),
- GST_plugins_a2s (blc_ctx->address));
- GST_ats_block_address (blc_ctx->address,
- blc_ctx->session);
+ GNUNET_i2s (&address->peer),
+ GST_plugins_a2s (address));
+ GST_ats_block_address (address,
+ session);
goto cleanup;
}
it is theoretically possible that the situation changed in
the meantime, hence we check again here */
if (GNUNET_OK ==
- try_run_fast_ats_update (blc_ctx->address,
- blc_ctx->session,
+ try_run_fast_ats_update (address,
+ session,
blc_ctx->bandwidth_in,
blc_ctx->bandwidth_out))
goto cleanup; /* was just a minor update, we're done */
if (NULL == (n = lookup_neighbour (peer)))
{
n = setup_neighbour (peer);
+ if (NULL == n)
+ {
+ /* not sure how this can happen... */
+ GNUNET_break (0);
+ goto cleanup;
+ }
n->state = GNUNET_TRANSPORT_PS_INIT_ATS;
}
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Peer `%s' switches to address `%s'\n",
- GNUNET_i2s (&blc_ctx->address->peer),
- GST_plugins_a2s (blc_ctx->address));
+ GNUNET_i2s (&address->peer),
+ GST_plugins_a2s (address));
switch (n->state)
{
case GNUNET_TRANSPORT_PS_NOT_CONNECTED:
GNUNET_break (0);
- GST_ats_block_address (blc_ctx->address,
- blc_ctx->session);
+ GST_ats_block_address (address,
+ session);
free_neighbour (n);
return;
case GNUNET_TRANSPORT_PS_INIT_ATS:
/* We requested an address and ATS suggests one:
* set primary address and send SYN message*/
set_primary_address (n,
- blc_ctx->address,
- blc_ctx->session,
+ address,
+ session,
blc_ctx->bandwidth_in,
- blc_ctx->bandwidth_out,
- GNUNET_NO);
+ blc_ctx->bandwidth_out);
if (ACK_SEND_SYN_ACK == n->ack_state)
{
/* Send pending SYN_ACK message */
* Switch and send new SYN */
/* ATS suggests a different address, switch again */
set_primary_address (n,
- blc_ctx->address,
- blc_ctx->session,
+ address,
+ session,
blc_ctx->bandwidth_in,
- blc_ctx->bandwidth_out,
- GNUNET_NO);
+ blc_ctx->bandwidth_out);
if (ACK_SEND_SYN_ACK == n->ack_state)
{
/* Send pending SYN_ACK message */
/* We requested an address and ATS suggests one:
* set primary address and send SYN_ACK message*/
set_primary_address (n,
- blc_ctx->address,
- blc_ctx->session,
+ address,
+ session,
blc_ctx->bandwidth_in,
- blc_ctx->bandwidth_out,
- GNUNET_NO);
+ blc_ctx->bandwidth_out);
/* Send an ACK message as a response to the SYN msg */
set_state_and_timeout (n,
GNUNET_TRANSPORT_PS_SYN_RECV_ACK,
n->connect_ack_timestamp);
}
set_primary_address (n,
- blc_ctx->address,
- blc_ctx->session,
+ address,
+ session,
blc_ctx->bandwidth_in,
- blc_ctx->bandwidth_out,
- GNUNET_NO);
+ blc_ctx->bandwidth_out);
set_state_and_timeout (n,
GNUNET_TRANSPORT_PS_SYN_RECV_ACK,
GNUNET_TIME_relative_to_absolute (SETUP_CONNECTION_TIMEOUT));
case GNUNET_TRANSPORT_PS_CONNECTED:
GNUNET_assert (NULL != n->primary_address.address);
GNUNET_assert (NULL != n->primary_address.session);
- GNUNET_break (n->primary_address.session != blc_ctx->session);
+ GNUNET_break (n->primary_address.session != session);
/* ATS asks us to switch a life connection; see if we can get
a SYN_ACK on it before we actually do this! */
set_alternative_address (n,
- blc_ctx->address,
- blc_ctx->session,
+ address,
+ session,
blc_ctx->bandwidth_in,
blc_ctx->bandwidth_out);
set_state_and_timeout (n,
break;
case GNUNET_TRANSPORT_PS_RECONNECT_ATS:
set_primary_address (n,
- blc_ctx->address,
- blc_ctx->session,
+ address,
+ session,
blc_ctx->bandwidth_in,
- blc_ctx->bandwidth_out,
- GNUNET_NO);
+ blc_ctx->bandwidth_out);
if (ACK_SEND_SYN_ACK == n->ack_state)
{
/* Send pending SYN_ACK message */
/* ATS asks us to switch while we were trying to reconnect; switch to new
address and send SYN again */
set_primary_address (n,
- blc_ctx->address,
- blc_ctx->session,
+ address,
+ session,
blc_ctx->bandwidth_in,
- blc_ctx->bandwidth_out,
- GNUNET_NO);
+ blc_ctx->bandwidth_out);
set_state_and_timeout (n,
GNUNET_TRANSPORT_PS_RECONNECT_SENT,
GNUNET_TIME_relative_to_absolute (FAST_RECONNECT_TIMEOUT));
break;
case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
if ( (0 == GNUNET_HELLO_address_cmp (n->primary_address.address,
- blc_ctx->address)) &&
- (n->primary_address.session == blc_ctx->session) )
+ address)) &&
+ (n->primary_address.session == session) )
{
/* ATS switches back to still-active session */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
}
/* ATS asks us to switch a life connection, send */
set_alternative_address (n,
- blc_ctx->address,
- blc_ctx->session,
+ address,
+ session,
blc_ctx->bandwidth_in,
blc_ctx->bandwidth_out);
set_state_and_timeout (n,
GNUNET_CONTAINER_DLL_remove (pending_bc_head,
pending_bc_tail,
blc_ctx);
- GNUNET_HELLO_address_free (blc_ctx->address);
GNUNET_free (blc_ctx);
}
*/
void
GST_neighbours_switch_to_address (const struct GNUNET_HELLO_Address *address,
- struct Session *session,
+ struct GNUNET_ATS_Session *session,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
{
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "ATS suggests address '%s' for peer `%s'\n",
+ "ATS suggests address '%s' for peer `%s' at %u/%u speed\n",
GST_plugins_a2s (address),
- GNUNET_i2s (&address->peer));
+ GNUNET_i2s (&address->peer),
+ (unsigned int) ntohl (bandwidth_in.value__),
+ (unsigned int) ntohl (bandwidth_out.value__));
/* Perform blacklist check */
blc_ctx = GNUNET_new (struct BlacklistCheckSwitchContext);
- blc_ctx->address = GNUNET_HELLO_address_copy (address);
- blc_ctx->session = session;
blc_ctx->bandwidth_in = bandwidth_in;
blc_ctx->bandwidth_out = bandwidth_out;
GNUNET_CONTAINER_DLL_insert (pending_bc_head,
if (NULL != (blc = GST_blacklist_test_allowed (&address->peer,
address->transport_name,
&switch_address_bl_check_cont,
- blc_ctx)))
+ blc_ctx,
+ address,
+ session)))
{
blc_ctx->blc = blc;
}
void *value)
{
struct NeighbourMapEntry *n = value;
- struct GNUNET_ATS_Information atsi[4];
uint32_t bps_in;
uint32_t bps_out;
struct GNUNET_TIME_Relative delta;
- if (GNUNET_YES != test_connected (n))
+ if ( (GNUNET_YES != test_connected (n)) ||
+ (NULL == n->primary_address.address) )
return GNUNET_OK;
delta = GNUNET_TIME_absolute_get_difference (n->last_util_transmission,
GNUNET_TIME_absolute_get ());
if ((0 != n->util_total_bytes_sent) && (0 != delta.rel_value_us))
bps_out = (1000LL * 1000LL * n->util_total_bytes_sent) / delta.rel_value_us;
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"`%s' total: received %u Bytes/s, sent %u Bytes/s\n",
GNUNET_i2s (key),
bps_in,
bps_out);
- atsi[0].type = htonl (GNUNET_ATS_UTILIZATION_OUT);
- atsi[0].value = htonl (bps_out);
- atsi[1].type = htonl (GNUNET_ATS_UTILIZATION_IN);
- atsi[1].value = htonl (bps_in);
- GST_ats_update_metrics (n->primary_address.address,
- n->primary_address.session,
- atsi, 2);
+ GST_ats_update_utilization (n->primary_address.address,
+ bps_in,
+ bps_out);
n->util_total_bytes_recv = 0;
n->util_total_bytes_sent = 0;
n->last_util_transmission = GNUNET_TIME_absolute_get ();
* 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,
*/
void
GST_neighbours_notify_data_sent (const struct GNUNET_HELLO_Address *address,
- struct Session *session,
+ struct GNUNET_ATS_Session *session,
size_t size)
{
struct NeighbourMapEntry *n;
* 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;
* We received a 'SESSION_SYN_ACK' message from the other peer.
* Consider switching to it.
*
- * @param message possibly a `struct SessionConnectMessage` (check format)
+ * @param message possibly a `struct GNUNET_ATS_SessionConnectMessage` (check format)
* @param peer identity of the peer to switch the address for
* @param address address of the other peer, NULL if other peer
* connected to us
int
GST_neighbours_handle_session_syn_ack (const struct GNUNET_MessageHeader *message,
const struct GNUNET_HELLO_Address *address,
- struct Session *session)
+ struct GNUNET_ATS_Session *session)
{
const struct TransportSynMessage *scm;
struct GNUNET_TIME_Absolute ts;
n->primary_address.address,
n->primary_address.session,
n->primary_address.bandwidth_in,
- n->primary_address.bandwidth_out,
- GNUNET_YES);
+ n->primary_address.bandwidth_out);
send_session_ack_message (n);
break;
case GNUNET_TRANSPORT_PS_SYN_RECV_ATS:
n->alternative_address.address,
n->alternative_address.session,
n->alternative_address.bandwidth_in,
- n->alternative_address.bandwidth_out,
- GNUNET_YES);
+ n->alternative_address.bandwidth_out);
GNUNET_STATISTICS_update (GST_stats,
gettext_noop ("# Successful attempts to switch addresses"),
1,
*/
int
GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer,
- struct Session *session)
+ 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,
/* Destroy the inbound address since it cannot be used */
free_address (&n->primary_address);
n->primary_address = n->alternative_address;
+ GNUNET_assert (GNUNET_YES ==
+ GST_ats_is_known (n->primary_address.address,
+ n->primary_address.session));
memset (&n->alternative_address,
0,
sizeof (struct NeighbourAddress));
* If we sent a 'SYN_ACK' last, this means we are now
* connected. Otherwise, do nothing.
*
- * @param message possibly a 'struct SessionConnectMessage' (check format)
+ * @param message possibly a 'struct GNUNET_ATS_SessionConnectMessage' (check format)
* @param address address of the other peer
* @param session session to use (or NULL)
* @return #GNUNET_OK if the message was fine, #GNUNET_SYSERR on serious error
int
GST_neighbours_handle_session_ack (const struct GNUNET_MessageHeader *message,
const struct GNUNET_HELLO_Address *address,
- struct Session *session)
+ struct GNUNET_ATS_Session *session)
{
struct NeighbourMapEntry *n;
return GNUNET_SYSERR;
}
GNUNET_STATISTICS_update (GST_stats,
- gettext_noop
- ("# ACK messages received"),
- 1, GNUNET_NO);
+ gettext_noop ("# ACK messages received"),
+ 1,
+ GNUNET_NO);
if (NULL == (n = lookup_neighbour (&address->peer)))
{
GNUNET_break_op (0);
now wait for the ACK to finally be connected
- If we sent a SYN_ACK to this peer before */
- if ( (GNUNET_TRANSPORT_PS_SYN_RECV_ACK != n->state) &&
- (ACK_SEND_ACK != n->ack_state))
+ if ( ( (GNUNET_TRANSPORT_PS_SYN_RECV_ACK != n->state) &&
+ (ACK_SEND_ACK != n->ack_state) ) ||
+ (NULL == n->primary_address.address) )
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Received unexpected ACK message from peer `%s' in state %s/%s\n",
print_ack_state (n->ack_state));
GNUNET_STATISTICS_update (GST_stats,
- gettext_noop ("# unexpected ACK messages"), 1,
+ gettext_noop ("# unexpected ACK messages"),
+ 1,
GNUNET_NO);
return GNUNET_OK;
}
GNUNET_TRANSPORT_PS_CONNECTED,
GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT));
- /* Set primary address to used */
- set_primary_address (n,
- n->primary_address.address,
- n->primary_address.session,
- n->primary_address.bandwidth_in,
- n->primary_address.bandwidth_out,
- GNUNET_YES);
+ if (NULL == n->primary_address.address) {
+ /* See issue #3693.
+ * We are in state = PSY_SYN_RECV_ACK or ack_state = ACK_SEND_ACK, which
+ * really means we did try (and succeed) to send a SYN and are waiting for
+ * an ACK.
+ * That suggests that the primary_address used to be non-NULL, but maybe it
+ * got reset to NULL without the state being changed appropriately?
+ */
+ GNUNET_break (0);
+ return GNUNET_OK;
+ }
+
+ /* Reset backoff for primary address */
+ GST_ats_block_reset (n->primary_address.address,
+ n->primary_address.session);
return GNUNET_OK;
}
/**
- * Change the incoming quota for the given peer.
+ * Task to asynchronously run #free_neighbour().
*
- * @param neighbour identity of peer to change qutoa for
- * @param quota new quota
+ * @param cls the `struct NeighbourMapEntry` to free
*/
-void
-GST_neighbours_set_incoming_quota (const struct GNUNET_PeerIdentity *neighbour,
- struct GNUNET_BANDWIDTH_Value32NBO quota)
+static void
+delayed_disconnect (void *cls)
{
- struct NeighbourMapEntry *n;
+ struct NeighbourMapEntry *n = cls;
- if (NULL == (n = lookup_neighbour (neighbour)))
- {
- GNUNET_STATISTICS_update (GST_stats,
- gettext_noop
- ("# SET QUOTA messages ignored (no such peer)"),
- 1, GNUNET_NO);
- return;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Setting inbound quota of %u Bps for peer `%s' to all clients\n",
- ntohl (quota.value__), GNUNET_i2s (&n->id));
- GNUNET_BANDWIDTH_tracker_update_quota (&n->in_tracker, quota);
- if (0 != ntohl (quota.value__))
- return;
+ n->delayed_disconnect_task = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Disconnecting peer `%4s' due to SET_QUOTA\n",
+ "Disconnecting by request from peer %s\n",
GNUNET_i2s (&n->id));
- if (GNUNET_YES == test_connected (n))
- GNUNET_STATISTICS_update (GST_stats,
- gettext_noop ("# disconnects due to quota of 0"),
- 1, GNUNET_NO);
- disconnect_neighbour (n);
+ free_neighbour (n);
}
/**
- * Task to asynchronously run #free_neighbour().
+ * We received a quota message from the given peer,
+ * validate and process.
*
- * @param cls the `struct NeighbourMapEntry` to free
- * @param tc unused
+ * @param peer sender of the message
+ * @param msg the quota message
*/
-static void
-delayed_disconnect (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext* tc)
+void
+GST_neighbours_handle_quota_message (const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *msg)
{
- struct NeighbourMapEntry *n = cls;
+ struct NeighbourMapEntry *n;
+ const struct GNUNET_ATS_SessionQuotaMessage *sqm;
+ struct GNUNET_BANDWIDTH_Value32NBO last;
- n->delayed_disconnect_task = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Disconnecting by request from peer %s\n",
- GNUNET_i2s (&n->id));
- free_neighbour (n);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received QUOTA message from peer `%s'\n",
+ GNUNET_i2s (peer));
+ if (ntohs (msg->size) != sizeof (struct GNUNET_ATS_SessionQuotaMessage))
+ {
+ GNUNET_break_op (0);
+ GNUNET_STATISTICS_update (GST_stats,
+ gettext_noop ("# quota messages ignored (malformed)"),
+ 1,
+ GNUNET_NO);
+ return;
+ }
+ GNUNET_STATISTICS_update (GST_stats,
+ gettext_noop
+ ("# QUOTA messages received"),
+ 1, GNUNET_NO);
+ sqm = (const struct GNUNET_ATS_SessionQuotaMessage *) msg;
+ if (NULL == (n = lookup_neighbour (peer)))
+ {
+ /* gone already */
+ return;
+ }
+ last = GNUNET_BANDWIDTH_value_max (GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT,
+ GNUNET_BANDWIDTH_value_init (ntohl (sqm->quota)));
+ if (last.value__ != n->neighbour_receive_quota.value__)
+ {
+ n->neighbour_receive_quota = last;
+ send_outbound_quota_to_clients (n);
+ }
}
const struct GNUNET_MessageHeader *msg)
{
struct NeighbourMapEntry *n;
- const struct SessionDisconnectMessage *sdm;
+ const struct GNUNET_ATS_SessionDisconnectMessage *sdm;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received DISCONNECT message from peer `%s'\n",
GNUNET_i2s (peer));
- if (ntohs (msg->size) != sizeof (struct SessionDisconnectMessage))
+ if (ntohs (msg->size) != sizeof (struct GNUNET_ATS_SessionDisconnectMessage))
{
GNUNET_break_op (0);
GNUNET_STATISTICS_update (GST_stats,
gettext_noop
- ("# disconnect messages ignored (malformed)"), 1,
+ ("# disconnect messages ignored (malformed)"),
+ 1,
GNUNET_NO);
return;
}
gettext_noop
("# DISCONNECT messages received"),
1, GNUNET_NO);
- sdm = (const struct SessionDisconnectMessage *) msg;
+ sdm = (const struct GNUNET_ATS_SessionDisconnectMessage *) msg;
if (NULL == (n = lookup_neighbour (peer)))
{
/* gone already */
GNUNET_break_op (0);
return;
}
- n->delayed_disconnect_task = GNUNET_SCHEDULER_add_now (&delayed_disconnect, n);
+ if (NULL == n->delayed_disconnect_task)
+ {
+ n->delayed_disconnect_task = GNUNET_SCHEDULER_add_now (&delayed_disconnect,
+ n);
+ }
}
* Iterate over all connected neighbours.
*
* @param cb function to call
- * @param cb_cls closure for cb
+ * @param cb_cls closure for @a cb
*/
void
-GST_neighbours_iterate (GST_NeighbourIterator cb, void *cb_cls)
+GST_neighbours_iterate (GST_NeighbourIterator cb,
+ void *cb_cls)
{
struct IteratorContext ic;
* @param peer
* @return address currently used
*/
-struct GNUNET_HELLO_Address *
+const struct GNUNET_HELLO_Address *
GST_neighbour_get_current_address (const struct GNUNET_PeerIdentity *peer)
{
struct NeighbourMapEntry *n;
*
* @param cls unused
* @param key hash of neighbour's public key (not used)
- * @param value the 'struct NeighbourMapEntry' of the neighbour
+ * @param value the `struct NeighbourMapEntry` of the neighbour
* @return #GNUNET_OK (continue to iterate)
*/
static int
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;
- }
- if (NULL != cur->address)
- GNUNET_HELLO_address_free (cur->address);
- GNUNET_free (cur);
- }
}
projects / oweals / gnunet.git / blobdiff