#define ATS_RESPONSE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3)
+#define FAST_RECONNECT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
#define SETUP_CONNECTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
#if DEBUG_TRANSPORT
#endif
- /* This jut a temporary debug message to check if a the value
- * SETUP_CONNECTION_TIMEOUT was choosen to small for slow machines
- */
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Information for developers: Connection to peer `%s' %s failed in state `%s', resetting connection attempt \n",
- GNUNET_i2s (&n->id), GST_plugins_a2s (n->address),
- print_state (n->state));
GNUNET_STATISTICS_update (GST_stats,
gettext_noop
n->state = S_NOT_CONNECTED;
/* destroying address */
- GNUNET_ATS_address_destroyed (GST_ats, n->address, NULL);
+ GNUNET_ATS_address_destroyed (GST_ats, n->address, n->session);
/* request new address */
if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK)
case S_DISCONNECT:
break;
case S_FAST_RECONNECT:
- if ((state == S_CONNECT_SENT) || (state == S_DISCONNECT))
+ if ((state == S_CONNECTED) || (state == S_DISCONNECT))
allowed = GNUNET_YES;
break;
default:
return GNUNET_SYSERR;
}
- if ((session == NULL) && (address == NULL))
+ if ((session == NULL) && (address->address_length == 0))
{
if (cont != NULL)
cont (cont_cls, target, GNUNET_SYSERR);
if (NULL == mq)
return; /* no more messages */
+ if (n->address == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "No address for peer `%s'\n",
+ GNUNET_i2s (&n->id));
+ transmit_send_continuation (mq, &n->id, GNUNET_SYSERR);
+ GNUNET_assert (n->transmission_task == GNUNET_SCHEDULER_NO_TASK);
+ n->transmission_task = GNUNET_SCHEDULER_add_now (&transmission_task, n);
+ return;
+ }
+
if (GST_plugins_find (n->address->transport_name) == NULL)
{
GNUNET_break (0);
n->is_active = mq;
mq->n = n;
- if ( (n->session == NULL) && (NULL == n->address) )
+ if ((n->address->address_length == 0) && (n->session == NULL))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"No address for peer `%s'\n",
if (is_disconnecting (n))
return;
+
/* send DISCONNECT MESSAGE */
- if ((previous_state == S_CONNECTED)|| is_connecting (n))
+ if ((previous_state == S_CONNECTED) || is_connecting (n))
{
if (GNUNET_OK ==
send_disconnect (&n->id, n->address,
case S_FAST_RECONNECT:
GNUNET_STATISTICS_update (GST_stats, gettext_noop ("# peers connected"), -1,
GNUNET_NO);
+ GNUNET_STATISTICS_update (GST_stats,
+ gettext_noop
+ ("# fast reconnects failed"),
+ 1, GNUNET_NO);
disconnect_notify_cb (callback_cls, &n->id);
default:
break;
disconnect_notify_cb = NULL;
}
+struct ContinutionContext
+{
+ struct GNUNET_HELLO_Address *address;
+
+ struct Session *session;
+};
/**
* We tried to send a SESSION_CONNECT message to another peer. If this
send_connect_continuation (void *cls, const struct GNUNET_PeerIdentity *target,
int success)
{
- struct GNUNET_HELLO_Address *address = cls;
- struct NeighbourMapEntry *n;
+ struct ContinutionContext * cc = cls;
+ struct NeighbourMapEntry *n = lookup_neighbour (&cc->address->peer);
if (GNUNET_YES != success)
- GNUNET_ATS_address_destroyed (GST_ats, address, NULL);
+ GNUNET_ATS_address_destroyed (GST_ats, cc->address, NULL);
+ //GNUNET_ATS_address_destroyed (GST_ats, cc->address, cc->session);
if ( (NULL == neighbours) ||
- (NULL == (n = lookup_neighbour (&address->peer))) ||
- (n->state == S_DISCONNECT) ||
- (GNUNET_YES == success) )
+ (NULL == n) ||
+ (n->state == S_DISCONNECT))
{
- GNUNET_HELLO_address_free (address);
+ GNUNET_HELLO_address_free (cc->address);
+ GNUNET_free (cc);
return;
}
+
+ if ((GNUNET_YES == success) &&
+ ((n->state == S_NOT_CONNECTED) || (n->state == S_CONNECT_SENT)))
+ {
+ change_state (n, S_CONNECT_SENT);
+ GNUNET_HELLO_address_free (cc->address);
+ GNUNET_free (cc);
+ return;
+ }
+
+ if ((GNUNET_NO == success) &&
+ ((n->state == S_NOT_CONNECTED) || (n->state == S_CONNECT_SENT)))
+ {
#if DEBUG_TRANSPORT
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Failed to send CONNECT_MSG to peer `%4s' with address '%s' session %p, asking ATS for new address \n",
- GNUNET_i2s (&n->id),
- GST_plugins_a2s (n->address),
- n->session);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Failed to send CONNECT_MSG to peer `%4s' with address '%s' session %p, asking ATS for new address \n",
+ GNUNET_i2s (&n->id),
+ GST_plugins_a2s (n->address),
+ n->session);
#endif
- change_state (n, S_NOT_CONNECTED);
- if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (n->ats_suggest);
- n->ats_suggest =
- GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, &ats_suggest_cancel,
- n);
- GNUNET_ATS_suggest_address (GST_ats, &n->id);
- GNUNET_HELLO_address_free (address);
+ change_state (n, S_NOT_CONNECTED);
+ GNUNET_ATS_address_destroyed (GST_ats, cc->address, NULL);
+ //GNUNET_ATS_address_destroyed (GST_ats, cc->address, cc->session);
+
+ if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (n->ats_suggest);
+ n->ats_suggest =
+ GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, &ats_suggest_cancel,
+ n);
+ GNUNET_ATS_suggest_address (GST_ats, &n->id);
+ }
+ GNUNET_HELLO_address_free (cc->address);
+ GNUNET_free (cc);
}
const struct GNUNET_PeerIdentity *target,
int success)
{
- struct NeighbourMapEntry *n = cls;
+ struct ContinutionContext * cc = cls;
+ struct NeighbourMapEntry *n;
- GNUNET_assert (n != NULL);
- if (is_disconnecting (n))
+ if (neighbours == NULL)
+ {
+ GNUNET_HELLO_address_free (cc->address);
+ GNUNET_free (cc);
+ return; /* neighbour is going away */
+ }
+
+ n = lookup_neighbour(&cc->address->peer);
+ if ((n == NULL) || (is_disconnecting (n)))
+ {
+ GNUNET_HELLO_address_free (cc->address);
+ GNUNET_free (cc);
return; /* neighbour is going away */
+ }
- GNUNET_assert (n->state == S_CONNECTED);
+ GNUNET_assert ((n->state == S_CONNECTED) || (n->state == S_FAST_RECONNECT));
if (GNUNET_YES != success)
{
#if DEBUG_TRANSPORT
GNUNET_i2s (&n->id),
GST_plugins_a2s (n->address), n->session);
#endif
-
- GNUNET_ATS_address_destroyed (GST_ats, n->address, NULL);
+ GNUNET_ATS_address_destroyed (GST_ats, cc->address, NULL);
+ //GNUNET_ATS_address_destroyed (GST_ats, cc->address, cc->session);
if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel (n->ats_suggest);
GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, ats_suggest_cancel,
n);
GNUNET_ATS_suggest_address (GST_ats, &n->id);
+ GNUNET_HELLO_address_free (cc->address);
+ GNUNET_free (cc);
return;
}
/* Tell ATS that switching addresses was successful */
- GNUNET_ATS_address_in_use (GST_ats, n->address, n->session, GNUNET_YES);
+ switch (n->state) {
+ case S_CONNECTED:
+ GNUNET_ATS_address_in_use (GST_ats, n->address, n->session, GNUNET_YES);
+ break;
+ case S_FAST_RECONNECT:
+#if DEBUG_TRANSPORT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Successful fast reconnect to peer `%s'\n", GNUNET_i2s (&n->id));
+#endif
+ change_state (n, S_CONNECTED);
+ neighbours_connected++;
+ GNUNET_STATISTICS_update (GST_stats, gettext_noop ("# peers connected"), 1,
+ GNUNET_NO);
+
+ GST_validation_set_address_use (&n->id,
+ cc->address,
+ cc->session,
+ GNUNET_YES);
+
+ GNUNET_ATS_address_in_use (GST_ats, cc->address, cc->session, GNUNET_YES);
+
+ if (n->keepalive_task == GNUNET_SCHEDULER_NO_TASK)
+ n->keepalive_task = GNUNET_SCHEDULER_add_now (&neighbour_keepalive_task, n);
+
+ /* Updating quotas */
+ struct QuotaSetMessage q_msg;
+ GST_neighbours_set_incoming_quota (&n->id, n->bandwidth_in);
+#if DEBUG_TRANSPORT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending outbound quota of %u Bps for peer `%s' to all clients\n",
+ ntohl (n->bandwidth_out.value__), GNUNET_i2s (peer));
+#endif
+ q_msg.header.size = htons (sizeof (struct QuotaSetMessage));
+ q_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SET_QUOTA);
+ q_msg.quota = n->bandwidth_out;
+ q_msg.peer = (*target);
+ GST_clients_broadcast (&q_msg.header, GNUNET_NO);
+ default:
+ break;
+ }
+ GNUNET_HELLO_address_free (cc->address);
+ GNUNET_free (cc);
}
/**
const struct GNUNET_PeerIdentity *target,
int success)
{
- struct NeighbourMapEntry *n = cls;
+ struct ContinutionContext * cc = cls;
+ struct NeighbourMapEntry *n;
+
+ if (neighbours == NULL)
+ {
+ GNUNET_HELLO_address_free (cc->address);
+ GNUNET_free (cc);
+ return; /* neighbour is going away */
+ }
+
+ n = lookup_neighbour(&cc->address->peer);
+ if ((n == NULL) || (is_disconnecting (n)))
+ {
+ GNUNET_HELLO_address_free (cc->address);
+ GNUNET_free (cc);
+ return; /* neighbour is going away */
+ }
- GNUNET_assert (n != NULL);
if (GNUNET_YES == success)
+ {
+ GNUNET_HELLO_address_free (cc->address);
+ GNUNET_free (cc);
return; /* sending successful */
+ }
/* sending failed, ask for next address */
#if DEBUG_TRANSPORT
#endif
change_state (n, S_NOT_CONNECTED);
- GNUNET_ATS_address_destroyed (GST_ats, n->address, NULL);
+ GNUNET_ATS_address_destroyed (GST_ats, cc->address, NULL);
+ //GNUNET_ATS_address_destroyed (GST_ats, cc->address, cc->session);
if (n->ats_suggest != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel (n->ats_suggest);
GNUNET_SCHEDULER_add_delayed (ATS_RESPONSE_TIMEOUT, ats_suggest_cancel,
n);
GNUNET_ATS_suggest_address (GST_ats, &n->id);
-}
+ GNUNET_HELLO_address_free (cc->address);
+ GNUNET_free (cc);
+}
/**
* For an existing neighbour record, set the active connection to
{
struct NeighbourMapEntry *n;
struct SessionConnectMessage connect_msg;
+ struct ContinutionContext * cc;
size_t msg_len;
size_t ret;
GST_clients_broadcast (&q_msg.header, GNUNET_NO);
return GNUNET_NO;
}
- if (n->state == S_CONNECTED)
+ if (n->state == S_CONNECTED)
{
/* mark old address as no longer used */
GNUNET_assert (NULL != n->address);
{
case S_NOT_CONNECTED:
case S_CONNECT_SENT:
- case S_FAST_RECONNECT:
msg_len = sizeof (struct SessionConnectMessage);
connect_msg.header.size = htons (msg_len);
connect_msg.header.type =
connect_msg.reserved = htonl (0);
connect_msg.timestamp =
GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ());
- change_state (n, S_CONNECT_SENT);
+
+ cc = GNUNET_malloc(sizeof (struct ContinutionContext));
+ cc->session = session;
+ cc->address = GNUNET_HELLO_address_copy (address);
ret =
send_with_plugin (peer, (const char *) &connect_msg, msg_len,
UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL, session,
address, GNUNET_YES,
&send_connect_continuation,
- GNUNET_HELLO_address_copy (address));
+ cc);
return GNUNET_NO;
case S_CONNECT_RECV:
/* We received a CONNECT message and asked ATS for an address */
connect_msg.reserved = htonl (0);
connect_msg.timestamp =
GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ());
+ cc = GNUNET_malloc(sizeof (struct ContinutionContext));
+ cc->session = session;
+ cc->address = GNUNET_HELLO_address_copy (address);
ret =
send_with_plugin (&n->id, (const void *) &connect_msg, msg_len,
UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL, session,
address, GNUNET_YES,
- &send_connect_ack_continuation, n);
+ &send_connect_ack_continuation, cc);
return GNUNET_NO;
case S_CONNECTED:
- /* connected peer is switching addresses */
+ case S_FAST_RECONNECT:
+ /* connected peer is switching addresses or tries fast reconnect*/
GST_validation_set_address_use (&n->id,
n->address,
n->session,
connect_msg.reserved = htonl (0);
connect_msg.timestamp =
GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ());
+ cc = GNUNET_malloc(sizeof (struct ContinutionContext));
+ cc->session = session;
+ cc->address = GNUNET_HELLO_address_copy (address);
ret =
send_with_plugin (peer, (const char *) &connect_msg, msg_len,
UINT32_MAX, GNUNET_TIME_UNIT_FOREVER_REL, session,
address, GNUNET_YES,
- &send_switch_address_continuation, n);
+ &send_switch_address_continuation, cc);
if (ret == GNUNET_SYSERR)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
return GNUNET_YES;
}
-
/**
* A session was terminated. Take note.
*
if (session != n->session)
return; /* doesn't affect us */
if (n->state == S_CONNECTED)
+ {
GST_validation_set_address_use (&n->id,
n->address,
n->session,
GNUNET_NO);
- n->session = NULL;
+ GNUNET_ATS_address_in_use (GST_ats,n->address, n->session, GNUNET_NO);
+ }
+
+
+ //GNUNET_ATS_address_destroyed(GST_ats, n->address, n->session);
+
if (NULL != n->address)
{
GNUNET_HELLO_address_free (n->address);
n->address = NULL;
}
+ n->session = NULL;
/* not connected anymore anyway, shouldn't matter */
if ((S_CONNECTED != n->state) && (!is_connecting (n)))
return;
- change_state (n, S_FAST_RECONNECT);
+ /* connected, try fast reconnect */
+#if DEBUG_TRANSPORT
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Trying fast reconnect to peer `%s'\n", GNUNET_i2s (peer));
+#endif
+ change_state (n, S_FAST_RECONNECT);
GNUNET_assert (neighbours_connected > 0);
neighbours_connected--;
projects / oweals / gnunet.git / commitdiff