[GNUnet-SVN] r23918 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2012-09-20 15:25:49 +0200 (Thu, 20 Sep 2012)
New Revision: 23918

Modified:
   gnunet/src/transport/plugin_transport_http_client.c
   gnunet/src/transport/template_cfg_peer1.conf
   gnunet/src/transport/template_cfg_peer2.conf
Log:
- bug

Modified: gnunet/src/transport/plugin_transport_http_client.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_client.c 2012-09-20 12:53:02 UTC 
(rev 23917)
+++ gnunet/src/transport/plugin_transport_http_client.c 2012-09-20 13:25:49 UTC 
(rev 23918)
@@ -1115,7 +1115,11 @@
   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 @@
   /* 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 @@
   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;

Modified: gnunet/src/transport/template_cfg_peer1.conf
===================================================================
--- gnunet/src/transport/template_cfg_peer1.conf        2012-09-20 12:53:02 UTC 
(rev 23917)
+++ gnunet/src/transport/template_cfg_peer1.conf        2012-09-20 13:25:49 UTC 
(rev 23918)
@@ -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-20 12:53:02 UTC 
(rev 23917)
+++ gnunet/src/transport/template_cfg_peer2.conf        2012-09-20 13:25:49 UTC 
(rev 23918)
@@ -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