[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r23685 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r23685 - gnunet/src/transport |
Date: |
Fri, 7 Sep 2012 09:28:59 +0200 |
Author: wachs
Date: 2012-09-07 09:28:59 +0200 (Fri, 07 Sep 2012)
New Revision: 23685
Modified:
gnunet/src/transport/Makefile.am
gnunet/src/transport/plugin_transport_http_server.c
gnunet/src/transport/template_cfg_peer1.conf
gnunet/src/transport/template_cfg_peer2.conf
gnunet/src/transport/test_transport_api_http_reverse_peer1.conf
Log:
- change
Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am 2012-09-07 07:14:16 UTC (rev 23684)
+++ gnunet/src/transport/Makefile.am 2012-09-07 07:28:59 UTC (rev 23685)
@@ -168,6 +168,9 @@
$(top_builddir)/src/util/libgnunetutil.la \
$(GN_GLPK) \
$(GN_LIBINTL)
+gnunet_service_transport_CFLAGS = \
+ $(CFLAGS)
+# -DANALYZE
plugin_LTLIBRARIES = \
libgnunet_plugin_transport_tcp.la \
Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2012-09-07 07:14:16 UTC
(rev 23684)
+++ gnunet/src/transport/plugin_transport_http_server.c 2012-09-07 07:28:59 UTC
(rev 23685)
@@ -646,9 +646,6 @@
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 @@
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 @@
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);
}
Modified: gnunet/src/transport/template_cfg_peer1.conf
===================================================================
--- gnunet/src/transport/template_cfg_peer1.conf 2012-09-07 07:14:16 UTC
(rev 23684)
+++ gnunet/src/transport/template_cfg_peer1.conf 2012-09-07 07:28:59 UTC
(rev 23685)
@@ -38,7 +38,7 @@
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
Modified: gnunet/src/transport/template_cfg_peer2.conf
===================================================================
--- gnunet/src/transport/template_cfg_peer2.conf 2012-09-07 07:14:16 UTC
(rev 23684)
+++ gnunet/src/transport/template_cfg_peer2.conf 2012-09-07 07:28:59 UTC
(rev 23685)
@@ -39,7 +39,7 @@
TRUST = $SERVICEHOME/data/credit/
[transport]
-#PREFIX = valgrind --leak-check=full
+PREFIX = valgrind --leak-check=full
PORT = 12010
UNIXPATH = /tmp/gnunet-p2-service-transport.sock
Modified: gnunet/src/transport/test_transport_api_http_reverse_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_reverse_peer1.conf
2012-09-07 07:14:16 UTC (rev 23684)
+++ gnunet/src/transport/test_transport_api_http_reverse_peer1.conf
2012-09-07 07:28:59 UTC (rev 23685)
@@ -7,28 +7,28 @@
[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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r23685 - gnunet/src/transport,
gnunet <=