From c66ce235370520e7a1c2c948cb7de99f65b267c4 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Thu, 20 Sep 2012 13:25:49 +0000 Subject: - bug --- src/transport/plugin_transport_http_client.c | 16 +++++++++++++--- src/transport/template_cfg_peer1.conf | 2 +- src/transport/template_cfg_peer2.conf | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c index bf24d97d6..3c422cf3e 100644 --- a/src/transport/plugin_transport_http_client.c +++ b/src/transport/plugin_transport_http_client.c @@ -1115,7 +1115,11 @@ client_connect_get (struct Session *s) mret = curl_multi_add_handle (s->plugin->curl_multi_handle, s->client_get); if (mret != CURLM_OK) { + GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name, + "Session %p : Failed to add GET handle to multihandle: `%s'\n", + s, curl_multi_strerror (mret)); curl_easy_cleanup (s->client_get); + s->client_get = NULL; GNUNET_break (0); return GNUNET_SYSERR; } @@ -1130,8 +1134,15 @@ client_connect_put (struct Session *s) /* create put connection */ if (NULL == s->client_put) { + GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name, + "Session %p : Init PUT handle \n", s); s->client_put = curl_easy_init (); } + else + { + GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name, + "Session %p : Reusing PUT handle %p \n", s, s->client_put); + } #if VERBOSE_CURL curl_easy_setopt (s->client_put, CURLOPT_VERBOSE, 1L); curl_easy_setopt (s->client_put, CURLOPT_DEBUGFUNCTION, &client_log); @@ -1164,9 +1175,8 @@ client_connect_put (struct Session *s) if (mret != CURLM_OK) { GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name, - "Failed to add curl handle to multihandle: `%s'\n", - curl_multi_strerror (mret)); - + "Session %p : Failed to add PUT handle to multihandle: `%s'\n", + s, curl_multi_strerror (mret)); curl_easy_cleanup (s->client_put); s->client_put = NULL; return GNUNET_SYSERR; 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 -- cgit v1.2.3