5 files changed, 28 insertions, 18 deletions

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index dc21e8ea0..a590f8077 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -168,6 +168,9 @@ gnunet_service_transport_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_GLPK) \
   $(GN_LIBINTL)
+gnunet_service_transport_CFLAGS = \
+  $(CFLAGS)
+# -DANALYZE
 
 plugin_LTLIBRARIES = \
   libgnunet_plugin_transport_tcp.la \
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c
index 5e77f71a7..4b36cfff6 100644
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -646,9 +646,6 @@ server_delete_session (struct Session *s)
   struct HTTP_Server_Plugin *plugin = s->plugin;
   server_stop_session_timeout(s);
 
-  if ((GNUNET_YES == s->session_passed) && (GNUNET_NO == s->session_ended))
-    plugin->env->session_end (plugin->env->cls, &s->target, s);
-
   GNUNET_CONTAINER_DLL_remove (plugin->head, plugin->tail, s);
   struct HTTP_Message *msg = s->msg_head;
   struct HTTP_Message *tmp = NULL;
@@ -1439,21 +1436,23 @@ server_disconnect_cb (void *cls, struct MHD_Connection *connection,
   GNUNET_free (sc);
   plugin->cur_connections--;
 
+  if (((s->server_send == NULL) || (s->server_recv == NULL)) &&
+      ((GNUNET_YES == s->session_passed) && (GNUNET_NO == s->session_ended)))
+  {
+    /* Notify transport immediately that this session is invalid */
+    s->session_ended = GNUNET_YES;
+    plugin->env->session_end (plugin->env->cls, &s->target, s);
+  }
+
   if ((s->server_send == NULL) && (s->server_recv == NULL))
   {
     GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
                      "Peer `%s' on address `%s' disconnected\n",
                      GNUNET_i2s (&s->target),
                      http_common_plugin_address_to_string (NULL, s->addr, s->addrlen));
-
     server_delete_session (s);
   }
-  else if ((GNUNET_YES == s->session_passed) && (GNUNET_NO == s->session_ended))
-  {
-    /* Notify transport immediately that this session is invalid */
-    s->session_ended = GNUNET_YES;
-    plugin->env->session_end (plugin->env->cls, &s->target, s);
-  }
+
 }
 
 
@@ -2746,6 +2745,14 @@ LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls)
       next = pos->next;
       GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
                        "Removing left over session %p\n", pos);
+
+      if ((GNUNET_YES == pos->session_passed) && (GNUNET_NO == pos->session_ended))
+      {
+        /* Notify transport immediately that this session is invalid */
+          pos->session_ended = GNUNET_YES;
+        plugin->env->session_end (plugin->env->cls, &pos->target, pos);
+      }
+
       server_delete_session (pos);
   }
 
diff --git a/src/transport/template_cfg_peer1.conf b/src/transport/template_cfg_peer1.conf
index ab0c5b391..0fbc8e8db 100644
--- a/src/transport/template_cfg_peer1.conf
+++ b/src/transport/template_cfg_peer1.conf
@@ -38,7 +38,7 @@ PORT = 12002
 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 
 [transport]
-#PREFIX = valgrind --leak-check=full
+PREFIX = valgrind --leak-check=full
 PORT = 12001
 #DEBUG = YES
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock
diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf
index a10dfc488..76f5196d5 100644
--- a/src/transport/template_cfg_peer2.conf
+++ b/src/transport/template_cfg_peer2.conf
@@ -39,7 +39,7 @@ UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 TRUST = $SERVICEHOME/data/credit/
 
 [transport]
-#PREFIX = valgrind --leak-check=full
+PREFIX = valgrind --leak-check=full
 PORT = 12010
 UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 
diff --git a/src/transport/test_transport_api_http_reverse_peer1.conf b/src/transport/test_transport_api_http_reverse_peer1.conf
index 3d4648938..3093a2482 100644
--- a/src/transport/test_transport_api_http_reverse_peer1.conf
+++ b/src/transport/test_transport_api_http_reverse_peer1.conf
@@ -7,28 +7,28 @@ DEFAULTCONFIG = test_transport_api_http_reverse_peer1.conf
 [transport-http_client]
 
 [arm]
-PORT = 12085
+PORT = 12095
 DEFAULTSERVICES = transport
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
 
 [statistics]
-PORT = 12084
+PORT = 12094
 UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
 
 [resolver]
-PORT = 12083
+PORT = 12093
 UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
 [peerinfo]
-PORT = 12082
+PORT = 12092
 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
 
 [transport]
 #DEBUG = YES
-PORT = 12081
+PORT = 12091
 PLUGINS = http_client
 #BINARY = .libs/gnunet-service-transport
 UNIXPATH = /tmp/gnunet-p1-service-transport.sock
-#PREFIX = valgrind --leak-check=full
+PREFIX = valgrind --leak-check=full
 #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args