/*
This file is part of GNUnet.
- (C) 2010,2011,2012 Christian Grothoff (and other contributing authors)
+ (C) 2010-2013 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
* @file transport/gnunet-service-transport_neighbours.c
* @brief neighbour management
* @author Christian Grothoff
- *
- * TODO:
- * - "address_change_cb" is NEVER invoked; when should we call this one exactly?
- * - TEST, TEST, TEST...
*/
#include "platform.h"
#include "gnunet_ats_service.h"
#include "transport.h"
+
/**
* Size of the neighbour hash map.
*/
*/
#define QUOTA_VIOLATION_DROP_THRESHOLD 10
-/**
- * How often do we send KEEPALIVE messages to each of our neighbours and measure
- * the latency with this neighbour?
- * (idle timeout is 5 minutes or 300 seconds, so with 100s interval we
- * send 3 keepalives in each interval, so 3 messages would need to be
- * lost in a row for a disconnect).
- */
-#define KEEPALIVE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100)
-
/**
* How long are we willing to wait for a response from ATS before timing out?
*/
-#define ATS_RESPONSE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 500)
+#define ATS_RESPONSE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 5000)
/**
* How long are we willing to wait for an ACK from the other peer before
#define SETUP_CONNECTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
/**
- * How long are we willing to wait for a successful reconnect if
+ * How long are we willing to wait for a successful reconnect if
* an existing connection went down? Much shorter than the
* usual SETUP_CONNECTION_TIMEOUT as we do not inform the
* higher layers about the disconnect during this period.
*/
#define BLACKLIST_RESPONSE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 500)
+/**
+ * Interval to send utilization data
+ */
+#define UTIL_TRANSMISSION_INTERVAL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
GNUNET_NETWORK_STRUCT_BEGIN
* setup a connection/session for data exchange. A 'SESSION_CONNECT'
* should be answered with a 'SESSION_CONNECT_ACK' with the same body
* to confirm. A 'SESSION_CONNECT_ACK' should then be followed with
- * a 'SESSION_ACK'. Once the 'SESSION_ACK' is received, both peers
+ * a 'SESSION_ACK'. Once the 'SESSION_ACK' is received, both peers
* should be connected.
*/
struct SessionConnectMessage
{
/**
- * Header of type 'GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT'
- * or 'GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT_ACK'
+ * Header of type #GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT
+ * or #GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT_ACK
*/
struct GNUNET_MessageHeader header;
};
+/**
+ * Message a peer sends to another when connected to indicate that a
+ * session is in use and the peer is still alive or to respond to a keep alive.
+ * A peer sends a message with type #GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE
+ * to request a message with #GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE_RESPONSE.
+ * When the keep alive response with type is received, transport service
+ * will call the respective plugin to update the session timeout
+ */
+struct SessionKeepAliveMessage
+{
+ /**
+ * Header of type #GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE or
+ * #GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE_RESPONSE.
+ */
+ struct GNUNET_MessageHeader header;
+
+ /**
+ * A nonce to identify the session the keep alive is used for
+ */
+ uint32_t nonce 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
+ * are disconnecting (to reduce timeouts). This is just a friendly
* notification, peers must not rely on always receiving disconnect
* messages.
*/
struct SessionDisconnectMessage
{
/**
- * Header of type 'GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT'
+ * Header of type #GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT
*/
struct GNUNET_MessageHeader header;
/**
* Purpose of the signature. Extends over the timestamp.
- * Purpose should be GNUNET_SIGNATURE_PURPOSE_TRANSPORT_DISCONNECT.
+ * Purpose should be #GNUNET_SIGNATURE_PURPOSE_TRANSPORT_DISCONNECT.
*/
- struct GNUNET_CRYPTO_RsaSignaturePurpose purpose;
+ struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
/**
* Absolute time at the sender. Only the most recent connect
/**
* Public key of the sender.
*/
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded public_key;
+ struct GNUNET_CRYPTO_EddsaPublicKey public_key;
/**
* Signature of the peer that sends us the disconnect. Only
* valid if the timestamp is AFTER the timestamp from the
* corresponding 'CONNECT' message.
*/
- struct GNUNET_CRYPTO_RsaSignature signature;
+ struct GNUNET_CRYPTO_EddsaSignature signature;
};
GST_NeighbourSendContinuation cont;
/**
- * Closure for 'cont'
+ * Closure for @e cont
*/
void *cont_cls;
};
-/**
- * Possible state of a neighbour. Initially, we are S_NOT_CONNECTED.
- *
- * Then, there are two main paths. If we receive a CONNECT message, we
- * first run a check against the blacklist (S_CONNECT_RECV_BLACKLIST_INBOUND).
- * If this check is successful, we give the inbound address to ATS.
- * After the check we ask ATS for a suggestion (S_CONNECT_RECV_ATS).
- * If ATS makes a suggestion, we ALSO give that suggestion to the blacklist
- * (S_CONNECT_RECV_BLACKLIST). Once the blacklist approves the
- * address we got from ATS, we send our CONNECT_ACK and go to
- * S_CONNECT_RECV_ACK. If we receive a SESSION_ACK, we go to
- * S_CONNECTED (and notify everyone about the new connection). If the
- * operation times out, we go to S_DISCONNECT.
- *
- * The other case is where we transmit a CONNECT message first. We
- * start with S_INIT_ATS. If we get an address, we enter
- * S_INIT_BLACKLIST and check the blacklist. If the blacklist is OK
- * with the connection, we actually send the CONNECT message and go to
- * state S_CONNECT_SENT. Once we receive a CONNECT_ACK, we go to
- * S_CONNECTED (and notify everyone about the new connection and send
- * back a SESSION_ACK). If the operation times out, we go to
- * S_DISCONNECT.
- *
- * If the session is in trouble (i.e. transport-level disconnect or
- * timeout), we go to S_RECONNECT_ATS where we ask ATS for a new
- * address (we don't notify anyone about the disconnect yet). Once we
- * have a new address, we go to S_RECONNECT_BLACKLIST to check the new
- * address against the blacklist. If the blacklist approves, we enter
- * S_RECONNECT_SENT and send a CONNECT message. If we receive a
- * CONNECT_ACK, we go to S_CONNECTED and nobody noticed that we had
- * trouble; we also send a SESSION_ACK at this time just in case. If
- * the operation times out, we go to S_DISCONNECT (and notify everyone
- * about the lost connection).
- *
- * If ATS decides to switch addresses while we have a normal
- * connection, we go to S_CONNECTED_SWITCHING_BLACKLIST to check the
- * new address against the blacklist. If the blacklist approves, we
- * go to S_CONNECTED_SWITCHING_CONNECT_SENT and send a
- * SESSION_CONNECT. If we get a SESSION_ACK back, we switch the
- * primary connection to the suggested alternative from ATS, go back
- * to S_CONNECTED and send a SESSION_ACK to the other peer just to be
- * sure. If the operation times out (or the blacklist disapproves),
- * we go to S_CONNECTED (and notify ATS that the given alternative
- * address is "invalid").
- *
- * Once a session is in S_DISCONNECT, it is cleaned up and then goes
- * to (S_DISCONNECT_FINISHED). If we receive an explicit disconnect
- * request, we can go from any state to S_DISCONNECT, possibly after
- * generating disconnect notifications.
- *
- * Note that it is quite possible that while we are in any of these
- * states, we could receive a 'CONNECT' request from the other peer.
- * We then enter a 'weird' state where we pursue our own primary state
- * machine (as described above), but with the 'send_connect_ack' flag
- * set to 1. If our state machine allows us to send a 'CONNECT_ACK'
- * (because we have an acceptable address), we send the 'CONNECT_ACK'
- * and set the 'send_connect_ack' to 2. If we then receive a
- * 'SESSION_ACK', we go to 'S_CONNECTED' (and reset 'send_connect_ack'
- * to 0).
- *
- */
-enum State
-{
- /**
- * fresh peer or completely disconnected
- */
- S_NOT_CONNECTED = 0,
-
- /**
- * Asked to initiate connection, trying to get address from ATS
- */
- S_INIT_ATS,
-
- /**
- * Asked to initiate connection, trying to get address approved
- * by blacklist.
- */
- S_INIT_BLACKLIST,
-
- /**
- * Sent CONNECT message to other peer, waiting for CONNECT_ACK
- */
- S_CONNECT_SENT,
-
- /**
- * Received a CONNECT, do a blacklist check for inbound address
- */
- S_CONNECT_RECV_BLACKLIST_INBOUND,
-
- /**
- * Received a CONNECT, asking ATS about address suggestions.
- */
- S_CONNECT_RECV_ATS,
-
- /**
- * Received CONNECT from other peer, got an address, checking with blacklist.
- */
- S_CONNECT_RECV_BLACKLIST,
-
- /**
- * CONNECT request from other peer was SESSION_ACK'ed, waiting for
- * SESSION_ACK.
- */
- S_CONNECT_RECV_ACK,
-
- /**
- * Got our CONNECT_ACK/SESSION_ACK, connection is up.
- */
- S_CONNECTED,
-
- /**
- * Connection got into trouble, rest of the system still believes
- * it to be up, but we're getting a new address from ATS.
- */
- S_RECONNECT_ATS,
-
- /**
- * Connection got into trouble, rest of the system still believes
- * it to be up; we are checking the new address against the blacklist.
- */
- S_RECONNECT_BLACKLIST,
-
- /**
- * Sent CONNECT over new address (either by ATS telling us to switch
- * addresses or from RECONNECT_ATS); if this fails, we need to tell
- * the rest of the system about a disconnect.
- */
- S_RECONNECT_SENT,
-
- /**
- * We have some primary connection, but ATS suggested we switch
- * to some alternative; we're now checking the alternative against
- * the blacklist.
- */
- S_CONNECTED_SWITCHING_BLACKLIST,
-
- /**
- * We have some primary connection, but ATS suggested we switch
- * to some alternative; we now sent a CONNECT message for the
- * alternative session to the other peer and waiting for a
- * CONNECT_ACK to make this our primary connection.
- */
- S_CONNECTED_SWITCHING_CONNECT_SENT,
-
- /**
- * Disconnect in progress (we're sending the DISCONNECT message to the
- * other peer; after that is finished, the state will be cleaned up).
- */
- S_DISCONNECT,
-
- /**
- * We're finished with the disconnect; and are cleaning up the state
- * now! We put the struct into this state when we are really in the
- * task that calls 'free' on it and are about to remove the record
- * from the map. We should never find a 'struct NeighbourMapEntry'
- * in this state in the map. Accessing a 'struct NeighbourMapEntry'
- * in this state virtually always means using memory that has been
- * freed (the exception being the cleanup code in 'free_neighbour').
- */
- S_DISCONNECT_FINISHED
-};
/**
* Did we tell ATS that this is our 'active' address?
*/
int ats_active;
-
+
+ /**
+ * The current nonce sent in the last keep alive messages
+ */
+ uint32_t keep_alive_nonce;
};
struct GNUNET_TIME_Absolute keep_alive_time;
/**
- * At what time did we sent the last keep-alive message? Used
+ * At what time did we sent the last keep-alive message? Used
* to calculate round-trip time ("latency").
*/
struct GNUNET_TIME_Absolute last_keep_alive_time;
/**
* Timestamp we should include in our next CONNECT_ACK message.
- * (only valid if 'send_connect_ack' is GNUNET_YES). Used to build
+ * (only valid if 'send_connect_ack' is #GNUNET_YES). Used to build
* our CONNECT_ACK message.
*/
struct GNUNET_TIME_Absolute connect_ack_timestamp;
+ /**
+ * ATS address suggest handle
+ */
+ struct GNUNET_ATS_SuggestHandle *suggest_handle;
+
/**
* Time where we should cut the connection (timeout) if we don't
* make progress in the state machine (or get a KEEPALIVE_RESPONSE
/**
* The current state of the peer.
*/
- enum State state;
+ enum GNUNET_TRANSPORT_PeerState state;
/**
* Did we sent an KEEP_ALIVE message and are we expecting a response?
*/
int send_connect_ack;
+ /**
+ * Tracking utilization of outbound bandwidth
+ */
+ uint32_t util_payload_bytes_sent;
+
+ /**
+ * Tracking utilization of inbound bandwidth
+ */
+ uint32_t util_payload_bytes_recv;
+
+ /**
+ * Tracking utilization of outbound bandwidth
+ */
+ uint32_t util_total_bytes_sent;
+
+ /**
+ * Tracking utilization of inbound bandwidth
+ */
+ uint32_t util_total_bytes_recv;
+
+ /**
+ * Date of last utilization transmission
+ */
+ struct GNUNET_TIME_Absolute last_util_transmission;
};
/**
- * Context for blacklist checks and the 'handle_test_blacklist_cont'
+ * Context for blacklist checks and the #handle_test_blacklist_cont()
* function. Stores information about ongoing blacklist checks.
*/
struct BlackListCheckContext
{
-
+
/**
* We keep blacklist checks in a DLL.
*/
* Address that is being checked.
*/
struct NeighbourAddress na;
-
- /**
- * ATS information about the address.
- */
- struct GNUNET_ATS_Information *ats;
/**
* Handle to the ongoing blacklist check.
*/
struct GST_BlacklistCheck *bc;
-
- /**
- * Size of the 'ats' array.
- */
- uint32_t ats_count;
-
};
/**
* Hash map from peer identities to the respective 'struct NeighbourMapEntry'.
*/
-static struct GNUNET_CONTAINER_MultiHashMap *neighbours;
+static struct GNUNET_CONTAINER_MultiPeerMap *neighbours;
/**
* We keep blacklist checks in a DLL so that we can find
static struct BlackListCheckContext *bc_tail;
/**
- * Closure for connect_notify_cb, disconnect_notify_cb and address_change_cb
+ * Closure for #connect_notify_cb, #disconnect_notify_cb and #neighbour_change_cb
*/
static void *callback_cls;
/**
* Function to call when we connected to a neighbour.
*/
-static GNUNET_TRANSPORT_NotifyConnect connect_notify_cb;
+static NotifyConnect connect_notify_cb;
/**
* Function to call when we disconnected from a neighbour.
static GNUNET_TRANSPORT_NotifyDisconnect disconnect_notify_cb;
/**
- * Function to call when we changed an active address of a neighbour.
+ * Function to call when a neighbour changed address, state or bandwidth.
*/
-static GNUNET_TRANSPORT_PeerIterateCallback address_change_cb;
+static GNUNET_TRANSPORT_NeighbourChangeCallback neighbour_change_cb;
/**
* counter for connected neighbours
*/
static unsigned long long bytes_in_send_queue;
+/**
+ * Task transmitting utilization data
+ */
+static GNUNET_SCHEDULER_TaskIdentifier util_transmission_tk;
+
/**
* Lookup a neighbour entry in the neighbours hash map.
{
if (NULL == neighbours)
return NULL;
- return GNUNET_CONTAINER_multihashmap_get (neighbours, &pid->hashPubKey);
+ return GNUNET_CONTAINER_multipeermap_get (neighbours, pid);
}
-static const char *
-print_state (int state)
-{
-
- switch (state)
- {
- case S_NOT_CONNECTED:
- return "S_NOT_CONNECTED";
- break;
- case S_INIT_ATS:
- return "S_INIT_ATS";
- break;
- case S_INIT_BLACKLIST:
- return "S_INIT_BLACKLIST";
- break;
- case S_CONNECT_SENT:
- return "S_CONNECT_SENT";
- break;
- case S_CONNECT_RECV_BLACKLIST_INBOUND:
- return "S_CONNECT_RECV_BLACKLIST_INBOUND";
- break;
- case S_CONNECT_RECV_ATS:
- return "S_CONNECT_RECV_ATS";
- break;
- case S_CONNECT_RECV_BLACKLIST:
- return "S_CONNECT_RECV_BLACKLIST";
- break;
- case S_CONNECT_RECV_ACK:
- return "S_CONNECT_RECV_ACK";
- break;
- case S_CONNECTED:
- return "S_CONNECTED";
- break;
- case S_RECONNECT_ATS:
- return "S_RECONNECT_ATS";
- break;
- case S_RECONNECT_BLACKLIST:
- return "S_RECONNECT_BLACKLIST";
- break;
- case S_RECONNECT_SENT:
- return "S_RECONNECT_SENT";
- break;
- case S_CONNECTED_SWITCHING_BLACKLIST:
- return "S_CONNECTED_SWITCHING_BLACKLIST";
- break;
- case S_CONNECTED_SWITCHING_CONNECT_SENT:
- return "S_CONNECTED_SWITCHING_CONNECT_SENT";
- break;
- case S_DISCONNECT:
- return "S_DISCONNECT";
- break;
- case S_DISCONNECT_FINISHED:
- return "S_DISCONNECT_FINISHED";
- break;
- default:
- return "UNDEFINED";
- GNUNET_break (0);
- break;
- }
- GNUNET_break (0);
- return "UNDEFINED";
-}
/**
* Test if we're connected to the given peer.
*
* @param n neighbour entry of peer to test
- * @return GNUNET_YES if we are connected, GNUNET_NO if not
+ * @return #GNUNET_YES if we are connected, #GNUNET_NO if not
*/
static int
test_connected (struct NeighbourMapEntry *n)
{
if (NULL == n)
return GNUNET_NO;
- switch (n->state)
- {
- case S_NOT_CONNECTED:
- case S_INIT_ATS:
- case S_INIT_BLACKLIST:
- case S_CONNECT_SENT:
- case S_CONNECT_RECV_BLACKLIST_INBOUND:
- case S_CONNECT_RECV_ATS:
- case S_CONNECT_RECV_BLACKLIST:
- case S_CONNECT_RECV_ACK:
- return GNUNET_NO;
- case S_CONNECTED:
- case S_RECONNECT_ATS:
- case S_RECONNECT_BLACKLIST:
- case S_RECONNECT_SENT:
- case S_CONNECTED_SWITCHING_BLACKLIST:
- case S_CONNECTED_SWITCHING_CONNECT_SENT:
- return GNUNET_YES;
- case S_DISCONNECT:
- case S_DISCONNECT_FINISHED:
- return GNUNET_NO;
- default:
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unhandled state `%s' \n",print_state (n->state));
- GNUNET_break (0);
- break;
- }
- return GNUNET_SYSERR;
+ return GNUNET_TRANSPORT_is_connected (n->state);
}
/**
* Release its resources and give appropriate notifications
* to ATS and other subsystems.
*
- * @param na address we are done with; 'na' itself must NOT be 'free'd, only the contents!
+ * @param na address we are done with; @a na itself must NOT be 'free'd, only the contents!
*/
static void
free_address (struct NeighbourAddress *na)
{
if (GNUNET_YES == na->ats_active)
{
- GST_validation_set_address_use (na->address, na->session, GNUNET_NO, __LINE__);
+ GST_validation_set_address_use (na->address, na->session, GNUNET_NO);
GNUNET_ATS_address_in_use (GST_ats, na->address, na->session, GNUNET_NO);
}
na->ats_active = GNUNET_NO;
+ na->keep_alive_nonce = 0;
if (NULL != na->address)
{
GNUNET_HELLO_address_free (na->address);
/**
- * Initialize the 'struct NeighbourAddress'.
+ * Set net state for this neighbour and notify monitoring
+ *
+ * @param n the respective neighbour
+ * @param s the new state
+ */
+static void
+set_state (struct NeighbourMapEntry *n, enum GNUNET_TRANSPORT_PeerState s)
+{
+ n->state = s;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Neighbour `%s' changed state to %s\n",
+ GNUNET_i2s (&n->id),
+ GNUNET_TRANSPORT_p2s(s));
+ neighbour_change_cb (callback_cls,
+ &n->id,
+ n->primary_address.address,
+ n->state, n->timeout,
+ n->primary_address.bandwidth_in,
+ n->primary_address.bandwidth_out);
+
+}
+
+/**
+ * Set net state and state timeout for this neighbour and notify monitoring
+ *
+ * @param n the respective neighbour
+ * @param s the new state
+ * @param timeout the new timeout
+ */
+static void
+set_state_and_timeout (struct NeighbourMapEntry *n,
+ enum GNUNET_TRANSPORT_PeerState s,
+ struct GNUNET_TIME_Absolute timeout)
+{
+ n->state = s;
+ n->timeout = timeout;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Neighbour `%s' changed state to %s with timeout %s\n",
+ GNUNET_i2s (&n->id),
+ GNUNET_TRANSPORT_p2s(s),
+ GNUNET_STRINGS_absolute_time_to_string (timeout));
+ neighbour_change_cb (callback_cls,
+ &n->id,
+ n->primary_address.address,
+ n->state, n->timeout,
+ n->primary_address.bandwidth_in,
+ n->primary_address.bandwidth_out);
+}
+
+
+/**
+ * Set new state timeout for this neighbour and notify monitoring
+ *
+ * @param n the respective neighbour
+ * @param timeout the new timeout
+ */
+static void
+set_timeout (struct NeighbourMapEntry *n,
+ struct GNUNET_TIME_Absolute timeout)
+{
+ n->timeout = timeout;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Neighbour `%s' changed timeout %s\n",
+ GNUNET_i2s (&n->id),
+ GNUNET_STRINGS_absolute_time_to_string (timeout));
+ neighbour_change_cb (callback_cls,
+ &n->id,
+ n->primary_address.address,
+ n->state, n->timeout,
+ n->primary_address.bandwidth_in,
+ n->primary_address.bandwidth_out);
+}
+
+
+/**
+ * Initialize the alternative address of a neighbour
*
- * @param na neighbour address to initialize
+ * @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 is_active #GNUNET_YES to mark this as the active address with ATS
*/
static void
-set_address (struct NeighbourAddress *na,
+set_alternative_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)
+{
+ struct GNUNET_TRANSPORT_PluginFunctions *papi;
+ if (NULL == (papi = GST_plugins_find (address->transport_name)))
+ {
+ GNUNET_break (0);
+ return;
+ }
+ if (session == n->alternative_address.session)
+ {
+ n->alternative_address.bandwidth_in = bandwidth_in;
+ n->alternative_address.bandwidth_out = bandwidth_out;
+ return;
+ }
+ free_address (&n->alternative_address);
+ if (NULL == session)
+ session = papi->get_session (papi->cls, address);
+ if (NULL == session)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Failed to obtain new session for peer `%s' and address '%s'\n",
+ GNUNET_i2s (&address->peer), GST_plugins_a2s (address));
+ GNUNET_ATS_address_destroyed (GST_ats, address, NULL);
+ return;
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Neighbour `%s' configured alternative address %s\n",
+ GNUNET_i2s (&n->id),
+ GST_plugins_a2s(address));
+
+ n->alternative_address.address = GNUNET_HELLO_address_copy (address);
+ n->alternative_address.bandwidth_in = bandwidth_in;
+ n->alternative_address.bandwidth_out = bandwidth_out;
+ n->alternative_address.session = session;
+ n->alternative_address.ats_active = GNUNET_NO;
+ n->alternative_address.keep_alive_nonce = 0;
+}
+
+
+/**
+ * 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
+ * @param is_active #GNUNET_YES to mark this as the active address with ATS
+ */
+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_TRANSPORT_PluginFunctions *papi;
- if (NULL == (papi = GST_plugins_find (address->transport_name)))
+ if (NULL == (papi = GST_plugins_find (address->transport_name)))
{
GNUNET_break (0);
return;
}
- if (session == na->session)
+ if (session == n->primary_address.session)
{
- na->bandwidth_in = bandwidth_in;
- na->bandwidth_out = bandwidth_out;
- if (is_active != na->ats_active)
+ n->primary_address.bandwidth_in = bandwidth_in;
+ n->primary_address.bandwidth_out = bandwidth_out;
+ if (is_active != n->primary_address.ats_active)
{
- na->ats_active = is_active;
- GNUNET_ATS_address_in_use (GST_ats, na->address, na->session, is_active);
- GST_validation_set_address_use (na->address, na->session, is_active, __LINE__);
+ n->primary_address.ats_active = is_active;
+ GNUNET_ATS_address_in_use (GST_ats, n->primary_address.address, n->primary_address.session, is_active);
+ GST_validation_set_address_use (n->primary_address.address, n->primary_address.session, is_active);
}
if (GNUNET_YES == is_active)
{
- /* FIXME: is this the right place to set quotas? */
GST_neighbours_set_incoming_quota (&address->peer, bandwidth_in);
send_outbound_quota (&address->peer, bandwidth_out);
- }
+ }
return;
}
- free_address (na);
+ free_address (&n->primary_address);
if (NULL == session)
- session = papi->get_session (papi->cls, address);
+ session = papi->get_session (papi->cls, address);
if (NULL == session)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Failed to obtain new session for peer `%s' and address '%s'\n",
- GNUNET_i2s (&address->peer), GST_plugins_a2s (address));
+ GNUNET_i2s (&address->peer), GST_plugins_a2s (address));
GNUNET_ATS_address_destroyed (GST_ats, address, NULL);
return;
}
- na->address = GNUNET_HELLO_address_copy (address);
- na->bandwidth_in = bandwidth_in;
- na->bandwidth_out = bandwidth_out;
- na->session = session;
- na->ats_active = is_active;
+
+ 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)
{
/* Telling ATS about new session */
- GNUNET_ATS_address_in_use (GST_ats, na->address, na->session, GNUNET_YES);
- GST_validation_set_address_use (na->address, na->session, GNUNET_YES, __LINE__);
-
- /* FIXME: is this the right place to set quotas? */
+ GNUNET_ATS_address_in_use (GST_ats, n->primary_address.address, n->primary_address.session, GNUNET_YES);
+ GST_validation_set_address_use (n->primary_address.address, n->primary_address.session, 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));
+
+ neighbour_change_cb (callback_cls,
+ &n->id,
+ n->primary_address.address,
+ n->state, n->timeout,
+ n->primary_address.bandwidth_in,
+ n->primary_address.bandwidth_out);
+}
+
+/**
+ * Clear the primary address of a neighbour since this primary address is not
+ * valid anymore and notify monitoring about it
+ *
+ * @param n the neighbour
+ */
+static void
+unset_primary_address (struct NeighbourMapEntry *n)
+{
+
}
* Free a neighbour map entry.
*
* @param n entry to free
- * @param keep_sessions GNUNET_NO to tell plugin to terminate sessions,
- * GNUNET_YES to keep all sessions
+ * @param keep_sessions #GNUNET_NO to tell plugin to terminate sessions,
+ * #GNUNET_YES to keep all sessions
*/
static void
-free_neighbour (struct NeighbourMapEntry *n, int keep_sessions)
+free_neighbour (struct NeighbourMapEntry *n,
+ int keep_sessions)
{
struct MessageQueue *mq;
struct GNUNET_TRANSPORT_PluginFunctions *papi;
- struct GNUNET_HELLO_Address *old_address;
+ struct GNUNET_HELLO_Address *backup_primary;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Freeing neighbur state of peer `%s'\n",
+ GNUNET_i2s (&n->id));
n->is_active = NULL; /* always free'd by its own continuation! */
/* fail messages currently in the queue */
{
GNUNET_CONTAINER_DLL_remove (n->messages_head, n->messages_tail, mq);
if (NULL != mq->cont)
- mq->cont (mq->cont_cls, GNUNET_SYSERR);
+ mq->cont (mq->cont_cls, GNUNET_SYSERR, mq->message_buf_size, 0);
GNUNET_free (mq);
}
/* It is too late to send other peer disconnect notifications, but at
least internally we need to get clean... */
if (GNUNET_YES == test_connected (n))
{
- GNUNET_STATISTICS_set (GST_stats,
- gettext_noop ("# peers connected"),
+ GNUNET_STATISTICS_set (GST_stats,
+ gettext_noop ("# peers connected"),
--neighbours_connected,
GNUNET_NO);
disconnect_notify_cb (callback_cls, &n->id);
}
+ set_state (n, GNUNET_TRANSPORT_DISCONNECT_FINISHED);
+ if (NULL != n->primary_address.address)
+ {
+ backup_primary = GNUNET_HELLO_address_copy (n->primary_address.address);
+ }
+ else
+ backup_primary = NULL;
- /* cut transport-level connection */
- old_address = GNUNET_HELLO_address_copy(n->primary_address.address);
+ /* free addresses and mark as unused */
free_address (&n->primary_address);
free_address (&n->alternative_address);
- /* FIXME-PLUGIN-API: This does not seem to guarantee that all
- transport sessions eventually get killed due to inactivity; they
- MUST have their own timeout logic (but at least TCP doesn't have
- one yet). Are we sure that EVERY 'session' of a plugin is
- actually cleaned up this way!? Note that if we are switching
- between two TCP sessions to the same peer, the existing plugin
- API gives us not even the means to selectively kill only one of
+ /* FIXME: Note that if we are switching between two TCP sessions to
+ the same peer, we might want to selectively kill only one of
them! Killing all sessions like this seems to be very, very
wrong. */
+ /* cut transport-level connection */
if ((GNUNET_NO == keep_sessions) &&
- (NULL != old_address) &&
- (NULL != (papi = GST_plugins_find (old_address->transport_name))))
- papi->disconnect (papi->cls, &n->id);
+ (NULL != backup_primary) &&
+ (NULL != (papi = GST_plugins_find (backup_primary->transport_name))))
+ papi->disconnect_peer (papi->cls, &n->id);
- GNUNET_free (old_address);
-
- n->state = S_DISCONNECT_FINISHED;
+ GNUNET_free_non_null (backup_primary);
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (neighbours,
- &n->id.hashPubKey, n));
+ GNUNET_CONTAINER_multipeermap_remove (neighbours,
+ &n->id, n));
// FIXME-ATS-API: we might want to be more specific about
// which states we do this from in the future (ATS should
// have given us a 'suggest_address' handle, and if we have
// such a handle, we should cancel the operation here!
- GNUNET_ATS_suggest_address_cancel (GST_ats, &n->id);
+ if (NULL != n->suggest_handle)
+ {
+ GNUNET_ATS_suggest_address_cancel (GST_ats, &n->id);
+ n->suggest_handle = NULL;
+ }
if (GNUNET_SCHEDULER_NO_TASK != n->task)
{
*
* @param n entry for the recipient
* @param msgbuf buffer to transmit
- * @param msgbuf_size number of bytes in buffer
+ * @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 cont
+ * @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
+static struct GNUNET_TIME_Relative
send_with_session (struct NeighbourMapEntry *n,
const char *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))) ||
+ 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,
- timeout,
- cont, cont_cls))) &&
- (NULL != cont) )
- cont (cont_cls, &n->id, GNUNET_SYSERR);
+ (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->id,
+ n->primary_address.address, n->primary_address.session, msgbuf_size);
GNUNET_break (NULL != papi);
+ return result;
}
* activities (keep alive, send next message, disconnect if idle, finish
* clean up after disconnect).
*
- * @param cls the 'struct NeighbourMapEntry' for which we are running
+ * @param cls the `struct NeighbourMapEntry` for which we are running
* @param tc scheduler context (unused)
*/
static void
*
* @param cls NULL
* @param target identity of the neighbour that was disconnected
- * @param result GNUNET_OK if the disconnect got out successfully
+ * @param result #GNUNET_OK if the disconnect got out successfully
+ * @param payload bytes payload
+ * @param physical bytes physical
*/
static void
send_disconnect_cont (void *cls, const struct GNUNET_PeerIdentity *target,
- int result)
+ int result, size_t payload, size_t physical)
{
struct NeighbourMapEntry *n;
n = lookup_neighbour (target);
if (NULL == n)
return; /* already gone */
- if (S_DISCONNECT != n->state)
+ if (GNUNET_TRANSPORT_DISCONNECT != n->state)
return; /* have created a fresh entry since */
- n->state = S_DISCONNECT;
if (GNUNET_SCHEDULER_NO_TASK != n->task)
GNUNET_SCHEDULER_cancel (n->task);
n->task = GNUNET_SCHEDULER_add_now (&master_task, n);
htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT);
disconnect_msg.reserved = htonl (0);
disconnect_msg.purpose.size =
- htonl (sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) +
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) +
+ htonl (sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) +
+ sizeof (struct GNUNET_CRYPTO_EddsaPublicKey) +
sizeof (struct GNUNET_TIME_AbsoluteNBO));
disconnect_msg.purpose.purpose =
htonl (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT);
disconnect_msg.timestamp =
GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ());
- disconnect_msg.public_key = GST_my_public_key;
+ disconnect_msg.public_key = GST_my_identity.public_key;
GNUNET_assert (GNUNET_OK ==
- GNUNET_CRYPTO_rsa_sign (GST_my_private_key,
+ GNUNET_CRYPTO_eddsa_sign (GST_my_private_key,
&disconnect_msg.purpose,
&disconnect_msg.signature));
- send_with_session (n,
- (const char *) &disconnect_msg, sizeof (disconnect_msg),
- UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL,
- &send_disconnect_cont, NULL);
+ (void) send_with_session (n,
+ (const char *) &disconnect_msg, sizeof (disconnect_msg),
+ UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_NO, &send_disconnect_cont, NULL);
GNUNET_STATISTICS_update (GST_stats,
gettext_noop
("# DISCONNECT messages sent"), 1,
static void
disconnect_neighbour (struct NeighbourMapEntry *n)
{
- /* depending on state, notify neighbour and/or upper layers of this peer
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Disconnecting from peer %s in state %s\n",
+ GNUNET_i2s (&n->id),
+ GNUNET_TRANSPORT_p2s (n->state));
+ /* depending on state, notify neighbour and/or upper layers of this peer
about disconnect */
switch (n->state)
{
- case S_NOT_CONNECTED:
- case S_INIT_ATS:
- case S_INIT_BLACKLIST:
+ case GNUNET_TRANSPORT_NOT_CONNECTED:
+ case GNUNET_TRANSPORT_INIT_ATS:
+ case GNUNET_TRANSPORT_INIT_BLACKLIST:
/* other peer is completely unaware of us, no need to send DISCONNECT */
- n->state = S_DISCONNECT_FINISHED;
+ set_state (n, GNUNET_TRANSPORT_DISCONNECT_FINISHED);
free_neighbour (n, GNUNET_NO);
return;
- case S_CONNECT_SENT:
- send_disconnect (n);
- n->state = S_DISCONNECT;
+ case GNUNET_TRANSPORT_CONNECT_SENT:
+ send_disconnect (n);
+ set_state (n, GNUNET_TRANSPORT_DISCONNECT);
break;
- case S_CONNECT_RECV_BLACKLIST_INBOUND:
- case S_CONNECT_RECV_ATS:
- case S_CONNECT_RECV_BLACKLIST:
+ case GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST_INBOUND:
+ case GNUNET_TRANSPORT_CONNECT_RECV_ATS:
+ case GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST:
/* we never ACK'ed the other peer's request, no need to send DISCONNECT */
- n->state = S_DISCONNECT_FINISHED;
+ set_state (n, GNUNET_TRANSPORT_DISCONNECT_FINISHED);
free_neighbour (n, GNUNET_NO);
return;
- case S_CONNECT_RECV_ACK:
+ case GNUNET_TRANSPORT_CONNECT_RECV_ACK:
/* we DID ACK the other peer's request, must send DISCONNECT */
- send_disconnect (n);
- n->state = S_DISCONNECT;
- break;
- case S_CONNECTED:
- case S_RECONNECT_BLACKLIST:
- case S_RECONNECT_SENT:
- case S_CONNECTED_SWITCHING_BLACKLIST:
- case S_CONNECTED_SWITCHING_CONNECT_SENT:
+ send_disconnect (n);
+ set_state (n, GNUNET_TRANSPORT_DISCONNECT);
+ break;
+ case GNUNET_TRANSPORT_CONNECTED:
+ case GNUNET_TRANSPORT_RECONNECT_BLACKLIST:
+ case GNUNET_TRANSPORT_RECONNECT_SENT:
+ case GNUNET_TRANSPORT_CONNECTED_SWITCHING_BLACKLIST:
+ case GNUNET_TRANSPORT_CONNECTED_SWITCHING_CONNECT_SENT:
/* we are currently connected, need to send disconnect and do
internal notifications and update statistics */
send_disconnect (n);
- GNUNET_STATISTICS_set (GST_stats,
- gettext_noop ("# peers connected"),
+ GNUNET_STATISTICS_set (GST_stats,
+ gettext_noop ("# peers connected"),
--neighbours_connected,
GNUNET_NO);
disconnect_notify_cb (callback_cls, &n->id);
- n->state = S_DISCONNECT;
+ set_state (n, GNUNET_TRANSPORT_DISCONNECT);
break;
- case S_RECONNECT_ATS:
+ case GNUNET_TRANSPORT_RECONNECT_ATS:
/* ATS address request timeout, disconnect without sending disconnect message */
GNUNET_STATISTICS_set (GST_stats,
gettext_noop ("# peers connected"),
--neighbours_connected,
GNUNET_NO);
disconnect_notify_cb (callback_cls, &n->id);
- n->state = S_DISCONNECT;
+ set_state (n, GNUNET_TRANSPORT_DISCONNECT);
break;
- case S_DISCONNECT:
+ case GNUNET_TRANSPORT_DISCONNECT:
/* already disconnected, ignore */
break;
- case S_DISCONNECT_FINISHED:
+ case GNUNET_TRANSPORT_DISCONNECT_FINISHED:
/* already cleaned up, how did we get here!? */
GNUNET_assert (0);
break;
default:
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unhandled state `%s' \n",print_state (n->state));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Unhandled state `%s'\n",
+ GNUNET_TRANSPORT_p2s (n->state));
GNUNET_break (0);
break;
}
/**
* We're done with our transmission attempt, continue processing.
*
- * @param cls the 'struct MessageQueue' of the message
+ * @param cls the `struct MessageQueue` of the message
* @param receiver intended receiver
* @param success whether it worked or not
+ * @param size_payload bytes payload sent
+ * @param physical bytes sent on wire
*/
static void
transmit_send_continuation (void *cls,
const struct GNUNET_PeerIdentity *receiver,
- int success)
+ int success, size_t size_payload, size_t physical)
{
struct MessageQueue *mq = cls;
struct NeighbourMapEntry *n;
n->is_active = NULL;
if (GNUNET_SCHEDULER_NO_TASK != 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, mq->message_buf_size,
+ (GNUNET_OK == success) ? "OK" : "FAIL",
+ size_payload, physical);
+ GNUNET_break (0);
}
- GNUNET_assert (bytes_in_send_queue >= mq->message_buf_size);
+
+
+ GNUNET_break (size_payload == mq->message_buf_size);
bytes_in_send_queue -= mq->message_buf_size;
GNUNET_STATISTICS_set (GST_stats,
gettext_noop
gettext_noop
("# transmission failures for messages to other peers"),
1, GNUNET_NO);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Sending message to `%s' of type %u was a %s\n",
GNUNET_i2s (receiver),
ntohs (((struct GNUNET_MessageHeader *) mq->message_buf)->type),
(success == GNUNET_OK) ? "success" : "FAILURE");
if (NULL != mq->cont)
- mq->cont (mq->cont_cls, success);
+ mq->cont (mq->cont_cls, success, size_payload, physical);
GNUNET_free (mq);
}
GNUNET_break (0);
return;
}
- if ((0 == n->primary_address.address->address_length) &&
+ if ((0 == n->primary_address.address->address_length) &&
(NULL == n->primary_address.session))
{
/* no address, why are we here? */
if (NULL != n->is_active)
{
/* transmission already pending */
- return;
+ return;
}
/* timeout messages from the queue that are past their due date */
while (NULL != (mq = n->messages_head))
{
timeout = GNUNET_TIME_absolute_get_remaining (mq->timeout);
- if (timeout.rel_value > 0)
+ if (timeout.rel_value_us > 0)
break;
GNUNET_STATISTICS_update (GST_stats,
gettext_noop
1, GNUNET_NO);
GNUNET_CONTAINER_DLL_remove (n->messages_head, n->messages_tail, mq);
n->is_active = mq;
- transmit_send_continuation (mq, &n->id, GNUNET_SYSERR); /* timeout */
+ transmit_send_continuation (mq, &n->id,
+ GNUNET_SYSERR,
+ mq->message_buf_size, 0); /* timeout */
}
if (NULL == mq)
return; /* no more messages */
GNUNET_CONTAINER_DLL_remove (n->messages_head, n->messages_tail, mq);
n->is_active = mq;
- send_with_session (n,
- mq->message_buf, mq->message_buf_size,
- 0 /* priority */, timeout,
- &transmit_send_continuation, mq);
+ (void) send_with_session (n,
+ mq->message_buf, mq->message_buf_size,
+ 0 /* priority */, timeout, GNUNET_NO,
+ &transmit_send_continuation, mq);
}
static void
send_keepalive (struct NeighbourMapEntry *n)
{
- struct GNUNET_MessageHeader m;
+ struct SessionKeepAliveMessage m;
+ struct GNUNET_TIME_Relative timeout;
+ uint32_t nonce;
- GNUNET_assert ((S_CONNECTED == n->state) ||
- (S_CONNECTED_SWITCHING_BLACKLIST == n->state) ||
- (S_CONNECTED_SWITCHING_CONNECT_SENT));
- if (GNUNET_TIME_absolute_get_remaining (n->keep_alive_time).rel_value > 0)
+ GNUNET_assert ((GNUNET_TRANSPORT_CONNECTED == n->state) ||
+ (GNUNET_TRANSPORT_CONNECTED_SWITCHING_BLACKLIST == n->state) ||
+ (GNUNET_TRANSPORT_CONNECTED_SWITCHING_CONNECT_SENT));
+ if (GNUNET_TIME_absolute_get_remaining (n->keep_alive_time).rel_value_us > 0)
return; /* no keepalive needed at this time */
- m.size = htons (sizeof (struct GNUNET_MessageHeader));
- m.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE);
- send_with_session (n,
- (const void *) &m, sizeof (m),
- UINT32_MAX /* priority */,
- KEEPALIVE_FREQUENCY,
- NULL, NULL);
+
+ nonce = 0; /* 0 indicates 'not set' */
+ while (0 == nonce)
+ 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",
+ GNUNET_i2s (&n->id), nonce);
+
+ m.header.size = htons (sizeof (struct SessionKeepAliveMessage));
+ m.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE);
+ m.nonce = htonl (nonce);
+
+ timeout = send_with_session (n,
+ (const void *) &m, sizeof (m),
+ UINT32_MAX /* priority */,
+ GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES,
+ NULL, NULL);
GNUNET_STATISTICS_update (GST_stats, gettext_noop ("# keepalives sent"), 1,
GNUNET_NO);
+ n->primary_address.keep_alive_nonce = nonce;
n->expect_latency_response = GNUNET_YES;
n->last_keep_alive_time = GNUNET_TIME_absolute_get ();
- n->keep_alive_time = GNUNET_TIME_relative_to_absolute (KEEPALIVE_FREQUENCY);
+ n->keep_alive_time = GNUNET_TIME_relative_to_absolute (timeout);
+
}
* we received a KEEPALIVE (or equivalent); send a response.
*
* @param neighbour neighbour to keep alive (by sending keep alive response)
+ * @param m the keep alive message containing the nonce to respond to
*/
void
-GST_neighbours_keepalive (const struct GNUNET_PeerIdentity *neighbour)
+GST_neighbours_keepalive (const struct GNUNET_PeerIdentity *neighbour,
+ const struct GNUNET_MessageHeader *m)
{
struct NeighbourMapEntry *n;
- struct GNUNET_MessageHeader m;
+ const struct SessionKeepAliveMessage *msg_in;
+ struct SessionKeepAliveMessage msg;
+
+ if (sizeof (struct SessionKeepAliveMessage) != ntohs (m->size))
+ return;
+ msg_in = (struct SessionKeepAliveMessage *) m;
if (NULL == (n = lookup_neighbour (neighbour)))
{
GNUNET_STATISTICS_update (GST_stats,
1, GNUNET_NO);
return;
}
+
+ 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));
+
/* send reply to allow neighbour to measure latency */
- m.size = htons (sizeof (struct GNUNET_MessageHeader));
- m.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE_RESPONSE);
- send_with_session(n,
- (const void *) &m, sizeof (m),
- UINT32_MAX /* priority */,
- KEEPALIVE_FREQUENCY,
- NULL, NULL);
+ msg.header.size = htons (sizeof (struct SessionKeepAliveMessage));
+ msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE_RESPONSE);
+ msg.nonce = msg_in->nonce;
+ (void) send_with_session(n,
+ (const void *) &msg, sizeof (struct SessionKeepAliveMessage),
+ UINT32_MAX /* priority */,
+ GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES,
+ NULL, NULL);
}
* plus calculated latency) to ATS.
*
* @param neighbour neighbour to keep alive
- * @param ats performance data
- * @param ats_count number of entries in ats
+ * @param m the message containing the keep alive response
*/
void
GST_neighbours_keepalive_response (const struct GNUNET_PeerIdentity *neighbour,
- const struct GNUNET_ATS_Information *ats,
- uint32_t ats_count)
+ const struct GNUNET_MessageHeader *m)
{
struct NeighbourMapEntry *n;
+ const struct SessionKeepAliveMessage *msg;
+ struct GNUNET_TRANSPORT_PluginFunctions *papi;
uint32_t latency;
- struct GNUNET_ATS_Information ats_new[ats_count + 1];
+ struct GNUNET_ATS_Information ats;
+ if (sizeof (struct SessionKeepAliveMessage) != ntohs (m->size))
+ return;
+
+ msg = (const struct SessionKeepAliveMessage *) m;
if (NULL == (n = lookup_neighbour (neighbour)))
{
GNUNET_STATISTICS_update (GST_stats,
gettext_noop
- ("# KEEPALIVE_RESPONSE messages discarded (not connected)"),
+ ("# KEEPALIVE_RESPONSE messages discarded (not connected)"),
+ 1, GNUNET_NO);
+ return;
+ }
+ if ( (GNUNET_TRANSPORT_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);
+ return;
+ }
+ if (NULL == n->primary_address.address)
+ {
+ GNUNET_STATISTICS_update (GST_stats,
+ gettext_noop
+ ("# KEEPALIVE_RESPONSE messages discarded (address changed)"),
1, GNUNET_NO);
return;
}
- if ( (S_CONNECTED != n->state) ||
- (GNUNET_YES != n->expect_latency_response) )
+ if (n->primary_address.keep_alive_nonce != ntohl (msg->nonce))
{
GNUNET_STATISTICS_update (GST_stats,
gettext_noop
- ("# KEEPALIVE_RESPONSE messages discarded (not expected)"),
+ ("# KEEPALIVE_RESPONSE messages discarded (wrong 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);
+
+ }
+
+ /* 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);
+ }
+ else
+ {
+ GNUNET_break (0);
+ }
+
+ n->primary_address.keep_alive_nonce = 0;
n->expect_latency_response = GNUNET_NO;
n->latency = GNUNET_TIME_absolute_get_duration (n->last_keep_alive_time);
- n->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Latency for peer `%s' is %llu ms\n",
- GNUNET_i2s (&n->id), n->latency.rel_value);
- memcpy (ats_new, ats, sizeof (struct GNUNET_ATS_Information) * ats_count);
+ set_timeout (n, GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Latency for peer `%s' is %s\n",
+ GNUNET_i2s (&n->id),
+ GNUNET_STRINGS_relative_time_to_string (n->latency,
+ GNUNET_YES));
/* append latency */
- ats_new[ats_count].type = htonl (GNUNET_ATS_QUALITY_NET_DELAY);
- if (n->latency.rel_value > UINT32_MAX)
+ ats.type = htonl (GNUNET_ATS_QUALITY_NET_DELAY);
+ if (n->latency.rel_value_us > UINT32_MAX)
latency = UINT32_MAX;
else
- latency = n->latency.rel_value;
- ats_new[ats_count].value = htonl (latency);
- GNUNET_ATS_address_update (GST_ats,
- n->primary_address.address,
- n->primary_address.session, ats_new,
- ats_count + 1);
+ latency = n->latency.rel_value_us;
+ ats.value = htonl (latency);
+ GST_ats_update_metrics (&n->id, n->primary_address.address,
+ n->primary_address.session, &ats, 1);
}
*
* @param sender sender of the message
* @param size size of the message
- * @param do_forward set to GNUNET_YES if the message should be forwarded to clients
- * GNUNET_NO if the neighbour is not connected or violates the quota,
- * GNUNET_SYSERR if the connection is not fully up yet
+ * @param do_forward set to #GNUNET_YES if the message should be forwarded to clients
+ * #GNUNET_NO if the neighbour is not connected or violates the quota,
+ * #GNUNET_SYSERR if the connection is not fully up yet
* @return how long to wait before reading more from this sender
*/
struct GNUNET_TIME_Relative
{
struct NeighbourMapEntry *n;
struct GNUNET_TIME_Relative ret;
-
+
if (NULL == neighbours)
{
*do_forward = GNUNET_NO;
}
*do_forward = GNUNET_YES;
ret = GNUNET_BANDWIDTH_tracker_get_delay (&n->in_tracker, 32 * 1024);
- if (ret.rel_value > 0)
+ if (ret.rel_value_us > 0)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Throttling read (%llu bytes excess at %u b/s), waiting %llu ms before reading more.\n",
+ "Throttling read (%llu bytes excess at %u b/s), waiting %s before reading more.\n",
(unsigned long long) n->in_tracker.
consumption_since_last_update__,
(unsigned int) n->in_tracker.available_bytes_per_s__,
- (unsigned long long) ret.rel_value);
+ GNUNET_STRINGS_relative_time_to_string (ret, GNUNET_YES));
GNUNET_STATISTICS_update (GST_stats,
gettext_noop ("# ms throttling suggested"),
- (int64_t) ret.rel_value, GNUNET_NO);
+ (int64_t) ret.rel_value_us / 1000LL,
+ GNUNET_NO);
}
return ret;
}
{
GNUNET_break (0);
if (NULL != cont)
- cont (cont_cls, GNUNET_SYSERR);
+ 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);
+ cont (cont_cls, GNUNET_SYSERR, msg_size, 0);
return;
}
bytes_in_send_queue += msg_size;
{
struct GNUNET_TRANSPORT_PluginFunctions *papi;
struct SessionConnectMessage connect_msg;
-
- if (NULL == (papi = GST_plugins_find (na->address->transport_name)))
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending SESSION_CONNECT message to peer %s\n",
+ GNUNET_i2s (&na->address->peer));
+ if (NULL == (papi = GST_plugins_find (na->address->transport_name)))
{
GNUNET_break (0);
return;
}
if (NULL == na->session)
- na->session = papi->get_session (papi->cls, na->address);
+ na->session = papi->get_session (papi->cls, na->address);
if (NULL == na->session)
{
GNUNET_break (0);
return;
}
+ GNUNET_STATISTICS_update (GST_stats,
+ gettext_noop
+ ("# SESSION_CONNECT messages sent"),
+ 1, GNUNET_NO);
na->connect_timestamp = GNUNET_TIME_absolute_get ();
connect_msg.header.size = htons (sizeof (struct SessionConnectMessage));
connect_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT);
connect_msg.reserved = htonl (0);
connect_msg.timestamp = GNUNET_TIME_absolute_hton (na->connect_timestamp);
- (void) papi->send (papi->cls,
- na->session,
- (const char *) &connect_msg, sizeof (struct SessionConnectMessage),
- UINT_MAX,
- GNUNET_TIME_UNIT_FOREVER_REL,
- NULL, NULL);
+ if (-1 ==
+ papi->send (papi->cls,
+ na->session,
+ (const char *) &connect_msg, sizeof (struct SessionConnectMessage),
+ UINT_MAX,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ NULL, NULL))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to transmit CONNECT message via plugin to %s\n"),
+ GST_plugins_a2s (na->address));
+ }
+ GST_neighbours_notify_data_sent (&na->address->peer,
+ na->address,
+ na->session,
+ sizeof (struct SessionConnectMessage));
+
}
{
struct GNUNET_TRANSPORT_PluginFunctions *papi;
struct SessionConnectMessage connect_msg;
-
- if (NULL == (papi = GST_plugins_find (address->transport_name)))
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending CONNECT_ACK to peer `%s'\n",
+ GNUNET_i2s (&address->peer));
+ if (NULL == (papi = GST_plugins_find (address->transport_name)))
{
GNUNET_break (0);
return;
}
if (NULL == session)
- session = papi->get_session (papi->cls, address);
+ session = papi->get_session (papi->cls, address);
if (NULL == session)
{
GNUNET_break (0);
return;
}
+ GNUNET_STATISTICS_update (GST_stats,
+ gettext_noop
+ ("# CONNECT_ACK messages sent"),
+ 1, GNUNET_NO);
connect_msg.header.size = htons (sizeof (struct SessionConnectMessage));
connect_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT_ACK);
connect_msg.reserved = htonl (0);
UINT_MAX,
GNUNET_TIME_UNIT_FOREVER_REL,
NULL, NULL);
+
}
struct NeighbourMapEntry *n;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Creating new neighbour entry for `%s'\n",
+ "Creating new neighbour entry for `%s'\n",
GNUNET_i2s (peer));
- n = GNUNET_malloc (sizeof (struct NeighbourMapEntry));
+ n = GNUNET_new (struct NeighbourMapEntry);
n->id = *peer;
- n->state = S_NOT_CONNECTED;
n->latency = GNUNET_TIME_UNIT_FOREVER_REL;
+ n->last_util_transmission = GNUNET_TIME_absolute_get();
+ n->util_payload_bytes_recv = 0;
+ n->util_payload_bytes_sent = 0;
+ n->util_total_bytes_recv = 0;
+ n->util_total_bytes_sent = 0;
GNUNET_BANDWIDTH_tracker_init (&n->in_tracker,
GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT,
MAX_BANDWIDTH_CARRY_S);
n->task = GNUNET_SCHEDULER_add_now (&master_task, n);
+ set_state_and_timeout (n, GNUNET_TRANSPORT_NOT_CONNECTED, GNUNET_TIME_UNIT_FOREVER_ABS);
GNUNET_assert (GNUNET_OK ==
- GNUNET_CONTAINER_multihashmap_put (neighbours,
- &n->id.hashPubKey, n,
+ GNUNET_CONTAINER_multipeermap_put (neighbours,
+ &n->id, n,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
return n;
}
*
* @param a1 first address to compare
* @param a2 other address to compare
- * @return GNUNET_NO if the addresses do not match, GNUNET_YES if they do match
+ * @return #GNUNET_NO if the addresses do not match, #GNUNET_YES if they do match
*/
static int
address_matches (const struct NeighbourAddress *a1,
}
+static void
+address_suggest_cont (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Address *address, struct Session *session,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
+ const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+{
+
+}
+
+
/**
* Try to create a connection to the given target (eventually).
*
{
struct NeighbourMapEntry *n;
- if (NULL == neighbours)
- return; /* during shutdown, do nothing */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Asked to connect to peer `%s'\n",
- GNUNET_i2s (target));
- if (0 ==
- memcmp (target, &GST_my_identity, sizeof (struct GNUNET_PeerIdentity)))
+ if (NULL == neighbours)
{
- /* refuse to connect to myself */
- /* FIXME: can this happen? Is this not an API violation? */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Refusing to try to connect to myself.\n");
- return;
+ "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_p2s(n->state) : "NEW PEER");
if (NULL != n)
{
switch (n->state)
{
- case S_NOT_CONNECTED:
+ case GNUNET_TRANSPORT_NOT_CONNECTED:
/* this should not be possible */
GNUNET_break (0);
free_neighbour (n, GNUNET_NO);
break;
- case S_INIT_ATS:
- case S_INIT_BLACKLIST:
- case S_CONNECT_SENT:
- case S_CONNECT_RECV_BLACKLIST_INBOUND:
- case S_CONNECT_RECV_ATS:
- case S_CONNECT_RECV_BLACKLIST:
- case S_CONNECT_RECV_ACK:
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Ignoring request to try to connect to `%s', already trying!\n",
+ case GNUNET_TRANSPORT_INIT_ATS:
+ case GNUNET_TRANSPORT_INIT_BLACKLIST:
+ case GNUNET_TRANSPORT_CONNECT_SENT:
+ case GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST_INBOUND:
+ case GNUNET_TRANSPORT_CONNECT_RECV_ATS:
+ case GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST:
+ case GNUNET_TRANSPORT_CONNECT_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 S_CONNECTED:
- case S_RECONNECT_ATS:
- case S_RECONNECT_BLACKLIST:
- case S_RECONNECT_SENT:
- case S_CONNECTED_SWITCHING_BLACKLIST:
- case S_CONNECTED_SWITCHING_CONNECT_SENT:
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Ignoring request to try to connect, already connected to `%s'!\n",
+ case GNUNET_TRANSPORT_CONNECTED:
+ case GNUNET_TRANSPORT_RECONNECT_ATS:
+ case GNUNET_TRANSPORT_RECONNECT_BLACKLIST:
+ case GNUNET_TRANSPORT_RECONNECT_SENT:
+ case GNUNET_TRANSPORT_CONNECTED_SWITCHING_BLACKLIST:
+ case GNUNET_TRANSPORT_CONNECTED_SWITCHING_CONNECT_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 S_DISCONNECT:
+ case GNUNET_TRANSPORT_DISCONNECT:
/* get rid of remains, ready to re-try immediately */
free_neighbour (n, GNUNET_NO);
break;
- case S_DISCONNECT_FINISHED:
- /* should not be possible */
- GNUNET_assert (0);
+ case GNUNET_TRANSPORT_DISCONNECT_FINISHED:
+ /* should not be possible */
+ GNUNET_assert (0);
default:
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unhandled state `%s' \n",print_state (n->state));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Unhandled state `%s'\n",
+ GNUNET_TRANSPORT_p2s (n->state));
GNUNET_break (0);
free_neighbour (n, GNUNET_NO);
break;
}
}
- n = setup_neighbour (target);
- n->state = S_INIT_ATS;
- n->timeout = GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT);
+ n = setup_neighbour (target);
+ set_state_and_timeout (n, GNUNET_TRANSPORT_INIT_ATS, GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
GNUNET_ATS_reset_backoff (GST_ats, target);
- GNUNET_ATS_suggest_address (GST_ats, target);
+ n->suggest_handle = GNUNET_ATS_suggest_address (GST_ats, target, &address_suggest_cont, n);
}
/**
* Function called with the result of a blacklist check.
*
- * @param cls closure with the 'struct BlackListCheckContext'
+ * @param cls closure with the `struct BlackListCheckContext`
* @param peer peer this check affects
- * @param result GNUNET_OK if the address is allowed
+ * @param result #GNUNET_OK if the address is allowed
*/
static void
handle_test_blacklist_cont (void *cls,
struct NeighbourMapEntry *n;
bcc->bc = NULL;
+ GNUNET_CONTAINER_DLL_remove (bc_head,
+ bc_tail,
+ bcc);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Connection to new address of peer `%s' based on blacklist is `%s'\n",
GNUNET_i2s (peer),
(GNUNET_OK == result) ? "allowed" : "FORBIDDEN");
+ if (GNUNET_OK == result)
+ {
+ GST_ats_add_address (bcc->na.address, bcc->na.session, NULL, 0);
+ }
+ else
+ {
+ /* Blacklist disagreed on connecting to a peer with this address
+ * Destroy address because we are not allowed to use it
+ */
+ if (NULL != bcc->na.session)
+ GNUNET_ATS_address_destroyed (GST_ats, bcc->na.address, bcc->na.session);
+ GNUNET_ATS_address_destroyed (GST_ats, bcc->na.address, NULL);
+ }
if (NULL == (n = lookup_neighbour (peer)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "No neighbor entry for peer `%s', ignoring blacklist result\n",
+ GNUNET_i2s (peer));
goto cleanup; /* nobody left to care about new address */
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received blacklist result for peer `%s' in state %s/%d\n",
+ GNUNET_i2s (peer),
+ GNUNET_TRANSPORT_p2s (n->state),
+ n->send_connect_ack);
switch (n->state)
{
- case S_NOT_CONNECTED:
+ case GNUNET_TRANSPORT_NOT_CONNECTED:
/* this should not be possible */
GNUNET_break (0);
free_neighbour (n, GNUNET_NO);
break;
- case S_INIT_ATS:
- /* still waiting on ATS suggestion */
+ case GNUNET_TRANSPORT_INIT_ATS:
+ /* waiting on ATS suggestion; still, pass address to ATS as a
+ possibility */
break;
- case S_INIT_BLACKLIST:
+ case GNUNET_TRANSPORT_INIT_BLACKLIST:
/* check if the address the blacklist was fine with matches
ATS suggestion, if so, we can move on! */
if ( (GNUNET_OK == result) &&
n->connect_ack_timestamp);
}
if (GNUNET_YES != address_matches (&bcc->na, &n->primary_address))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Blacklist result for peer %s is for non-primary address, ignored\n",
+ GNUNET_i2s (peer));
break; /* result for an address we currently don't care about */
+ }
if (GNUNET_OK == result)
{
- n->timeout = GNUNET_TIME_relative_to_absolute (SETUP_CONNECTION_TIMEOUT);
- n->state = S_CONNECT_SENT;
+ set_state_and_timeout (n, GNUNET_TRANSPORT_CONNECT_SENT, GNUNET_TIME_relative_to_absolute (SETUP_CONNECTION_TIMEOUT));
send_session_connect (&n->primary_address);
}
else
{
- // FIXME: should also possibly destroy session with plugin!?
- GNUNET_ATS_address_destroyed (GST_ats,
- bcc->na.address,
- NULL);
free_address (&n->primary_address);
- n->state = S_INIT_ATS;
- n->timeout = GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT);
- // FIXME: do we need to ask ATS again for suggestions?
- GNUNET_ATS_suggest_address (GST_ats, &n->id);
+ set_state_and_timeout (n, GNUNET_TRANSPORT_INIT_ATS, GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
}
break;
- case S_CONNECT_SENT:
+ case GNUNET_TRANSPORT_CONNECT_SENT:
/* waiting on CONNECT_ACK, send ACK if one is pending */
if ( (GNUNET_OK == result) &&
(1 == n->send_connect_ack) )
n->primary_address.session,
n->connect_ack_timestamp);
}
- break;
- case S_CONNECT_RECV_BLACKLIST_INBOUND:
- if (GNUNET_OK == result)
- {
- /* valid new address, let ATS know! */
- GNUNET_ATS_address_add (GST_ats,
- bcc->na.address,
- bcc->na.session,
- bcc->ats, bcc->ats_count);
- }
- n->state = S_CONNECT_RECV_ATS;
- n->timeout = GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT);
+ break;
+ case GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST_INBOUND:
+ set_state_and_timeout (n, GNUNET_TRANSPORT_CONNECT_RECV_ATS, GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
GNUNET_ATS_reset_backoff (GST_ats, peer);
- GNUNET_ATS_suggest_address (GST_ats, peer);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Suggesting address for peer %s to ATS\n",
+ GNUNET_i2s (peer));
+ n->suggest_handle = GNUNET_ATS_suggest_address (GST_ats, peer, &address_suggest_cont, n);
break;
- case S_CONNECT_RECV_ATS:
- /* still waiting on ATS suggestion, don't care about blacklist */
+ case GNUNET_TRANSPORT_CONNECT_RECV_ATS:
+ /* waiting on ATS suggestion, don't care about blacklist */
break;
- case S_CONNECT_RECV_BLACKLIST:
+ case GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST:
if (GNUNET_YES != address_matches (&bcc->na, &n->primary_address))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Blacklist result ignored, as it is not for our primary address\n");
break; /* result for an address we currently don't care about */
+ }
if (GNUNET_OK == result)
{
- n->timeout = GNUNET_TIME_relative_to_absolute (SETUP_CONNECTION_TIMEOUT);
- n->state = S_CONNECT_RECV_ACK;
+ set_state_and_timeout (n, GNUNET_TRANSPORT_CONNECT_RECV_ACK, GNUNET_TIME_relative_to_absolute (SETUP_CONNECTION_TIMEOUT));
send_session_connect_ack_message (bcc->na.address,
bcc->na.session,
n->connect_ack_timestamp);
- if (1 == n->send_connect_ack)
+ if (1 == n->send_connect_ack)
n->send_connect_ack = 2;
}
else
{
- // FIXME: should also possibly destroy session with plugin!?
- GNUNET_ATS_address_destroyed (GST_ats,
- bcc->na.address,
- NULL);
+ struct GNUNET_TRANSPORT_PluginFunctions *plugin;
+
+ plugin = GST_plugins_find (bcc->na.address->transport_name);
+ if ( (NULL != plugin) &&
+ (NULL != bcc->na.session) )
+ {
+ plugin->disconnect_session (plugin->cls,
+ bcc->na.session);
+ break;
+ }
+ GNUNET_break (NULL != plugin);
free_address (&n->primary_address);
- n->state = S_INIT_ATS;
- n->timeout = GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT);
- // FIXME: do we need to ask ATS again for suggestions?
+ set_state_and_timeout (n, GNUNET_TRANSPORT_INIT_ATS, GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
GNUNET_ATS_reset_backoff (GST_ats, peer);
- GNUNET_ATS_suggest_address (GST_ats, &n->id);
}
break;
- case S_CONNECT_RECV_ACK:
+ case GNUNET_TRANSPORT_CONNECT_RECV_ACK:
/* waiting on SESSION_ACK, send ACK if one is pending */
if ( (GNUNET_OK == result) &&
(1 == n->send_connect_ack) )
n->primary_address.session,
n->connect_ack_timestamp);
}
- break;
- case S_CONNECTED:
+ break;
+ case GNUNET_TRANSPORT_CONNECTED:
/* already connected, don't care about blacklist */
break;
- case S_RECONNECT_ATS:
+ case GNUNET_TRANSPORT_RECONNECT_ATS:
/* still waiting on ATS suggestion, don't care about blacklist */
- break;
- case S_RECONNECT_BLACKLIST:
+ break;
+ case GNUNET_TRANSPORT_RECONNECT_BLACKLIST:
if ( (GNUNET_OK == result) &&
(1 == n->send_connect_ack) )
{
n->connect_ack_timestamp);
}
if (GNUNET_YES != address_matches (&bcc->na, &n->primary_address))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Blacklist result ignored, as it is not for our primary address\n");
break; /* result for an address we currently don't care about */
+ }
if (GNUNET_OK == result)
{
+ set_state_and_timeout (n, GNUNET_TRANSPORT_RECONNECT_SENT, GNUNET_TIME_relative_to_absolute (FAST_RECONNECT_TIMEOUT));
send_session_connect (&n->primary_address);
- n->timeout = GNUNET_TIME_relative_to_absolute (FAST_RECONNECT_TIMEOUT);
- n->state = S_RECONNECT_SENT;
}
else
{
- GNUNET_ATS_address_destroyed (GST_ats,
- bcc->na.address,
- NULL);
- n->state = S_RECONNECT_ATS;
- n->timeout = GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT);
- // FIXME: do we need to ask ATS again for suggestions?
- GNUNET_ATS_suggest_address (GST_ats, &n->id);
+ set_state_and_timeout (n, GNUNET_TRANSPORT_RECONNECT_ATS, GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
}
break;
- case S_RECONNECT_SENT:
+ case GNUNET_TRANSPORT_RECONNECT_SENT:
/* waiting on CONNECT_ACK, don't care about blacklist */
if ( (GNUNET_OK == result) &&
(1 == n->send_connect_ack) )
n->primary_address.session,
n->connect_ack_timestamp);
}
- break;
- case S_CONNECTED_SWITCHING_BLACKLIST:
+ break;
+ case GNUNET_TRANSPORT_CONNECTED_SWITCHING_BLACKLIST:
if (GNUNET_YES != address_matches (&bcc->na, &n->alternative_address))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Blacklist result ignored, as it is not for our primary address\n");
break; /* result for an address we currently don't care about */
+ }
if (GNUNET_OK == result)
{
send_session_connect (&n->alternative_address);
- n->state = S_CONNECTED_SWITCHING_CONNECT_SENT;
+ set_state (n, GNUNET_TRANSPORT_CONNECTED_SWITCHING_CONNECT_SENT);
}
else
{
- GNUNET_ATS_address_destroyed (GST_ats,
- bcc->na.address,
- NULL);
+ set_state(n, GNUNET_TRANSPORT_CONNECTED);
free_address (&n->alternative_address);
- n->state = S_CONNECTED;
}
break;
- case S_CONNECTED_SWITCHING_CONNECT_SENT:
+ case GNUNET_TRANSPORT_CONNECTED_SWITCHING_CONNECT_SENT:
/* waiting on CONNECT_ACK, don't care about blacklist */
if ( (GNUNET_OK == result) &&
(1 == n->send_connect_ack) )
n->primary_address.session,
n->connect_ack_timestamp);
}
- break;
- case S_DISCONNECT:
+ break;
+ case GNUNET_TRANSPORT_DISCONNECT:
/* Nothing to do here, ATS will already do what can be done */
break;
- case S_DISCONNECT_FINISHED:
+ case GNUNET_TRANSPORT_DISCONNECT_FINISHED:
/* should not be possible */
GNUNET_assert (0);
break;
default:
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unhandled state `%s' \n",print_state (n->state));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Unhandled state `%s'\n",
+ GNUNET_TRANSPORT_p2s (n->state));
GNUNET_break (0);
free_neighbour (n, GNUNET_NO);
break;
}
cleanup:
GNUNET_HELLO_address_free (bcc->na.address);
- GNUNET_CONTAINER_DLL_remove (bc_head,
- bc_tail,
- bcc);
GNUNET_free (bcc);
}
* @param address address of the other peer, NULL if other peer
* connected to us
* @param session session to use (or NULL)
- * @param ats performance data
- * @param ats_count number of entries in ats (excluding 0-termination)
*/
static void
check_blacklist (const struct GNUNET_PeerIdentity *peer,
struct GNUNET_TIME_Absolute ts,
const struct GNUNET_HELLO_Address *address,
- struct Session *session,
- const struct GNUNET_ATS_Information *ats,
- uint32_t ats_count)
+ struct Session *session)
{
struct BlackListCheckContext *bcc;
struct GST_BlacklistCheck *bc;
- bcc =
- GNUNET_malloc (sizeof (struct BlackListCheckContext) +
- sizeof (struct GNUNET_ATS_Information) * ats_count);
- bcc->ats_count = ats_count;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Checking peer `%s' against blacklist\n",
+ GNUNET_i2s (peer));
+ bcc = GNUNET_new (struct BlackListCheckContext);
bcc->na.address = GNUNET_HELLO_address_copy (address);
bcc->na.session = session;
bcc->na.connect_timestamp = ts;
- bcc->ats = (struct GNUNET_ATS_Information *) &bcc[1];
- memcpy (bcc->ats, ats, sizeof (struct GNUNET_ATS_Information) * ats_count);
GNUNET_CONTAINER_DLL_insert (bc_head,
bc_tail,
bcc);
- if (NULL != (bc = GST_blacklist_test_allowed (peer,
+ if (NULL != (bc = GST_blacklist_test_allowed (peer,
address->transport_name,
&handle_test_blacklist_cont, bcc)))
- bcc->bc = bc;
+ bcc->bc = bc;
/* if NULL == bc, 'cont' was already called and 'bcc' already free'd, so
we must only store 'bc' if 'bc' is non-NULL... */
}
* @param address address of the other peer, NULL if other peer
* connected to us
* @param session session to use (or NULL)
- * @param ats performance data
- * @param ats_count number of entries in ats (excluding 0-termination)
+ * @return #GNUNET_OK if the message was fine, #GNUNET_SYSERR on serious error
*/
-void
+int
GST_neighbours_handle_connect (const struct GNUNET_MessageHeader *message,
const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_HELLO_Address *address,
- struct Session *session,
- const struct GNUNET_ATS_Information *ats,
- uint32_t ats_count)
+ struct Session *session)
{
const struct SessionConnectMessage *scm;
struct NeighbourMapEntry *n;
struct GNUNET_TIME_Absolute ts;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received CONNECT message from peer `%s'\n",
+ "Received CONNECT message from peer `%s'\n",
GNUNET_i2s (peer));
-
if (ntohs (message->size) != sizeof (struct SessionConnectMessage))
{
GNUNET_break_op (0);
- return;
+ return GNUNET_SYSERR;
}
+ GNUNET_STATISTICS_update (GST_stats,
+ gettext_noop
+ ("# CONNECT messages received"),
+ 1, GNUNET_NO);
if (NULL == neighbours)
- return; /* we're shutting down */
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("CONNECT request from peer `%s' ignored due impending shutdown\n"),
+ GNUNET_i2s (peer));
+ return GNUNET_OK; /* we're shutting down */
+ }
scm = (const struct SessionConnectMessage *) message;
GNUNET_break_op (0 == ntohl (scm->reserved));
ts = GNUNET_TIME_absolute_ntoh (scm->timestamp);
n->send_connect_ack = 1;
n->connect_ack_timestamp = ts;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received SESSION_CONNECT for peer `%s' in state %s/%d\n",
+ GNUNET_i2s (peer),
+ GNUNET_TRANSPORT_p2s (n->state),
+ n->send_connect_ack);
switch (n->state)
- {
- case S_NOT_CONNECTED:
- n->state = S_CONNECT_RECV_BLACKLIST_INBOUND;
+ {
+ case GNUNET_TRANSPORT_NOT_CONNECTED:
/* Do a blacklist check for the new address */
- check_blacklist (peer, ts, address, session, ats, ats_count);
+ set_state (n, GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST_INBOUND);
+ check_blacklist (peer, ts, address, session);
break;
- case S_INIT_ATS:
+ case GNUNET_TRANSPORT_INIT_ATS:
/* CONNECT message takes priority over us asking ATS for address */
- n->state = S_CONNECT_RECV_BLACKLIST_INBOUND;
+ set_state (n, GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST_INBOUND);
/* fallthrough */
- case S_INIT_BLACKLIST:
- case S_CONNECT_SENT:
- case S_CONNECT_RECV_ATS:
- case S_CONNECT_RECV_BLACKLIST:
- case S_CONNECT_RECV_ACK:
- /* It can never hurt to have an alternative address in the above cases,
+ case GNUNET_TRANSPORT_INIT_BLACKLIST:
+ case GNUNET_TRANSPORT_CONNECT_SENT:
+ case GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST_INBOUND:
+ case GNUNET_TRANSPORT_CONNECT_RECV_ATS:
+ case GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST:
+ case GNUNET_TRANSPORT_CONNECT_RECV_ACK:
+ /* It can never hurt to have an alternative address in the above cases,
see if it is allowed */
- check_blacklist (peer, ts, address, session, ats, ats_count);
+ check_blacklist (peer, ts, address, session);
break;
- case S_CONNECTED:
+ case GNUNET_TRANSPORT_CONNECTED:
/* we are already connected and can thus send the ACK immediately;
still, it can never hurt to have an alternative address, so also
tell ATS about it */
n->send_connect_ack = 0;
send_session_connect_ack_message (n->primary_address.address,
n->primary_address.session, ts);
- check_blacklist (peer, ts, address, session, ats, ats_count);
+ check_blacklist (peer, ts, address, session);
break;
- case S_RECONNECT_ATS:
- case S_RECONNECT_BLACKLIST:
- case S_RECONNECT_SENT:
- /* It can never hurt to have an alternative address in the above cases,
+ case GNUNET_TRANSPORT_RECONNECT_ATS:
+ case GNUNET_TRANSPORT_RECONNECT_BLACKLIST:
+ case GNUNET_TRANSPORT_RECONNECT_SENT:
+ /* It can never hurt to have an alternative address in the above cases,
see if it is allowed */
- check_blacklist (peer, ts, address, session, ats, ats_count);
+ check_blacklist (peer, ts, address, session);
break;
- case S_CONNECTED_SWITCHING_BLACKLIST:
- case S_CONNECTED_SWITCHING_CONNECT_SENT:
+ case GNUNET_TRANSPORT_CONNECTED_SWITCHING_BLACKLIST:
+ case GNUNET_TRANSPORT_CONNECTED_SWITCHING_CONNECT_SENT:
/* we are already connected and can thus send the ACK immediately;
still, it can never hurt to have an alternative address, so also
tell ATS about it */
n->send_connect_ack = 0;
send_session_connect_ack_message (n->primary_address.address,
n->primary_address.session, ts);
- check_blacklist (peer, ts, address, session, ats, ats_count);
+ check_blacklist (peer, ts, address, session);
break;
- case S_DISCONNECT:
+ case GNUNET_TRANSPORT_DISCONNECT:
/* get rid of remains without terminating sessions, ready to re-try */
free_neighbour (n, GNUNET_YES);
n = setup_neighbour (peer);
- n->state = S_CONNECT_RECV_ATS;
+ set_state (n, GNUNET_TRANSPORT_CONNECT_RECV_ATS);
GNUNET_ATS_reset_backoff (GST_ats, peer);
- GNUNET_ATS_suggest_address (GST_ats, peer);
break;
- case S_DISCONNECT_FINISHED:
+ case GNUNET_TRANSPORT_DISCONNECT_FINISHED:
/* should not be possible */
GNUNET_assert (0);
break;
default:
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unhandled state `%s' \n",print_state (n->state));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Unhandled state `%s'\n",
+ GNUNET_TRANSPORT_p2s (n->state));
GNUNET_break (0);
- free_neighbour (n, GNUNET_NO);
- break;
+ return GNUNET_SYSERR;
}
+ return GNUNET_OK;
}
/**
* For an existing neighbour record, set the active connection to
- * use the given address.
+ * use the given address.
*
* @param peer identity of the peer to switch the address for
* @param address address of the other peer, NULL if other peer
* @param session session to use (or NULL)
* @param ats performance data
* @param ats_count number of entries in ats
- * @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 bandwidth_in inbound quota to be used when connection is up,
+ * 0 to disconnect from peer
+ * @param bandwidth_out outbound quota to be used when connection is up,
+ * 0 to disconnect from peer
*/
void
GST_neighbours_switch_to_address (const struct GNUNET_PeerIdentity *peer,
struct Session *session,
const struct GNUNET_ATS_Information *ats,
uint32_t ats_count,
- struct GNUNET_BANDWIDTH_Value32NBO
- bandwidth_in,
- struct GNUNET_BANDWIDTH_Value32NBO
- bandwidth_out)
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
{
struct NeighbourMapEntry *n;
struct GNUNET_TRANSPORT_PluginFunctions *papi;
- GNUNET_assert (address->transport_name != NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "ATS has decided on an address for peer %s\n",
+ GNUNET_i2s (peer));
+ GNUNET_assert (NULL != address->transport_name);
if (NULL == (n = lookup_neighbour (peer)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer %s is unknown, suggestion ignored\n",
+ GNUNET_i2s (peer));
return;
+ }
/* Obtain an session for this address from plugin */
if (NULL == (papi = GST_plugins_find (address->transport_name)))
{
/* we don't have the plugin for this address */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Plugin `%s' is unknown, suggestion for peer %s ignored\n",
+ address->transport_name,
+ GNUNET_i2s (peer));
GNUNET_ATS_address_destroyed (GST_ats, address, NULL);
return;
}
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "ATS tells us to switch to address '%s' session %p for peer `%s' in state %s\n",
+ "ATS tells us to switch to address '%s/%s' session %p for "
+ "peer `%s' in state %s/%d (quota in/out %u %u )\n",
(address->address_length != 0) ? GST_plugins_a2s (address): "<inbound>",
+ address->transport_name,
session,
GNUNET_i2s (peer),
- print_state (n->state));
+ GNUNET_TRANSPORT_p2s (n->state),
+ n->send_connect_ack,
+ ntohl (bandwidth_in.value__),
+ ntohl (bandwidth_out.value__));
if (NULL == session)
{
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Failed to obtain new session for peer `%s' and address '%s'\n",
- GNUNET_i2s (&address->peer), GST_plugins_a2s (address));
+ GNUNET_i2s (&address->peer), GST_plugins_a2s (address));
GNUNET_ATS_address_destroyed (GST_ats, address, NULL);
return;
}
switch (n->state)
{
- case S_NOT_CONNECTED:
+ case GNUNET_TRANSPORT_NOT_CONNECTED:
GNUNET_break (0);
free_neighbour (n, GNUNET_NO);
return;
- case S_INIT_ATS:
- set_address (&n->primary_address,
- address, session, bandwidth_in, bandwidth_out, GNUNET_NO);
- n->state = S_INIT_BLACKLIST;
- n->timeout = GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT);
+ case GNUNET_TRANSPORT_INIT_ATS:
+ set_primary_address (n, address, session, bandwidth_in, bandwidth_out, GNUNET_NO);
+ set_state_and_timeout (n, GNUNET_TRANSPORT_INIT_BLACKLIST, GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT));
check_blacklist (&n->id,
n->connect_ack_timestamp,
- address, session, ats, ats_count);
+ address, session);
break;
- case S_INIT_BLACKLIST:
+ case GNUNET_TRANSPORT_INIT_BLACKLIST:
/* ATS suggests a different address, switch again */
- set_address (&n->primary_address,
+ set_primary_address (n,
address, session, bandwidth_in, bandwidth_out, GNUNET_NO);
- n->timeout = GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT);
+ set_timeout (n, GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT));
check_blacklist (&n->id,
n->connect_ack_timestamp,
- address, session, ats, ats_count);
+ address, session);
break;
- case S_CONNECT_SENT:
+ case GNUNET_TRANSPORT_CONNECT_SENT:
/* ATS suggests a different address, switch again */
- set_address (&n->primary_address,
- address, session, bandwidth_in, bandwidth_out, GNUNET_NO);
- n->state = S_INIT_BLACKLIST;
- n->timeout = GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT);
+ set_primary_address (n, address, session, bandwidth_in, bandwidth_out, GNUNET_NO);
+ set_state_and_timeout (n, GNUNET_TRANSPORT_INIT_BLACKLIST, GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT));
check_blacklist (&n->id,
n->connect_ack_timestamp,
- address, session, ats, ats_count);
+ address, session);
break;
- case S_CONNECT_RECV_ATS:
- set_address (&n->primary_address,
+ case GNUNET_TRANSPORT_CONNECT_RECV_ATS:
+ set_primary_address (n,
address, session, bandwidth_in, bandwidth_out, GNUNET_NO);
- n->state = S_CONNECT_RECV_BLACKLIST;
- n->timeout = GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT);
+ set_state_and_timeout (n, GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST, GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT));
check_blacklist (&n->id,
n->connect_ack_timestamp,
- address, session, ats, ats_count);
+ address, session);
break;
- case S_CONNECT_RECV_BLACKLIST_INBOUND:
- n->timeout = GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT);
+ case GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST_INBOUND:
+ set_timeout (n, GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT));
check_blacklist (&n->id,
n->connect_ack_timestamp,
- address, session, ats, ats_count);
+ address, session);
break;
- case S_CONNECT_RECV_BLACKLIST:
- case S_CONNECT_RECV_ACK:
+ case GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST:
+ case GNUNET_TRANSPORT_CONNECT_RECV_ACK:
/* ATS asks us to switch while we were trying to connect; switch to new
address and check blacklist again */
- set_address (&n->primary_address,
+ set_primary_address (n,
address, session, bandwidth_in, bandwidth_out, GNUNET_NO);
- n->timeout = GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT);
+ set_state_and_timeout (n, GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST, GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT));
check_blacklist (&n->id,
n->connect_ack_timestamp,
- address, session, ats, ats_count);
+ address, session);
break;
- case S_CONNECTED:
+ case GNUNET_TRANSPORT_CONNECTED:
GNUNET_assert (NULL != n->primary_address.address);
GNUNET_assert (NULL != n->primary_address.session);
if (n->primary_address.session == session)
{
/* not an address change, just a quota change */
- set_address (&n->primary_address,
+ set_primary_address (n,
address, session, bandwidth_in, bandwidth_out, GNUNET_YES);
break;
}
/* ATS asks us to switch a life connection; see if we can get
a CONNECT_ACK on it before we actually do this! */
- set_address (&n->alternative_address,
- address, session, bandwidth_in, bandwidth_out, GNUNET_NO);
- n->state = S_CONNECTED_SWITCHING_BLACKLIST;
+ set_state (n, GNUNET_TRANSPORT_CONNECTED_SWITCHING_BLACKLIST);
+ set_alternative_address (n, address, session, bandwidth_in, bandwidth_out);
check_blacklist (&n->id,
GNUNET_TIME_absolute_get (),
- address, session, ats, ats_count);
+ address, session);
break;
- case S_RECONNECT_ATS:
- set_address (&n->primary_address,
+ case GNUNET_TRANSPORT_RECONNECT_ATS:
+ set_primary_address (n,
address, session, bandwidth_in, bandwidth_out, GNUNET_NO);
- n->state = S_RECONNECT_BLACKLIST;
- n->timeout = GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT);
+ set_state_and_timeout (n, GNUNET_TRANSPORT_RECONNECT_BLACKLIST, GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT));
check_blacklist (&n->id,
n->connect_ack_timestamp,
- address, session, ats, ats_count);
+ address, session);
break;
- case S_RECONNECT_BLACKLIST:
+ case GNUNET_TRANSPORT_RECONNECT_BLACKLIST:
/* ATS asks us to switch while we were trying to reconnect; switch to new
address and check blacklist again */
- set_address (&n->primary_address,
+ set_primary_address (n,
address, session, bandwidth_in, bandwidth_out, GNUNET_NO);
- n->timeout = GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT);
+ set_timeout (n, GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT));
check_blacklist (&n->id,
n->connect_ack_timestamp,
- address, session, ats, ats_count);
+ address, session);
break;
- case S_RECONNECT_SENT:
+ case GNUNET_TRANSPORT_RECONNECT_SENT:
/* ATS asks us to switch while we were trying to reconnect; switch to new
address and check blacklist again */
- set_address (&n->primary_address,
+ set_primary_address (n,
address, session, bandwidth_in, bandwidth_out, GNUNET_NO);
- n->state = S_RECONNECT_BLACKLIST;
- n->timeout = GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT);
+ set_state_and_timeout (n, GNUNET_TRANSPORT_RECONNECT_BLACKLIST, GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT));
check_blacklist (&n->id,
n->connect_ack_timestamp,
- address, session, ats, ats_count);
+ address, session);
break;
- case S_CONNECTED_SWITCHING_BLACKLIST:
+ case GNUNET_TRANSPORT_CONNECTED_SWITCHING_BLACKLIST:
if (n->primary_address.session == session)
{
/* ATS switches back to still-active session */
+ set_state(n, GNUNET_TRANSPORT_CONNECTED);
free_address (&n->alternative_address);
- n->state = S_CONNECTED;
break;
}
/* ATS asks us to switch a life connection, update blacklist check */
- set_address (&n->alternative_address,
+ set_primary_address (n,
address, session, bandwidth_in, bandwidth_out, GNUNET_NO);
check_blacklist (&n->id,
GNUNET_TIME_absolute_get (),
- address, session, ats, ats_count);
+ address, session);
break;
- case S_CONNECTED_SWITCHING_CONNECT_SENT:
+ case GNUNET_TRANSPORT_CONNECTED_SWITCHING_CONNECT_SENT:
if (n->primary_address.session == session)
{
/* ATS switches back to still-active session */
free_address (&n->alternative_address);
- n->state = S_CONNECTED;
+ set_state (n, GNUNET_TRANSPORT_CONNECTED);
break;
}
/* ATS asks us to switch a life connection, update blacklist check */
- set_address (&n->alternative_address,
- address, session, bandwidth_in, bandwidth_out, GNUNET_NO);
- n->state = S_CONNECTED_SWITCHING_BLACKLIST;
+ set_state (n, GNUNET_TRANSPORT_CONNECTED_SWITCHING_BLACKLIST);
+ set_alternative_address (n, address, session, bandwidth_in, bandwidth_out);
check_blacklist (&n->id,
GNUNET_TIME_absolute_get (),
- address, session, ats, ats_count);
+ address, session);
break;
- case S_DISCONNECT:
+ case GNUNET_TRANSPORT_DISCONNECT:
/* not going to switch addresses while disconnecting */
return;
- case S_DISCONNECT_FINISHED:
+ case GNUNET_TRANSPORT_DISCONNECT_FINISHED:
GNUNET_assert (0);
break;
default:
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unhandled state `%s' \n",print_state (n->state));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Unhandled state `%s'\n",
+ GNUNET_TRANSPORT_p2s (n->state));
GNUNET_break (0);
break;
}
}
+static int
+send_utilization_data (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
+{
+ struct NeighbourMapEntry *n = value;
+ struct GNUNET_ATS_Information atsi[4];
+ uint32_t bps_pl_in;
+ uint32_t bps_pl_out;
+ uint32_t bps_in;
+ uint32_t bps_out;
+ struct GNUNET_TIME_Relative delta;
+
+ delta = GNUNET_TIME_absolute_get_difference (n->last_util_transmission,
+ GNUNET_TIME_absolute_get ());
+
+ bps_pl_in = 0;
+
+ if ((0 != n->util_payload_bytes_recv) && (0 != delta.rel_value_us))
+ bps_pl_in = (1000LL * 1000LL * n->util_payload_bytes_recv) / (delta.rel_value_us);
+ bps_pl_out = 0;
+ if ((0 != n->util_payload_bytes_sent) && (0 != delta.rel_value_us))
+ bps_pl_out = (1000LL * 1000LL * n->util_payload_bytes_sent) / delta.rel_value_us;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "`%s' payload: received %u Bytes/s, sent %u Bytes/s\n",
+ GNUNET_i2s (key),
+ bps_pl_in,
+ bps_pl_out);
+ bps_in = 0;
+ if ((0 != n->util_total_bytes_recv) && (0 != delta.rel_value_us))
+ bps_in = (1000LL * 1000LL * n->util_total_bytes_recv) / (delta.rel_value_us);
+ bps_out = 0;
+ 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);
+
+ atsi[2].type = htonl (GNUNET_ATS_UTILIZATION_PAYLOAD_OUT);
+ atsi[2].value = htonl (bps_pl_out);
+ atsi[3].type = htonl (GNUNET_ATS_UTILIZATION_PAYLOAD_IN);
+ atsi[3].value = htonl (bps_pl_in);
+
+ GST_ats_update_metrics (key, n->primary_address.address,
+ n->primary_address.session, atsi, 4);
+ n->util_payload_bytes_recv = 0;
+ n->util_payload_bytes_sent = 0;
+ n->util_total_bytes_recv = 0;
+ n->util_total_bytes_sent = 0;
+ n->last_util_transmission = GNUNET_TIME_absolute_get();
+ return GNUNET_OK;
+}
+
+
+/**
+ * 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)
+{
+ util_transmission_tk = GNUNET_SCHEDULER_NO_TASK;
+
+ if (0 < GNUNET_CONTAINER_multipeermap_size (neighbours))
+ GNUNET_CONTAINER_multipeermap_iterate (neighbours, send_utilization_data, NULL);
+
+ util_transmission_tk = GNUNET_SCHEDULER_add_delayed (UTIL_TRANSMISSION_INTERVAL,
+ utilization_transmission, NULL);
+
+}
+
+
+void
+GST_neighbours_notify_data_recv (const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Address *address,
+ struct Session *session,
+ const struct GNUNET_MessageHeader *message)
+{
+ struct NeighbourMapEntry *n;
+
+ n = lookup_neighbour (peer);
+ if (NULL == n)
+ return;
+ n->util_total_bytes_recv += ntohs(message->size);
+}
+
+
+void
+GST_neighbours_notify_payload_recv (const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Address *address,
+ struct Session *session,
+ const struct GNUNET_MessageHeader *message)
+{
+ struct NeighbourMapEntry *n;
+ n = lookup_neighbour (peer);
+ if (NULL == n)
+ return;
+ n->util_payload_bytes_recv += ntohs(message->size);
+}
+
+
+void
+GST_neighbours_notify_data_sent (const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Address *address,
+ struct Session *session,
+ size_t size)
+{
+ struct NeighbourMapEntry *n;
+ n = lookup_neighbour (peer);
+ if (NULL == n)
+ return;
+ if (n->primary_address.session != session)
+ return;
+ n->util_total_bytes_sent += size;
+}
+
+
+void
+GST_neighbours_notify_payload_sent (const struct GNUNET_PeerIdentity *peer,
+ size_t size)
+{
+ struct NeighbourMapEntry *n;
+ n = lookup_neighbour (peer);
+ if (NULL == n)
+ return;
+ n->util_payload_bytes_sent += size;
+}
+
+
/**
* Master task run for every neighbour. Performs all of the time-related
* activities (keep alive, send next message, disconnect if idle, finish
struct GNUNET_TIME_Relative delay;
n->task = GNUNET_SCHEDULER_NO_TASK;
- delay = GNUNET_TIME_absolute_get_remaining (n->timeout);
+ delay = GNUNET_TIME_absolute_get_remaining (n->timeout);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Master task runs for neighbour `%s' in state %s with timeout in %llu ms\n",
+ "Master task runs for neighbour `%s' in state %s with timeout in %s\n",
GNUNET_i2s (&n->id),
- print_state(n->state),
- (unsigned long long) delay.rel_value);
+ GNUNET_TRANSPORT_p2s(n->state),
+ GNUNET_STRINGS_relative_time_to_string (delay,
+ GNUNET_YES));
switch (n->state)
{
- case S_NOT_CONNECTED:
+ case GNUNET_TRANSPORT_NOT_CONNECTED:
/* invalid state for master task, clean up */
GNUNET_break (0);
- n->state = S_DISCONNECT_FINISHED;
+ set_state (n, GNUNET_TRANSPORT_DISCONNECT_FINISHED);
free_neighbour (n, GNUNET_NO);
return;
- case S_INIT_ATS:
- if (0 == delay.rel_value)
+ case GNUNET_TRANSPORT_INIT_ATS:
+ if (0 == delay.rel_value_us)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Connection to `%s' timed out waiting for ATS to provide address\n",
GNUNET_i2s (&n->id));
- n->state = S_DISCONNECT_FINISHED;
+ set_state (n, GNUNET_TRANSPORT_DISCONNECT_FINISHED);
free_neighbour (n, GNUNET_NO);
return;
}
break;
- case S_INIT_BLACKLIST:
- if (0 == delay.rel_value)
+ case GNUNET_TRANSPORT_INIT_BLACKLIST:
+ if (0 == delay.rel_value_us)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Connection to `%s' timed out waiting for BLACKLIST to approve address\n",
GNUNET_i2s (&n->id));
- n->state = S_DISCONNECT_FINISHED;
+ set_state (n, GNUNET_TRANSPORT_DISCONNECT_FINISHED);
free_neighbour (n, GNUNET_NO);
return;
}
break;
- case S_CONNECT_SENT:
- if (0 == delay.rel_value)
+ case GNUNET_TRANSPORT_CONNECT_SENT:
+ if (0 == delay.rel_value_us)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Connection to `%s' timed out waiting for other peer to send CONNECT_ACK\n",
GNUNET_i2s (&n->id));
+ /* We could not send to this address, delete address and session */
+ if (NULL != n->primary_address.session)
+ GNUNET_ATS_address_destroyed (GST_ats,
+ n->primary_address.address, n->primary_address.session);
+ GNUNET_ATS_address_destroyed (GST_ats,
+ n->primary_address.address, NULL);
disconnect_neighbour (n);
return;
}
break;
- case S_CONNECT_RECV_BLACKLIST_INBOUND:
- if (0 == delay.rel_value)
+ case GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST_INBOUND:
+ if (0 == delay.rel_value_us)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Connection to `%s' timed out waiting BLACKLIST to approve address to use for received CONNECT\n",
GNUNET_i2s (&n->id));
- n->state = S_DISCONNECT_FINISHED;
+ set_state (n, GNUNET_TRANSPORT_DISCONNECT_FINISHED);
free_neighbour (n, GNUNET_NO);
return;
}
break;
- case S_CONNECT_RECV_ATS:
- if (0 == delay.rel_value)
+ case GNUNET_TRANSPORT_CONNECT_RECV_ATS:
+ if (0 == delay.rel_value_us)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Connection to `%s' timed out waiting ATS to provide address to use for CONNECT_ACK\n",
GNUNET_i2s (&n->id));
- n->state = S_DISCONNECT_FINISHED;
+ set_state (n, GNUNET_TRANSPORT_DISCONNECT_FINISHED);
free_neighbour (n, GNUNET_NO);
return;
}
break;
- case S_CONNECT_RECV_BLACKLIST:
- if (0 == delay.rel_value)
+ case GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST:
+ if (0 == delay.rel_value_us)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Connection to `%s' timed out waiting BLACKLIST to approve address to use for CONNECT_ACK\n",
GNUNET_i2s (&n->id));
- n->state = S_DISCONNECT_FINISHED;
+ set_state (n, GNUNET_TRANSPORT_DISCONNECT_FINISHED);
free_neighbour (n, GNUNET_NO);
return;
}
break;
- case S_CONNECT_RECV_ACK:
- if (0 == delay.rel_value)
+ case GNUNET_TRANSPORT_CONNECT_RECV_ACK:
+ if (0 == delay.rel_value_us)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Connection to `%s' timed out waiting for other peer to send SESSION_ACK\n",
return;
}
break;
- case S_CONNECTED:
- if (0 == delay.rel_value)
+ case GNUNET_TRANSPORT_CONNECTED:
+ if (0 == delay.rel_value_us)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Connection to `%s' timed out, missing KEEPALIVE_RESPONSEs\n",
try_transmission_to_peer (n);
send_keepalive (n);
break;
- case S_RECONNECT_ATS:
- if (0 == delay.rel_value)
+ case GNUNET_TRANSPORT_RECONNECT_ATS:
+ if (0 == delay.rel_value_us)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Connection to `%s' timed out, waiting for ATS replacement address\n",
return;
}
break;
- case S_RECONNECT_BLACKLIST:
- if (0 == delay.rel_value)
+ case GNUNET_TRANSPORT_RECONNECT_BLACKLIST:
+ if (0 == delay.rel_value_us)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Connection to `%s' timed out, waiting for BLACKLIST to approve replacement address\n",
return;
}
break;
- case S_RECONNECT_SENT:
- if (0 == delay.rel_value)
+ case GNUNET_TRANSPORT_RECONNECT_SENT:
+ if (0 == delay.rel_value_us)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Connection to `%s' timed out, waiting for other peer to CONNECT_ACK replacement address\n",
return;
}
break;
- case S_CONNECTED_SWITCHING_BLACKLIST:
- if (0 == delay.rel_value)
+ case GNUNET_TRANSPORT_CONNECTED_SWITCHING_BLACKLIST:
+ if (0 == delay.rel_value_us)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Connection to `%s' timed out, missing KEEPALIVE_RESPONSEs\n",
try_transmission_to_peer (n);
send_keepalive (n);
break;
- case S_CONNECTED_SWITCHING_CONNECT_SENT:
- if (0 == delay.rel_value)
+ case GNUNET_TRANSPORT_CONNECTED_SWITCHING_CONNECT_SENT:
+ if (0 == delay.rel_value_us)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Connection to `%s' timed out, missing KEEPALIVE_RESPONSEs (after trying to CONNECT on alternative address)\n",
try_transmission_to_peer (n);
send_keepalive (n);
break;
- case S_DISCONNECT:
+ case GNUNET_TRANSPORT_DISCONNECT:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Cleaning up connection to `%s' after sending DISCONNECT\n",
GNUNET_i2s (&n->id));
free_neighbour (n, GNUNET_NO);
return;
- case S_DISCONNECT_FINISHED:
+ case GNUNET_TRANSPORT_DISCONNECT_FINISHED:
/* how did we get here!? */
GNUNET_assert (0);
break;
default:
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unhandled state `%s' \n",print_state (n->state));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Unhandled state `%s'\n",
+ GNUNET_TRANSPORT_p2s (n->state));
GNUNET_break (0);
- break;
+ break;
}
- if ( (S_CONNECTED_SWITCHING_CONNECT_SENT == n->state) ||
- (S_CONNECTED_SWITCHING_BLACKLIST == n->state) ||
- (S_CONNECTED == n->state) )
+ if ( (GNUNET_TRANSPORT_CONNECTED_SWITCHING_CONNECT_SENT == n->state) ||
+ (GNUNET_TRANSPORT_CONNECTED_SWITCHING_BLACKLIST == n->state) ||
+ (GNUNET_TRANSPORT_CONNECTED == n->state) )
{
/* if we are *now* in one of these three states, we're sending
keep alive messages, so we need to consider the keepalive
msg.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_ACK);
(void) send_with_session(n,
(const char *) &msg, sizeof (struct GNUNET_MessageHeader),
- UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL,
+ UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_NO,
NULL, NULL);
}
* @param address address of the other peer, NULL if other peer
* connected to us
* @param session session to use (or NULL)
- * @param ats performance data
- * @param ats_count number of entries in ats
+ * @return #GNUNET_OK if the message was fine, #GNUNET_SYSERR on serious error
*/
-void
+int
GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message,
const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_HELLO_Address *address,
- struct Session *session,
- const struct GNUNET_ATS_Information *ats,
- uint32_t ats_count)
+ struct Session *session)
{
const struct SessionConnectMessage *scm;
struct GNUNET_TIME_Absolute ts;
if (ntohs (message->size) != sizeof (struct SessionConnectMessage))
{
GNUNET_break_op (0);
- return;
+ return GNUNET_SYSERR;
}
+ GNUNET_STATISTICS_update (GST_stats,
+ gettext_noop
+ ("# CONNECT_ACK messages received"),
+ 1, GNUNET_NO);
scm = (const struct SessionConnectMessage *) message;
GNUNET_break_op (ntohl (scm->reserved) == 0);
if (NULL == (n = lookup_neighbour (peer)))
gettext_noop
("# unexpected CONNECT_ACK messages (no peer)"),
1, GNUNET_NO);
- return;
+ return GNUNET_SYSERR;
}
ts = GNUNET_TIME_absolute_ntoh (scm->timestamp);
switch (n->state)
{
- case S_NOT_CONNECTED:
+ case GNUNET_TRANSPORT_NOT_CONNECTED:
GNUNET_break (0);
free_neighbour (n, GNUNET_NO);
- return;
- case S_INIT_ATS:
- case S_INIT_BLACKLIST:
+ return GNUNET_SYSERR;
+ case GNUNET_TRANSPORT_INIT_ATS:
+ case GNUNET_TRANSPORT_INIT_BLACKLIST:
GNUNET_STATISTICS_update (GST_stats,
gettext_noop
("# unexpected CONNECT_ACK messages (not ready)"),
1, GNUNET_NO);
- break;
- case S_CONNECT_SENT:
- if (ts.abs_value != n->primary_address.connect_timestamp.abs_value)
- break; /* ACK does not match our original CONNECT message */
- n->state = S_CONNECTED;
- n->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
- GNUNET_STATISTICS_set (GST_stats,
- gettext_noop ("# peers connected"),
+ break;
+ case GNUNET_TRANSPORT_CONNECT_SENT:
+ if (ts.abs_value_us != n->primary_address.connect_timestamp.abs_value_us)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "CONNECT_ACK ignored as the timestamp does not match our CONNECT request\n");
+ return GNUNET_OK;
+ }
+ set_state_and_timeout (n, GNUNET_TRANSPORT_CONNECTED, GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT));
+ GNUNET_STATISTICS_set (GST_stats,
+ gettext_noop ("# peers connected"),
++neighbours_connected,
GNUNET_NO);
- connect_notify_cb (callback_cls, &n->id, ats, ats_count);
- /* Tell ATS that the outbound session we created to send CONNECT was successfull */
- GNUNET_ATS_address_add (GST_ats,
- n->primary_address.address,
- n->primary_address.session,
- ats, ats_count);
- set_address (&n->primary_address,
+ connect_notify_cb (callback_cls, &n->id,
+ n->primary_address.bandwidth_in,
+ n->primary_address.bandwidth_out);
+ /* Tell ATS that the outbound session we created to send CONNECT was successful */
+ GST_ats_add_address (n->primary_address.address,
+ n->primary_address.session,
+ NULL, 0);
+ set_primary_address (n,
n->primary_address.address,
n->primary_address.session,
n->primary_address.bandwidth_in,
GNUNET_YES);
send_session_ack_message (n);
break;
- case S_CONNECT_RECV_BLACKLIST_INBOUND:
- case S_CONNECT_RECV_ATS:
- case S_CONNECT_RECV_BLACKLIST:
- case S_CONNECT_RECV_ACK:
+ case GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST_INBOUND:
+ case GNUNET_TRANSPORT_CONNECT_RECV_ATS:
+ case GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST:
+ case GNUNET_TRANSPORT_CONNECT_RECV_ACK:
GNUNET_STATISTICS_update (GST_stats,
gettext_noop
("# unexpected CONNECT_ACK messages (not ready)"),
1, GNUNET_NO);
break;
- case S_CONNECTED:
+ case GNUNET_TRANSPORT_CONNECTED:
/* duplicate CONNECT_ACK, let's answer by duplciate SESSION_ACK just in case */
send_session_ack_message (n);
break;
- case S_RECONNECT_ATS:
- case S_RECONNECT_BLACKLIST:
+ case GNUNET_TRANSPORT_RECONNECT_ATS:
+ case GNUNET_TRANSPORT_RECONNECT_BLACKLIST:
/* we didn't expect any CONNECT_ACK, as we are waiting for ATS
to give us a new address... */
GNUNET_STATISTICS_update (GST_stats,
("# unexpected CONNECT_ACK messages (waiting on ATS)"),
1, GNUNET_NO);
break;
- case S_RECONNECT_SENT:
+ case GNUNET_TRANSPORT_RECONNECT_SENT:
/* new address worked; go back to connected! */
- n->state = S_CONNECTED;
+ set_state (n, GNUNET_TRANSPORT_CONNECTED);
send_session_ack_message (n);
break;
- case S_CONNECTED_SWITCHING_BLACKLIST:
+ case GNUNET_TRANSPORT_CONNECTED_SWITCHING_BLACKLIST:
/* duplicate CONNECT_ACK, let's answer by duplciate SESSION_ACK just in case */
send_session_ack_message (n);
break;
- case S_CONNECTED_SWITCHING_CONNECT_SENT:
+ case GNUNET_TRANSPORT_CONNECTED_SWITCHING_CONNECT_SENT:
/* new address worked; adopt it and go back to connected! */
- n->state = S_CONNECTED;
- n->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
+ set_state_and_timeout (n, GNUNET_TRANSPORT_CONNECTED, GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT));
GNUNET_break (GNUNET_NO == n->alternative_address.ats_active);
- GNUNET_ATS_address_add(GST_ats,
- n->alternative_address.address,
- n->alternative_address.session,
- ats, ats_count);
- set_address (&n->primary_address,
- n->alternative_address.address,
- n->alternative_address.session,
- n->alternative_address.bandwidth_in,
- n->alternative_address.bandwidth_out,
- GNUNET_YES);
+
+ GST_ats_add_address (n->alternative_address.address,
+ n->alternative_address.session,
+ NULL, 0);
+ set_primary_address (n, n->alternative_address.address,
+ n->alternative_address.session, n->alternative_address.bandwidth_in,
+ n->alternative_address.bandwidth_out, GNUNET_YES);
+
free_address (&n->alternative_address);
send_session_ack_message (n);
- break;
- case S_DISCONNECT:
+ break;
+ case GNUNET_TRANSPORT_DISCONNECT:
GNUNET_STATISTICS_update (GST_stats,
gettext_noop
("# unexpected CONNECT_ACK messages (disconnecting)"),
1, GNUNET_NO);
- break;
- case S_DISCONNECT_FINISHED:
+ return GNUNET_SYSERR;
+ case GNUNET_TRANSPORT_DISCONNECT_FINISHED:
GNUNET_assert (0);
break;
default:
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unhandled state `%s' \n",print_state (n->state));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Unhandled state `%s'\n",
+ GNUNET_TRANSPORT_p2s (n->state));
GNUNET_break (0);
- break;
+ return GNUNET_SYSERR;
}
+ return GNUNET_OK;
}
*
* @param peer identity of the peer where the session died
* @param session session that is gone
- * @return GNUNET_YES if this was a session used, GNUNET_NO if
+ * @return #GNUNET_YES if this was a session used, #GNUNET_NO if
* this session was not in use
*/
int
bcc_next = bcc->next;
if (bcc->na.session == session)
{
- GST_blacklist_test_cancel (bcc->bc);
+ 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,
{
if (session == n->alternative_address.session)
{
- free_address (&n->alternative_address);
- if ( (S_CONNECTED_SWITCHING_BLACKLIST == n->state) ||
- (S_CONNECTED_SWITCHING_CONNECT_SENT == n->state) )
- n->state = S_CONNECTED;
+ if ( (GNUNET_TRANSPORT_CONNECTED_SWITCHING_BLACKLIST == n->state) ||
+ (GNUNET_TRANSPORT_CONNECTED_SWITCHING_CONNECT_SENT == n->state) )
+ set_state (n, GNUNET_TRANSPORT_CONNECTED);
else
GNUNET_break (0);
+ free_address (&n->alternative_address);
}
return GNUNET_NO; /* doesn't affect us further */
}
n->expect_latency_response = GNUNET_NO;
switch (n->state)
{
- case S_NOT_CONNECTED:
+ case GNUNET_TRANSPORT_NOT_CONNECTED:
GNUNET_break (0);
free_neighbour (n, GNUNET_NO);
return GNUNET_YES;
- case S_INIT_ATS:
+ case GNUNET_TRANSPORT_INIT_ATS:
GNUNET_break (0);
free_neighbour (n, GNUNET_NO);
return GNUNET_YES;
- case S_INIT_BLACKLIST:
- case S_CONNECT_SENT:
+ case GNUNET_TRANSPORT_INIT_BLACKLIST:
+ case GNUNET_TRANSPORT_CONNECT_SENT:
free_address (&n->primary_address);
- n->state = S_INIT_ATS;
- n->timeout = GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT);
- // FIXME: need to ask ATS for suggestions again?
- GNUNET_ATS_suggest_address (GST_ats, &n->id);
- break;
- case S_CONNECT_RECV_BLACKLIST_INBOUND:
- case S_CONNECT_RECV_ATS:
- case S_CONNECT_RECV_BLACKLIST:
- case S_CONNECT_RECV_ACK:
+ set_state_and_timeout (n, GNUNET_TRANSPORT_INIT_ATS, GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
+ break;
+ case GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST_INBOUND:
+ case GNUNET_TRANSPORT_CONNECT_RECV_ATS:
+ case GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST:
+ case GNUNET_TRANSPORT_CONNECT_RECV_ACK:
/* error on inbound session; free neighbour entirely */
free_address (&n->primary_address);
free_neighbour (n, GNUNET_NO);
return GNUNET_YES;
- case S_CONNECTED:
+ case GNUNET_TRANSPORT_CONNECTED:
+ set_state_and_timeout (n, GNUNET_TRANSPORT_INIT_ATS, GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
free_address (&n->primary_address);
- n->state = S_RECONNECT_ATS;
- n->timeout = GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT);
- /* FIXME: is this ATS call needed? */
- GNUNET_ATS_suggest_address (GST_ats, &n->id);
break;
- case S_RECONNECT_ATS:
+ case GNUNET_TRANSPORT_RECONNECT_ATS:
/* we don't have an address, how can it go down? */
GNUNET_break (0);
break;
- case S_RECONNECT_BLACKLIST:
- case S_RECONNECT_SENT:
- n->state = S_RECONNECT_ATS;
- n->timeout = GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT);
- // FIXME: need to ask ATS for suggestions again?
- GNUNET_ATS_suggest_address (GST_ats, &n->id);
+ case GNUNET_TRANSPORT_RECONNECT_BLACKLIST:
+ case GNUNET_TRANSPORT_RECONNECT_SENT:
+ set_state_and_timeout (n, GNUNET_TRANSPORT_RECONNECT_ATS, GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
break;
- case S_CONNECTED_SWITCHING_BLACKLIST:
+ case GNUNET_TRANSPORT_CONNECTED_SWITCHING_BLACKLIST:
/* primary went down while we were checking secondary against
- blacklist, adopt secondary as primary */
+ blacklist, adopt secondary as primary */
free_address (&n->primary_address);
+ set_state_and_timeout (n, GNUNET_TRANSPORT_RECONNECT_BLACKLIST, GNUNET_TIME_relative_to_absolute (FAST_RECONNECT_TIMEOUT));
n->primary_address = n->alternative_address;
memset (&n->alternative_address, 0, sizeof (struct NeighbourAddress));
- n->timeout = GNUNET_TIME_relative_to_absolute (FAST_RECONNECT_TIMEOUT);
- n->state = S_RECONNECT_BLACKLIST;
break;
- case S_CONNECTED_SWITCHING_CONNECT_SENT:
+ case GNUNET_TRANSPORT_CONNECTED_SWITCHING_CONNECT_SENT:
/* primary went down while we were waiting for CONNECT_ACK on secondary;
- secondary as primary */
+ secondary as primary */
free_address (&n->primary_address);
n->primary_address = n->alternative_address;
memset (&n->alternative_address, 0, sizeof (struct NeighbourAddress));
- n->timeout = GNUNET_TIME_relative_to_absolute (FAST_RECONNECT_TIMEOUT);
- n->state = S_RECONNECT_SENT;
+ set_state_and_timeout (n, GNUNET_TRANSPORT_RECONNECT_SENT, GNUNET_TIME_relative_to_absolute (FAST_RECONNECT_TIMEOUT));
break;
- case S_DISCONNECT:
+ case GNUNET_TRANSPORT_DISCONNECT:
free_address (&n->primary_address);
break;
- case S_DISCONNECT_FINISHED:
+ case GNUNET_TRANSPORT_DISCONNECT_FINISHED:
/* neighbour was freed and plugins told to terminate session */
return GNUNET_NO;
break;
default:
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unhandled state `%s' \n",print_state (n->state));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Unhandled state `%s'\n",
+ GNUNET_TRANSPORT_p2s (n->state));
GNUNET_break (0);
break;
}
* @param address address of the other peer, NULL if other peer
* connected to us
* @param session session to use (or NULL)
- * @param ats performance data
- * @param ats_count number of entries in ats
+ * @return #GNUNET_OK if the message was fine, #GNUNET_SYSERR on serious error
*/
-void
+int
GST_neighbours_handle_session_ack (const struct GNUNET_MessageHeader *message,
const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_HELLO_Address *address,
- struct Session *session,
- const struct GNUNET_ATS_Information *ats,
- uint32_t ats_count)
+ struct Session *session)
{
struct NeighbourMapEntry *n;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received SESSION_ACK message from peer `%s'\n",
GNUNET_i2s (peer));
if (ntohs (message->size) != sizeof (struct GNUNET_MessageHeader))
{
GNUNET_break_op (0);
- return;
+ return GNUNET_SYSERR;
}
+ GNUNET_STATISTICS_update (GST_stats,
+ gettext_noop
+ ("# SESSION_ACK messages received"),
+ 1, GNUNET_NO);
if (NULL == (n = lookup_neighbour (peer)))
- return;
+ {
+ GNUNET_break_op (0);
+ return GNUNET_SYSERR;
+ }
/* check if we are in a plausible state for having sent
a CONNECT_ACK. If not, return, otherwise break */
- if ( ( (S_CONNECT_RECV_ACK != n->state) &&
- (S_CONNECT_SENT != n->state) ) ||
+ if ( ( (GNUNET_TRANSPORT_CONNECT_RECV_ACK != n->state) &&
+ (GNUNET_TRANSPORT_CONNECT_SENT != n->state) ) ||
(2 != n->send_connect_ack) )
{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received SESSION_ACK message from peer `%s' in state %s/%d\n",
+ GNUNET_i2s (peer),
+ GNUNET_TRANSPORT_p2s (n->state),
+ n->send_connect_ack);
GNUNET_STATISTICS_update (GST_stats,
- gettext_noop ("# unexpected SESSION ACK messages"), 1,
+ gettext_noop ("# unexpected SESSION_ACK messages"), 1,
GNUNET_NO);
- return;
+ return GNUNET_OK;
}
- n->state = S_CONNECTED;
- n->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
- GNUNET_STATISTICS_set (GST_stats,
- gettext_noop ("# peers connected"),
+ set_state_and_timeout (n, GNUNET_TRANSPORT_CONNECTED, GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT));
+ GNUNET_STATISTICS_set (GST_stats,
+ gettext_noop ("# peers connected"),
++neighbours_connected,
GNUNET_NO);
- connect_notify_cb (callback_cls, &n->id, ats, ats_count);
- GNUNET_ATS_address_add(GST_ats,
- n->primary_address.address,
- n->primary_address.session,
- ats, ats_count);
- set_address (&n->primary_address,
+ connect_notify_cb (callback_cls, &n->id,
+ n->primary_address.bandwidth_in,
+ n->primary_address.bandwidth_out);
+
+ GST_ats_add_address (n->primary_address.address,
+ n->primary_address.session,
+ NULL, 0);
+ set_primary_address (n,
n->primary_address.address,
n->primary_address.session,
n->primary_address.bandwidth_in,
n->primary_address.bandwidth_out,
GNUNET_YES);
+ return GNUNET_OK;
}
* Test if we're connected to the given peer.
*
* @param target peer to test
- * @return GNUNET_YES if we are connected, GNUNET_NO if not
+ * @return #GNUNET_YES if we are connected, #GNUNET_NO if not
*/
int
GST_neighbours_test_connected (const struct GNUNET_PeerIdentity *target)
GNUNET_BANDWIDTH_tracker_update_quota (&n->in_tracker, quota);
if (0 != ntohl (quota.value__))
return;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting peer `%4s' due to `%s'\n",
- GNUNET_i2s (&n->id), "SET_QUOTA");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Disconnecting peer `%4s' 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"),
* @param msg the disconnect message
*/
void
-GST_neighbours_handle_disconnect_message (const struct GNUNET_PeerIdentity
- *peer,
- const struct GNUNET_MessageHeader
- *msg)
+GST_neighbours_handle_disconnect_message (const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *msg)
{
struct NeighbourMapEntry *n;
const struct SessionDisconnectMessage *sdm;
- struct GNUNET_HashCode hc;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received DISCONNECT message from peer `%s'\n",
GNUNET_NO);
return;
}
+ GNUNET_STATISTICS_update (GST_stats,
+ gettext_noop
+ ("# DISCONNECT messages received"),
+ 1, GNUNET_NO);
sdm = (const struct SessionDisconnectMessage *) msg;
if (NULL == (n = lookup_neighbour (peer)))
return; /* gone already */
- if (GNUNET_TIME_absolute_ntoh (sdm->timestamp).abs_value <= n->connect_ack_timestamp.abs_value)
+ if (GNUNET_TIME_absolute_ntoh (sdm->timestamp).abs_value_us <= n->connect_ack_timestamp.abs_value_us)
{
GNUNET_STATISTICS_update (GST_stats,
gettext_noop
GNUNET_NO);
return;
}
- GNUNET_CRYPTO_hash (&sdm->public_key,
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
- &hc);
- if (0 != memcmp (peer, &hc, sizeof (struct GNUNET_PeerIdentity)))
+ if (0 != memcmp (peer, &sdm->public_key, sizeof (struct GNUNET_PeerIdentity)))
{
GNUNET_break_op (0);
return;
}
if (ntohl (sdm->purpose.size) !=
- sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) +
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) +
+ sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) +
+ sizeof (struct GNUNET_CRYPTO_EddsaPublicKey) +
sizeof (struct GNUNET_TIME_AbsoluteNBO))
{
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "%s message from peer `%s' has invalid size \n",
+ "DISCONNECT",
+ GNUNET_i2s (peer));
GNUNET_break_op (0);
return;
}
if (GNUNET_OK !=
- GNUNET_CRYPTO_rsa_verify
+ GNUNET_CRYPTO_eddsa_verify
(GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT, &sdm->purpose,
&sdm->signature, &sdm->public_key))
{
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "%s message from peer `%s' cannot be verified \n",
+ "DISCONNECT",
+ GNUNET_i2s (peer));
GNUNET_break_op (0);
return;
}
gettext_noop
("# other peer asked to disconnect from us"), 1,
GNUNET_NO);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Disconnecting by request from peer %s\n",
+ GNUNET_i2s (peer));
disconnect_neighbour (n);
}
/**
- * Call the callback from the closure for each connected neighbour.
+ * Call the callback from the closure for each neighbour.
*
- * @param cls the 'struct IteratorContext'
+ * @param cls the `struct IteratorContext`
* @param key the hash of the public key of the neighbour
- * @param value the 'struct NeighbourMapEntry'
- * @return GNUNET_OK (continue to iterate)
+ * @param value the `struct NeighbourMapEntry`
+ * @return #GNUNET_OK (continue to iterate)
*/
static int
-neighbours_iterate (void *cls, const struct GNUNET_HashCode * key, void *value)
+neighbours_iterate (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
struct IteratorContext *ic = cls;
struct NeighbourMapEntry *n = value;
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in;
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out;
- if (GNUNET_YES == test_connected (n))
- ic->cb (ic->cb_cls, &n->id, NULL, 0, n->primary_address.address);
+
+ if (NULL != n->primary_address.address)
+ {
+ bandwidth_in = n->primary_address.bandwidth_in;
+ bandwidth_out = n->primary_address.bandwidth_out;
+ }
+ else
+ {
+ bandwidth_in = GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT;
+ bandwidth_out = GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT;
+ }
+ ic->cb (ic->cb_cls,
+ &n->id,
+ n->primary_address.address,
+ n->state,
+ n->timeout,
+ bandwidth_in, bandwidth_out);
return GNUNET_OK;
}
{
struct IteratorContext ic;
- if (NULL == neighbours)
+ if (NULL == neighbours)
return; /* can happen during shutdown */
ic.cb = cb;
ic.cb_cls = cb_cls;
- GNUNET_CONTAINER_multihashmap_iterate (neighbours, &neighbours_iterate, &ic);
+ GNUNET_CONTAINER_multipeermap_iterate (neighbours, &neighbours_iterate, &ic);
}
gettext_noop
("# disconnected from peer upon explicit request"), 1,
GNUNET_NO);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Forced disconnect from peer %s\n",
+ GNUNET_i2s (target));
disconnect_neighbour (n);
}
* Obtain current latency information for the given neighbour.
*
* @param peer to get the latency for
- * @return observed latency of the address, FOREVER if the
+ * @return observed latency of the address, FOREVER if the
* the connection is not up
*/
struct GNUNET_TIME_Relative
struct NeighbourMapEntry *n;
n = lookup_neighbour (peer);
- if (NULL == n)
+ if (NULL == n)
return GNUNET_TIME_UNIT_FOREVER_REL;
switch (n->state)
{
- case S_CONNECTED:
- case S_RECONNECT_SENT:
- case S_RECONNECT_ATS:
+ case GNUNET_TRANSPORT_CONNECTED:
+ case GNUNET_TRANSPORT_CONNECTED_SWITCHING_CONNECT_SENT:
+ case GNUNET_TRANSPORT_CONNECTED_SWITCHING_BLACKLIST:
+ case GNUNET_TRANSPORT_RECONNECT_SENT:
+ case GNUNET_TRANSPORT_RECONNECT_ATS:
+ case GNUNET_TRANSPORT_RECONNECT_BLACKLIST:
return n->latency;
- case S_NOT_CONNECTED:
- case S_INIT_BLACKLIST:
- case S_INIT_ATS:
- case S_CONNECT_RECV_BLACKLIST_INBOUND:
- case S_CONNECT_SENT:
- case S_CONNECT_RECV_BLACKLIST:
- case S_DISCONNECT:
- case S_DISCONNECT_FINISHED:
+ case GNUNET_TRANSPORT_NOT_CONNECTED:
+ case GNUNET_TRANSPORT_INIT_BLACKLIST:
+ case GNUNET_TRANSPORT_INIT_ATS:
+ case GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST_INBOUND:
+ case GNUNET_TRANSPORT_CONNECT_RECV_ATS:
+ case GNUNET_TRANSPORT_CONNECT_RECV_BLACKLIST:
+ case GNUNET_TRANSPORT_CONNECT_RECV_ACK:
+ case GNUNET_TRANSPORT_CONNECT_SENT:
+ case GNUNET_TRANSPORT_DISCONNECT:
+ case GNUNET_TRANSPORT_DISCONNECT_FINISHED:
return GNUNET_TIME_UNIT_FOREVER_REL;
default:
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unhandled state `%s' \n",print_state (n->state));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Unhandled state `%s'\n",
+ GNUNET_TRANSPORT_p2s (n->state));
GNUNET_break (0);
break;
}
- return GNUNET_TIME_UNIT_FOREVER_REL;
+ return GNUNET_TIME_UNIT_FOREVER_REL;
}
* @param disconnect_cb function to call if we disconnect from a peer
* @param peer_address_cb function to call if we change an active address
* of a neighbour
+ * @param max_fds maximum number of fds to use
*/
void
GST_neighbours_start (void *cls,
- GNUNET_TRANSPORT_NotifyConnect connect_cb,
+ NotifyConnect connect_cb,
GNUNET_TRANSPORT_NotifyDisconnect disconnect_cb,
- GNUNET_TRANSPORT_PeerIterateCallback peer_address_cb)
+ GNUNET_TRANSPORT_NeighbourChangeCallback peer_address_cb,
+ unsigned int max_fds)
{
callback_cls = cls;
connect_notify_cb = connect_cb;
disconnect_notify_cb = disconnect_cb;
- address_change_cb = peer_address_cb;
- neighbours = GNUNET_CONTAINER_multihashmap_create (NEIGHBOUR_TABLE_SIZE);
+ neighbour_change_cb = peer_address_cb;
+ neighbours = GNUNET_CONTAINER_multipeermap_create (NEIGHBOUR_TABLE_SIZE, GNUNET_NO);
+ util_transmission_tk = GNUNET_SCHEDULER_add_delayed (UTIL_TRANSMISSION_INTERVAL,
+ utilization_transmission, NULL);
}
* @param cls unused
* @param key hash of neighbour's public key (not used)
* @param value the 'struct NeighbourMapEntry' of the neighbour
- * @return GNUNET_OK (continue to iterate)
+ * @return #GNUNET_OK (continue to iterate)
*/
static int
-disconnect_all_neighbours (void *cls, const struct GNUNET_HashCode * key, void *value)
+disconnect_all_neighbours (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
struct NeighbourMapEntry *n = value;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Disconnecting peer `%4s', %s\n",
GNUNET_i2s (&n->id), "SHUTDOWN_TASK");
- n->state = S_DISCONNECT_FINISHED;
+ set_state (n, GNUNET_TRANSPORT_DISCONNECT_FINISHED);
free_neighbour (n, GNUNET_NO);
return GNUNET_OK;
}
{
if (NULL == neighbours)
return;
- GNUNET_CONTAINER_multihashmap_iterate (neighbours,
+ if (GNUNET_SCHEDULER_NO_TASK != util_transmission_tk)
+ {
+ GNUNET_SCHEDULER_cancel (util_transmission_tk);
+ util_transmission_tk = GNUNET_SCHEDULER_NO_TASK;
+ }
+
+ GNUNET_CONTAINER_multipeermap_iterate (neighbours,
&disconnect_all_neighbours,
NULL);
- GNUNET_CONTAINER_multihashmap_destroy (neighbours);
+ GNUNET_CONTAINER_multipeermap_destroy (neighbours);
neighbours = NULL;
callback_cls = NULL;
connect_notify_cb = NULL;
disconnect_notify_cb = NULL;
- address_change_cb = NULL;
+ neighbour_change_cb = NULL;
}
projects / oweals / gnunet.git / blobdiff