#include "gnunet-service-transport_manipulation.h"
#include "transport.h"
+
+/**
+ * Information we need for an asynchronous session kill.
+ */
+struct SessionKiller
+{
+ /**
+ * Kept in a DLL.
+ */
+ struct SessionKiller *next;
+
+ /**
+ * Kept in a DLL.
+ */
+ struct SessionKiller *prev;
+
+ /**
+ * Session to kill.
+ */
+ struct Session *session;
+
+ /**
+ * Plugin for the session.
+ */
+ struct GNUNET_TRANSPORT_PluginFunctions *plugin;
+
+ /**
+ * The kill task.
+ */
+ GNUNET_SCHEDULER_TaskIdentifier task;
+};
+
+
/* globals */
/**
*/
struct GNUNET_ATS_SchedulingHandle *GST_ats;
+/**
+ * Hello address expiration
+ */
+struct GNUNET_TIME_Relative hello_expiration;
+
/**
* DEBUGGING connection counter
*/
static int connections;
/**
- * Hello address expiration
+ * Head of DLL of asynchronous tasks to kill sessions.
*/
-struct GNUNET_TIME_Relative hello_expiration;
+static struct SessionKiller *sk_head;
+
+/**
+ * Tail of DLL of asynchronous tasks to kill sessions.
+ */
+static struct SessionKiller *sk_tail;
/**
return ret;
}
- GST_ats_add_address ((struct GNUNET_HELLO_Address *) address, session);
+ GST_ats_add_address (address, session, NULL, 0);
if (GNUNET_YES != do_forward)
return ret;
}
+/**
+ * Task to asynchronously terminate a session.
+ *
+ * @param cls the `struct SessionKiller` with the information for the kill
+ * @param tc scheduler context
+ */
+static void
+kill_session_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct SessionKiller *sk = cls;
+
+ sk->task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_CONTAINER_DLL_remove (sk_head, sk_tail, sk);
+ sk->plugin->disconnect_session (sk->plugin->cls,
+ sk->session);
+ GNUNET_free (sk);
+}
+
+
/**
* Force plugin to terminate session due to communication
* issue.
struct Session *session)
{
struct GNUNET_TRANSPORT_PluginFunctions *plugin;
+ struct SessionKiller *sk;
+ for (sk = sk_head; NULL != sk; sk = sk->next)
+ if (sk->session == session)
+ return;
plugin = GST_plugins_find (plugin_name);
if (NULL == plugin)
{
GNUNET_break (0);
return;
}
- plugin->disconnect_session (plugin->cls,
- session);
+ /* need to issue disconnect asynchronously */
+ sk = GNUNET_new (struct SessionKiller);
+ sk->session = session;
+ sk->plugin = plugin;
+ sk->task = GNUNET_SCHEDULER_add_now (&kill_session_task,
+ sk);
+ GNUNET_CONTAINER_DLL_insert (sk_head, sk_tail, sk);
}
if (GNUNET_OK !=
GST_neighbours_handle_connect_ack (message, peer, &address, session))
{
- GNUNET_break_op (0);
kill_session (plugin_name, session);
}
break;
GST_neighbours_handle_disconnect_message (peer, message);
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE:
- GST_neighbours_keepalive (peer);
+ GST_neighbours_keepalive (peer, message);
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE_RESPONSE:
- GST_neighbours_keepalive_response (peer);
+ GST_neighbours_keepalive_response (peer, message);
break;
default:
/* should be payload */
{
const char *transport_name = cls;
struct GNUNET_HELLO_Address address;
+ struct SessionKiller *sk;
GNUNET_assert (strlen (transport_name) > 0);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Session %p to peer `%s' ended \n",
- session, GNUNET_i2s (peer));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Session %p to peer `%s' ended \n",
+ session,
+ GNUNET_i2s (peer));
if (NULL != session)
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
"transport-ats",
/* Tell ATS that session has ended */
GNUNET_ATS_address_destroyed (GST_ats, &address, session);
+ for (sk = sk_head; NULL != sk; sk = sk->next)
+ {
+ if (sk->session == session)
+ {
+ GNUNET_CONTAINER_DLL_remove (sk_head, sk_tail, sk);
+ GNUNET_SCHEDULER_cancel (sk->task);
+ GNUNET_free (sk);
+ break;
+ }
+ }
}
*
* @param address the address
* @param session the session
+ * @param ats ats information
+ * @param ats_count number of @a ats information
*/
void
GST_ats_add_address (const struct GNUNET_HELLO_Address *address,
- struct Session *session)
+ struct Session *session,
+ const struct GNUNET_ATS_Information *ats,
+ uint32_t ats_count)
{
struct GNUNET_TRANSPORT_PluginFunctions *papi;
- struct GNUNET_ATS_Information ats;
+ struct GNUNET_ATS_Information ats2[ats_count + 1];
uint32_t net;
/* valid new address, let ATS know! */
address->transport_name);
GNUNET_break (0);
}
- ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
- ats.value = htonl(net);
+ ats2[0].type = htonl (GNUNET_ATS_NETWORK_TYPE);
+ ats2[0].value = htonl(net);
+ memcpy (&ats2[1], ats, sizeof (struct GNUNET_ATS_Information) * ats_count);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Notifying ATS about peer `%s''s new address `%s' session %p in network %s\n",
GNUNET_i2s (&address->peer),
session,
GNUNET_ATS_print_network_type(net));
GNUNET_ATS_address_add (GST_ats,
- address, session, &ats, 1);
+ address, session,
+ ats2, ats_count + 1);
}
}
addr = GNUNET_HELLO_address_allocate (peer, plugin, address, address_len);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Notification from plugin `%s' about new session %p from peer `%s' address `%s'\n",
- plugin,
- session,
- GNUNET_i2s (peer),
- GST_plugins_a2s (addr));
- GST_ats_add_address (addr, session);
-
- if (0 < ats_count)
- GST_ats_update_metrics (peer, addr, session, ats, ats_count);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Notification from plugin `%s' about new session %p from peer `%s' address `%s'\n",
+ plugin,
+ session,
+ GNUNET_i2s (peer),
+ GST_plugins_a2s (addr));
+ GST_ats_add_address (addr, session, ats, ats_count);
GNUNET_free(addr);
}