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

[gnunet]

Author: wachs
Date: 2010-07-02 15:20:08 +0200 (Fri, 02 Jul 2010)
New Revision: 12113

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-02 13:17:27 UTC 
(rev 12112)
+++ gnunet/src/transport/plugin_transport_http.c        2010-07-02 13:20:08 UTC 
(rev 12113)
@@ -42,8 +42,7 @@
 
 
 #define DEBUG_CURL GNUNET_YES
-#define DEBUG_HTTP GNUNET_NO
-#define HTTP_CONNECT_TIMEOUT_DBG 10
+#define DEBUG_HTTP GNUNET_YES
 
 /**
  * Text of the response sent back after the last bytes of a PUT
@@ -180,6 +179,8 @@
   CURL *get_curl_handle;
 
   struct Session * session;
+
+  struct GNUNET_SERVER_MessageStreamTokenizer * msgtok;
 };
 
 struct HTTP_Connection_in
@@ -600,7 +601,7 @@
 
   char * test ="Hello World!";
   int bytes_read = -1;
-  if (i==0)
+  if (i<10)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "server_read_callback\n");
     memcpy(buf,test,strlen(test));
@@ -892,16 +893,20 @@
 }
 
 
-static size_t header_function( void *ptr, size_t size, size_t nmemb, void 
*stream)
+static size_t curl_header_function( void *ptr, size_t size, size_t nmemb, void 
*stream)
 {
   struct HTTP_Connection * con = stream;
 
   char * tmp;
   size_t len = size * nmemb;
-  int http_result;
+  long http_result = 0;
+  int res;
 
   /* Getting last http result code */
-  if (CURLE_OK == curl_easy_getinfo(con->get_curl_handle, 
CURLINFO_RESPONSE_CODE, &http_result))
+  GNUNET_assert(NULL!=con);
+  res = curl_easy_getinfo(con->get_curl_handle, CURLINFO_RESPONSE_CODE, 
&http_result);
+
+  if ((CURLE_OK == res) && (con->get_connected==GNUNET_NO))
   {
     if (http_result == 200)
     {
@@ -915,7 +920,6 @@
     }
   }
 
-
   tmp = NULL;
   if ((size * nmemb) < SIZE_MAX)
     tmp = GNUNET_malloc (len+1);
@@ -947,7 +951,7 @@
  * @param ptr source pointer, passed to the libcurl handle
  * @return bytes written to stream
  */
-static size_t send_read_callback(void *stream, size_t size, size_t nmemb, void 
*ptr)
+static size_t send_curl_read_callback(void *stream, size_t size, size_t nmemb, 
void *ptr)
 {
   struct HTTP_Connection * con = ptr;
   struct HTTP_Message * msg = con->pending_msgs_tail;
@@ -1061,15 +1065,15 @@
 #endif
       curl_easy_setopt(con->get_curl_handle, CURLOPT_URL, con->url);
       //curl_easy_setopt(con->put_curl_handle, CURLOPT_PUT, 1L);
-      curl_easy_setopt(con->get_curl_handle, CURLOPT_HEADERFUNCTION, 
&header_function);
-      curl_easy_setopt(con->get_curl_handle, CURLOPT_WRITEHEADER, 
con->get_curl_handle);
-      curl_easy_setopt(con->get_curl_handle, CURLOPT_READFUNCTION, 
send_read_callback);
+      curl_easy_setopt(con->get_curl_handle, CURLOPT_HEADERFUNCTION, 
&curl_header_function);
+      curl_easy_setopt(con->get_curl_handle, CURLOPT_WRITEHEADER, con);
+      curl_easy_setopt(con->get_curl_handle, CURLOPT_READFUNCTION, 
send_curl_read_callback);
       curl_easy_setopt(con->get_curl_handle, CURLOPT_READDATA, con);
       curl_easy_setopt(con->get_curl_handle, CURLOPT_WRITEFUNCTION, 
send_curl_write_callback);
       curl_easy_setopt(con->get_curl_handle, CURLOPT_WRITEDATA, con);
       curl_easy_setopt(con->get_curl_handle, CURLOPT_TIMEOUT, (long) 
timeout.value);
       curl_easy_setopt(con->get_curl_handle, CURLOPT_PRIVATE, con);
-      curl_easy_setopt(con->get_curl_handle, CURLOPT_CONNECTTIMEOUT, 
HTTP_CONNECT_TIMEOUT_DBG);
+      curl_easy_setopt(con->get_curl_handle, CURLOPT_CONNECTTIMEOUT, 
HTTP_CONNECT_TIMEOUT);
       curl_easy_setopt(con->get_curl_handle, CURLOPT_BUFFERSIZE, 
GNUNET_SERVER_MAX_MESSAGE_SIZE);
 
       mret = curl_multi_add_handle(plugin->multi_handle, con->get_curl_handle);
@@ -1116,13 +1120,13 @@
 #endif
   curl_easy_setopt(con->put_curl_handle, CURLOPT_URL, con->url);
   curl_easy_setopt(con->put_curl_handle, CURLOPT_PUT, 1L);
-  curl_easy_setopt(con->put_curl_handle, CURLOPT_READFUNCTION, 
send_read_callback);
+  curl_easy_setopt(con->put_curl_handle, CURLOPT_READFUNCTION, 
send_curl_read_callback);
   curl_easy_setopt(con->put_curl_handle, CURLOPT_READDATA, con);
   curl_easy_setopt(con->put_curl_handle, CURLOPT_WRITEFUNCTION, 
send_curl_write_callback);
   curl_easy_setopt(con->put_curl_handle, CURLOPT_READDATA, con);
   curl_easy_setopt(con->put_curl_handle, CURLOPT_TIMEOUT, (long) 
timeout.value);
   curl_easy_setopt(con->put_curl_handle, CURLOPT_PRIVATE, con);
-  curl_easy_setopt(con->put_curl_handle, CURLOPT_CONNECTTIMEOUT, 
HTTP_CONNECT_TIMEOUT_DBG);
+  curl_easy_setopt(con->put_curl_handle, CURLOPT_CONNECTTIMEOUT, 
HTTP_CONNECT_TIMEOUT);
   curl_easy_setopt(con->put_curl_handle, CURLOPT_BUFFERSIZE, 
GNUNET_SERVER_MAX_MESSAGE_SIZE);
 
   mret = curl_multi_add_handle(plugin->multi_handle, con->put_curl_handle);