[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r31359 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r31359 - gnunet/src/transport |
Date: |
Fri, 13 Dec 2013 14:25:31 +0100 |
Author: grothoff
Date: 2013-12-13 14:25:31 +0100 (Fri, 13 Dec 2013)
New Revision: 31359
Modified:
gnunet/src/transport/gnunet-service-transport.c
gnunet/src/transport/gnunet-service-transport_neighbours.c
gnunet/src/transport/plugin_transport_tcp.c
Log:
-fix 3208 by making kills async
Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c 2013-12-13 13:09:21 UTC
(rev 31358)
+++ gnunet/src/transport/gnunet-service-transport.c 2013-12-13 13:25:31 UTC
(rev 31359)
@@ -40,6 +40,39 @@
#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 */
/**
@@ -78,16 +111,26 @@
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;
+
/**
* Transmit our HELLO message to the given (connected) neighbour.
*
@@ -177,6 +220,26 @@
/**
+ * 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.
*
@@ -188,15 +251,24 @@
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);
}
@@ -383,10 +455,13 @@
{
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",
@@ -400,6 +475,15 @@
/* 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);
+ }
+ }
}
Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c 2013-12-13
13:09:21 UTC (rev 31358)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c 2013-12-13
13:25:31 UTC (rev 31359)
@@ -877,7 +877,8 @@
* #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;
@@ -3090,7 +3091,10 @@
("# SESSION_ACK messages received"),
1, GNUNET_NO);
if (NULL == (n = lookup_neighbour (peer)))
+ {
+ 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) &&
@@ -3105,7 +3109,7 @@
GNUNET_STATISTICS_update (GST_stats,
gettext_noop ("# unexpected SESSION_ACK
messages"), 1,
GNUNET_NO);
- return GNUNET_SYSERR;
+ return GNUNET_OK;
}
n->state = S_CONNECTED;
n->timeout = GNUNET_TIME_relative_to_absolute
(GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2013-12-13 13:09:21 UTC (rev
31358)
+++ gnunet/src/transport/plugin_transport_tcp.c 2013-12-13 13:25:31 UTC (rev
31359)
@@ -2297,13 +2297,11 @@
(GNUNET_YES == session->inbound) ? NULL :
session->addr,
(GNUNET_YES == session->inbound) ? 0 :
session->addrlen);
plugin->env->update_address_metrics (plugin->env->cls,
- &session->target,
- (GNUNET_YES == session->inbound) ? NULL : session->addr,
- (GNUNET_YES == session->inbound) ? 0 : session->addrlen,
- session, &distance, 1);
-
+ &session->target,
+ (GNUNET_YES == session->inbound) ? NULL
: session->addr,
+ (GNUNET_YES == session->inbound) ? 0 :
session->addrlen,
+ session, &distance, 1);
reschedule_session_timeout (session);
-
if (0 == delay.rel_value_us)
{
GNUNET_SERVER_receive_done (client, GNUNET_OK);
@@ -2316,7 +2314,7 @@
GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES));
GNUNET_SERVER_disable_receive_done_warning (client);
session->receive_delay_task =
- GNUNET_SCHEDULER_add_delayed (delay, &delayed_done, session);
+ GNUNET_SCHEDULER_add_delayed (delay, &delayed_done, session);
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r31359 - gnunet/src/transport,
gnunet <=