[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12238 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r12238 - gnunet/src/transport |
Date: |
Fri, 16 Jul 2010 09:57:37 +0200 |
Author: wachs
Date: 2010-07-16 09:57:37 +0200 (Fri, 16 Jul 2010)
New Revision: 12238
Modified:
gnunet/src/transport/plugin_transport_http.c
gnunet/src/transport/test_plugin_transport_data_http.conf
gnunet/src/transport/test_plugin_transport_http.c
Log:
Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c 2010-07-15 16:27:48 UTC
(rev 12237)
+++ gnunet/src/transport/plugin_transport_http.c 2010-07-16 07:57:37 UTC
(rev 12238)
@@ -40,11 +40,11 @@
#include "microhttpd.h"
#include <curl/curl.h>
-
+#define VERBOSE GNUNET_NO
#define DEBUG_CURL GNUNET_NO
#define DEBUG_HTTP GNUNET_NO
#define DEBUG_CONNECTIONS GNUNET_NO
-#define DEBUG_SESSION_SELECTION GNUNET_YES
+#define DEBUG_SESSION_SELECTION GNUNET_NO
#define INBOUND GNUNET_NO
#define OUTBOUND GNUNET_YES
@@ -448,7 +448,9 @@
struct HTTP_Message * msg;
struct Plugin * plugin = ps->peercontext->plugin;
+#if DEBUG_CONNECTIONS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: removing %s session %X
with id %u\n", ps, (ps->direction == INBOUND) ? "inbound" : "outbound", ps,
ps->session_id);
+#endif
plugin->env->session_end(plugin, &pc->identity, ps);
GNUNET_free_non_null (ps->addr);
@@ -1637,7 +1639,7 @@
return GNUNET_SYSERR;
}
-static struct Session * send_get_session (void * cls, struct HTTP_PeerContext
*pc, const void * addr, size_t addrlen, int force_address, struct Session *
session)
+static struct Session * send_select_session (void * cls, struct
HTTP_PeerContext *pc, const void * addr, size_t addrlen, int force_address,
struct Session * session)
{
struct Session * tmp = NULL;
int addr_given = GNUNET_NO;
@@ -1655,7 +1657,7 @@
/* connection can not be used, since it is disconnected
*/
if ((session->recv_force_disconnect==GNUNET_NO) &&
(session->send_force_disconnect==GNUNET_NO))
{
-#ifdef DEBUG_SESSION_SELECTION
+#if DEBUG_SESSION_SELECTION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session
%X selected: Using session passed by transport to send to forced address \n",
session);
#endif
return session;
@@ -1670,7 +1672,7 @@
/* connection can not be used, since it is disconnected
*/
if
((pc->last_session->recv_force_disconnect==GNUNET_NO) &&
(pc->last_session->send_force_disconnect==GNUNET_NO))
{
-#ifdef DEBUG_SESSION_SELECTION
+#if DEBUG_SESSION_SELECTION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session
%X selected: Using last session used to send to forced address \n",
pc->last_session);
#endif
return pc->last_session;
@@ -1687,7 +1689,7 @@
/* connection can not be used, since it is disconnected
*/
if ((tmp->recv_force_disconnect==GNUNET_NO) &&
(tmp->send_force_disconnect==GNUNET_NO))
{
-#ifdef DEBUG_SESSION_SELECTION
+#if DEBUG_SESSION_SELECTION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session
%X selected: Using existing session to send to forced address \n", session);
#endif
return session;
@@ -1707,7 +1709,7 @@
/* connection can not be used, since it is disconnected
*/
if ((session->recv_force_disconnect==GNUNET_NO) &&
(session->send_force_disconnect==GNUNET_NO))
{
-#ifdef DEBUG_SESSION_SELECTION
+#if DEBUG_SESSION_SELECTION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session
%X selected: Using session passed by transport to send not-forced address \n",
session);
#endif
return session;
@@ -1720,7 +1722,7 @@
/* connection can not be used, since it is disconnected
*/
if
((pc->last_session->recv_force_disconnect==GNUNET_NO) &&
(pc->last_session->send_force_disconnect==GNUNET_NO))
{
-#ifdef DEBUG_SESSION_SELECTION
+#if DEBUG_SESSION_SELECTION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session
%X selected: Using last session to send to not-forced address \n",
pc->last_session);
#endif
return pc->last_session;
@@ -1733,7 +1735,7 @@
/* connection can not be used, since it is disconnected
*/
if ((tmp->recv_force_disconnect==GNUNET_NO) &&
(tmp->send_force_disconnect==GNUNET_NO))
{
-#ifdef DEBUG_SESSION_SELECTION
+#if DEBUG_SESSION_SELECTION
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session
%X selected: Using existing session to send to not-forced address \n", tmp);
#endif
return tmp;
@@ -1831,7 +1833,7 @@
GNUNET_CONTAINER_multihashmap_put(plugin->peers, &pc->identity.hashPubKey,
pc, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
}
- ps = send_get_session (plugin, pc, addr, addrlen, force_address, session);
+ ps = send_select_session (plugin, pc, addr, addrlen, force_address, session);
/* session not existing, but address forced -> creating new session */
if (ps==NULL)
Modified: gnunet/src/transport/test_plugin_transport_data_http.conf
===================================================================
--- gnunet/src/transport/test_plugin_transport_data_http.conf 2010-07-15
16:27:48 UTC (rev 12237)
+++ gnunet/src/transport/test_plugin_transport_data_http.conf 2010-07-16
07:57:37 UTC (rev 12238)
@@ -7,9 +7,12 @@
[transport-http]
PORT = 12389
-DEBUG = YES
+DEBUG = NO
BINDTO = 127.0.0.1
+[transport]
+PREFIX = valgrind --leak-check=full
+DEBUG = NO
[statistics]
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/transport/test_plugin_transport_http.c
===================================================================
--- gnunet/src/transport/test_plugin_transport_http.c 2010-07-15 16:27:48 UTC
(rev 12237)
+++ gnunet/src/transport/test_plugin_transport_http.c 2010-07-16 07:57:37 UTC
(rev 12238)
@@ -888,7 +888,7 @@
const struct GNUNET_PeerIdentity *peer,
struct Session *session)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Session ended: `%s' %X\n",
GNUNET_i2s(peer), session);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Pluging tells me: session %X to
peer `%s' ended\n", session, GNUNET_i2s(peer));
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r12238 - gnunet/src/transport,
gnunet <=