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

[gnunet]

Author: wachs
Date: 2010-07-06 14:04:41 +0200 (Tue, 06 Jul 2010)
New Revision: 12170

Modified:
   gnunet/src/transport/plugin_transport_http.c
Log:


Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c        2010-07-06 10:15:37 UTC 
(rev 12169)
+++ gnunet/src/transport/plugin_transport_http.c        2010-07-06 12:04:41 UTC 
(rev 12170)
@@ -40,7 +40,7 @@
 #include <curl/curl.h>
 
 
-#define DEBUG_CURL GNUNET_YES
+#define DEBUG_CURL GNUNET_NO
 #define DEBUG_HTTP GNUNET_NO
 
 #define INBOUND GNUNET_NO
@@ -410,8 +410,7 @@
 
   pc->plugin->env->receive (ps->peercontext->plugin->env->cls,
                            &pc->identity,
-                           message, 1, NULL,
-                           //message, 1, ps,
+                           message, 1, ps,
                            ps->addr,
                            ps->addrlen);
 }
@@ -433,8 +432,7 @@
 
   pc->plugin->env->receive (pc->plugin->env->cls,
                             &pc->identity,
-                            message, 1, NULL,
-                            //message, 1, ps,
+                            message, 1, ps,
                             ps->addr,
                             ps->addrlen);
 }
@@ -591,7 +589,6 @@
     ps = get_Session(plugin, pc, addr, addr_len);
     if (ps==NULL)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"RECV: CREATING NEW SESSION 
%s\n",http_plugin_address_to_string(NULL, addr, addr_len));
       ps = GNUNET_malloc(sizeof (struct Session));
       ps->addr = GNUNET_malloc(addr_len);
       memcpy(ps->addr,addr,addr_len);
@@ -607,10 +604,6 @@
       ps->url = create_url (plugin, ps->addr, ps->addrlen);
       GNUNET_CONTAINER_DLL_insert(pc->head,pc->tail,ps);
     }
-    else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"RECV: SESSION CONTEXT FOUND\n");
-    }
 
     *httpSessionCache = ps;
     if (ps->msgtok==NULL)
@@ -657,11 +650,6 @@
     response = MHD_create_response_from_callback(-1,32 * 1024, 
&server_read_callback, ps, NULL);
     res = MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
     MHD_destroy_response (response);
-
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"HTTP Daemon has new an incoming `%s' 
request from peer `%s' (`%s')\n",
-                method,
-                GNUNET_i2s(&pc->identity),
-                http_plugin_address_to_string(NULL, ps->addr, ps->addrlen));
     return res;
   }
   return MHD_NO;
@@ -811,7 +799,6 @@
   size_t len = size * nmemb;
   long http_result = 0;
   int res;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: GET HEADER FUNC\n",ps);
   /* Getting last http result code */
   if (ps->recv_connected==GNUNET_NO)
   {
@@ -1531,6 +1518,7 @@
     ps->send_active = GNUNET_NO;
     ps=ps->next;
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"All connections to peer `%s' 
terminated\n", GNUNET_i2s(target));
 }