};
-/**
- * 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
-};
/**
/**
* 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;
/**
* 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?
/**
- * 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
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;
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 const char *
-print_state (int state)
-{
-
- switch (state)
- {
- case S_NOT_CONNECTED:
- return "S_NOT_CONNECTED";
- case S_INIT_ATS:
- return "S_INIT_ATS";
- case S_INIT_BLACKLIST:
- return "S_INIT_BLACKLIST";
- case S_CONNECT_SENT:
- return "S_CONNECT_SENT";
- case S_CONNECT_RECV_BLACKLIST_INBOUND:
- return "S_CONNECT_RECV_BLACKLIST_INBOUND";
- case S_CONNECT_RECV_ATS:
- return "S_CONNECT_RECV_ATS";
- case S_CONNECT_RECV_BLACKLIST:
- return "S_CONNECT_RECV_BLACKLIST";
- case S_CONNECT_RECV_ACK:
- return "S_CONNECT_RECV_ACK";
- case S_CONNECTED:
- return "S_CONNECTED";
- case S_RECONNECT_ATS:
- return "S_RECONNECT_ATS";
- case S_RECONNECT_BLACKLIST:
- return "S_RECONNECT_BLACKLIST";
- case S_RECONNECT_SENT:
- return "S_RECONNECT_SENT";
- case S_CONNECTED_SWITCHING_BLACKLIST:
- return "S_CONNECTED_SWITCHING_BLACKLIST";
- case S_CONNECTED_SWITCHING_CONNECT_SENT:
- return "S_CONNECTED_SWITCHING_CONNECT_SENT";
- case S_DISCONNECT:
- return "S_DISCONNECT";
- case S_DISCONNECT_FINISHED:
- return "S_DISCONNECT_FINISHED";
- default:
- GNUNET_break (0);
- return "UNDEFINED";
- }
-}
-
/**
* Test if we're connected to the given peer.
*
{
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);
}
/**
{
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);
- address_change_cb (callback_cls, &na->address->peer, NULL);
}
na->ats_active = GNUNET_NO;
/**
- * 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 na neighbour address to initialize
+ * @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 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
* @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,
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__);
- if (is_active)
- address_change_cb (callback_cls, &address->peer, address);
+ 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);
if (NULL == session)
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;
- na->keep_alive_nonce = 0;
+
+ 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__);
- address_change_cb (callback_cls, &address->peer, address);
- /* 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)
+{
+
}
struct GNUNET_TRANSPORT_PluginFunctions *papi;
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_NO);
disconnect_notify_cb (callback_cls, &n->id);
}
- n->state = S_DISCONNECT_FINISHED;
+ set_state (n, GNUNET_TRANSPORT_DISCONNECT_FINISHED);
if (NULL != n->primary_address.address)
{
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 */
if (GNUNET_SCHEDULER_NO_TASK != n->task)
GNUNET_SCHEDULER_cancel (n->task);
static void
disconnect_neighbour (struct NeighbourMapEntry *n)
{
+ 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:
+ case GNUNET_TRANSPORT_CONNECT_SENT:
send_disconnect (n);
- n->state = S_DISCONNECT;
+ 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;
+ set_state (n, GNUNET_TRANSPORT_DISCONNECT);
break;
- case S_CONNECTED:
- case S_RECONNECT_BLACKLIST:
- case S_RECONNECT_SENT:
- case S_CONNECTED_SWITCHING_BLACKLIST:
- case S_CONNECTED_SWITCHING_CONNECT_SENT:
+ 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);
--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_TRANSPORT_p2s (n->state));
GNUNET_break (0);
break;
}
}
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_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);
}
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, mq->message_buf_size, 0); /* timeout */
+ transmit_send_continuation (mq, &n->id,
+ GNUNET_SYSERR,
+ mq->message_buf_size, 0); /* timeout */
}
if (NULL == mq)
return; /* no more messages */
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));
+ 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 */
while (0 == nonce)
nonce = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Sending keep alive response to peer `%s' with nonce %u\n",
+ 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));
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ 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));
1, GNUNET_NO);
return;
}
- if ( (S_CONNECTED != n->state) ||
+ if ( (GNUNET_TRANSPORT_CONNECTED != n->state) ||
(GNUNET_YES != n->expect_latency_response) )
{
GNUNET_STATISTICS_update (GST_stats,
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ 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_ERROR,
+ 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);
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);
+ 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),
*
* @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 GNUNET_TRANSPORT_PluginFunctions *papi;
struct SessionConnectMessage connect_msg;
+ 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);
struct GNUNET_TRANSPORT_PluginFunctions *papi;
struct SessionConnectMessage connect_msg;
+ 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);
GNUNET_i2s (peer));
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;
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_multipeermap_put (neighbours,
&n->id, n,
}
+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).
*
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Asked to connect to peer `%s' (state: %s)\n",
GNUNET_i2s (target),
- (NULL != n) ? print_state(n->state) : "NEW PEER");
+ (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:
+ 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:
+ 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:
+ 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_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);
+ set_state_and_timeout (n, GNUNET_TRANSPORT_INIT_ATS, GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
GNUNET_ATS_reset_backoff (GST_ats, target);
- n->suggest_handle = 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
*/
GNUNET_i2s (peer),
(GNUNET_OK == result) ? "allowed" : "FORBIDDEN");
if (GNUNET_OK == result)
- GST_ats_add_address (bcc->na.address, bcc->na.session);
+ {
+ GST_ats_add_address (bcc->na.address, bcc->na.session, NULL, 0);
+ }
else
{
/* Blacklist disagreed on connecting to a peer with this address
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:
+ 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
{
free_address (&n->primary_address);
- n->state = S_INIT_ATS;
- n->timeout = GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT);
+ 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->connect_ack_timestamp);
}
break;
- case S_CONNECT_RECV_BLACKLIST_INBOUND:
- n->state = S_CONNECT_RECV_ATS;
- n->timeout = GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT);
+ 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);
- n->suggest_handle = 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:
+ 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,
}
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);
}
GNUNET_break (NULL != plugin);
free_address (&n->primary_address);
- n->state = S_INIT_ATS;
- n->timeout = GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT);
+ set_state_and_timeout (n, GNUNET_TRANSPORT_INIT_ATS, GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
GNUNET_ATS_reset_backoff (GST_ats, peer);
}
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->connect_ack_timestamp);
}
break;
- case S_CONNECTED:
+ 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:
+ 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)
{
- n->state = S_RECONNECT_SENT;
+ 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);
}
else
{
- n->state = S_RECONNECT_ATS;
- n->timeout = GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT);
+ 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->connect_ack_timestamp);
}
break;
- case S_CONNECTED_SWITCHING_BLACKLIST:
+ 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
{
- n->state = S_CONNECTED;
+ set_state(n, GNUNET_TRANSPORT_CONNECTED);
free_address (&n->alternative_address);
}
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->connect_ack_timestamp);
}
break;
- case S_DISCONNECT:
+ 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_TRANSPORT_p2s (n->state));
GNUNET_break (0);
free_neighbour (n, GNUNET_NO);
break;
struct BlackListCheckContext *bcc;
struct GST_BlacklistCheck *bc;
+ 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;
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 */
+ 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_BLACKLIST_INBOUND:
- case S_CONNECT_RECV_ATS:
- case S_CONNECT_RECV_BLACKLIST:
- case S_CONNECT_RECV_ACK:
+ 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);
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->primary_address.session, ts);
check_blacklist (peer, ts, address, session);
break;
- case S_RECONNECT_ATS:
- case S_RECONNECT_BLACKLIST:
- case S_RECONNECT_SENT:
+ 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);
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->primary_address.session, ts);
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);
- n->suggest_handle = 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_TRANSPORT_p2s (n->state));
GNUNET_break (0);
return GNUNET_SYSERR;
}
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 "
+ "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__));
}
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);
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);
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);
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);
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);
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);
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! */
- n->state = S_CONNECTED_SWITCHING_BLACKLIST;
- set_address (&n->alternative_address,
- address, session, bandwidth_in, bandwidth_out, GNUNET_NO);
+ 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);
break;
- case S_RECONNECT_ATS:
- n->state = S_RECONNECT_BLACKLIST;
- set_address (&n->primary_address,
+ case GNUNET_TRANSPORT_RECONNECT_ATS:
+ 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_RECONNECT_BLACKLIST, GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT));
check_blacklist (&n->id,
n->connect_ack_timestamp,
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);
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 */
- n->state = S_RECONNECT_BLACKLIST;
- 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_RECONNECT_BLACKLIST, GNUNET_TIME_relative_to_absolute (BLACKLIST_RESPONSE_TIMEOUT));
check_blacklist (&n->id,
n->connect_ack_timestamp,
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 */
- n->state = S_CONNECTED;
+ set_state(n, GNUNET_TRANSPORT_CONNECTED);
free_address (&n->alternative_address);
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);
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 */
- n->state = S_CONNECTED_SWITCHING_BLACKLIST;
- set_address (&n->alternative_address,
- address, session, bandwidth_in, bandwidth_out, GNUNET_NO);
+ 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);
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_TRANSPORT_p2s (n->state));
GNUNET_break (0);
break;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Master task runs for neighbour `%s' in state %s with timeout in %s\n",
GNUNET_i2s (&n->id),
- print_state(n->state),
+ 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:
+ case GNUNET_TRANSPORT_INIT_ATS:
if (0 == delay.rel_value_us)
{
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:
+ 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:
+ case GNUNET_TRANSPORT_CONNECT_SENT:
if (0 == delay.rel_value_us)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
return;
}
break;
- case S_CONNECT_RECV_BLACKLIST_INBOUND:
+ 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:
+ 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:
+ 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:
+ case GNUNET_TRANSPORT_CONNECT_RECV_ACK:
if (0 == delay.rel_value_us)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
return;
}
break;
- case S_CONNECTED:
+ case GNUNET_TRANSPORT_CONNECTED:
if (0 == delay.rel_value_us)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
try_transmission_to_peer (n);
send_keepalive (n);
break;
- case S_RECONNECT_ATS:
+ case GNUNET_TRANSPORT_RECONNECT_ATS:
if (0 == delay.rel_value_us)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
return;
}
break;
- case S_RECONNECT_BLACKLIST:
+ case GNUNET_TRANSPORT_RECONNECT_BLACKLIST:
if (0 == delay.rel_value_us)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
return;
}
break;
- case S_RECONNECT_SENT:
+ case GNUNET_TRANSPORT_RECONNECT_SENT:
if (0 == delay.rel_value_us)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
return;
}
break;
- case S_CONNECTED_SWITCHING_BLACKLIST:
+ case GNUNET_TRANSPORT_CONNECTED_SWITCHING_BLACKLIST:
if (0 == delay.rel_value_us)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
try_transmission_to_peer (n);
send_keepalive (n);
break;
- case S_CONNECTED_SWITCHING_CONNECT_SENT:
+ case GNUNET_TRANSPORT_CONNECTED_SWITCHING_CONNECT_SENT:
if (0 == delay.rel_value_us)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
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_TRANSPORT_p2s (n->state));
GNUNET_break (0);
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
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 GNUNET_SYSERR;
- case S_INIT_ATS:
- case S_INIT_BLACKLIST:
+ 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:
+ 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;
}
- 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_STATISTICS_set (GST_stats,
gettext_noop ("# peers connected"),
++neighbours_connected,
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);
- set_address (&n->primary_address,
+ 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);
- GST_ats_add_address (n->alternative_address.address, n->alternative_address.session);
- 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:
+ case GNUNET_TRANSPORT_DISCONNECT:
GNUNET_STATISTICS_update (GST_stats,
gettext_noop
("# unexpected CONNECT_ACK messages (disconnecting)"),
1, GNUNET_NO);
return GNUNET_SYSERR;
- 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_TRANSPORT_p2s (n->state));
GNUNET_break (0);
return GNUNET_SYSERR;
}
{
if (session == n->alternative_address.session)
{
- 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);
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?
- n->suggest_handle = 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:
- n->state = S_RECONNECT_ATS;
+ 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->timeout = GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT);
- /* FIXME: is this ATS call needed? */
- n->suggest_handle = 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?
- n->suggest_handle = 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 */
- n->state = S_RECONNECT_BLACKLIST;
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);
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 */
- n->state = S_RECONNECT_SENT;
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);
+ 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_TRANSPORT_p2s (n->state));
GNUNET_break (0);
break;
}
}
/* 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),
- print_state (n->state),
+ GNUNET_TRANSPORT_p2s (n->state),
n->send_connect_ack);
GNUNET_STATISTICS_update (GST_stats,
gettext_noop ("# unexpected SESSION_ACK messages"), 1,
GNUNET_NO);
return GNUNET_OK;
}
- 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_STATISTICS_set (GST_stats,
gettext_noop ("# peers connected"),
++neighbours_connected,
n->primary_address.bandwidth_in,
n->primary_address.bandwidth_out);
- GST_ats_add_address (n->primary_address.address, n->primary_address.session);
- set_address (&n->primary_address,
+ 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_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;
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 key the hash of the public key of the neighbour
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in;
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out;
- if (GNUNET_YES != test_connected (n))
- return GNUNET_OK;
if (NULL != n->primary_address.address)
{
bandwidth_in = GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT;
bandwidth_out = GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT;
}
- ic->cb (ic->cb_cls, &n->id,
+ ic->cb (ic->cb_cls,
+ &n->id,
n->primary_address.address,
+ n->state,
+ n->timeout,
bandwidth_in, bandwidth_out);
return GNUNET_OK;
}
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);
}
return GNUNET_TIME_UNIT_FOREVER_REL;
switch (n->state)
{
- case S_CONNECTED:
- case S_CONNECTED_SWITCHING_CONNECT_SENT:
- case S_CONNECTED_SWITCHING_BLACKLIST:
- case S_RECONNECT_SENT:
- case S_RECONNECT_ATS:
- case S_RECONNECT_BLACKLIST:
+ 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_RECV_ATS:
- case S_CONNECT_RECV_BLACKLIST:
- case S_CONNECT_RECV_ACK:
- case S_CONNECT_SENT:
- 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_TRANSPORT_p2s (n->state));
GNUNET_break (0);
break;
}
GST_neighbours_start (void *cls,
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;
+ 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);
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;
}
callback_cls = NULL;
connect_notify_cb = NULL;
disconnect_notify_cb = NULL;
- address_change_cb = NULL;
+ neighbour_change_cb = NULL;
}
projects / oweals / gnunet.git / blobdiff