- verboser log, faster start

[oweals/gnunet.git] / src / transport / plugin_transport_http_client.c

diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c
index 8eca998578016265453f4e4e6c7ccdde98c9fd9f..351687a07f30116aca240728a38f75275d3f7577 100644 (file)
--- a/src/transport/plugin_transport_http_client.c
+++ b/src/transport/plugin_transport_http_client.c
@@ -104,9 +104,20 @@ struct HTTP_Message
  */
 struct Session;
 
+/**
+ * A connection handle
+ * 
+ */
 struct ConnectionHandle
 {
+  /**
+   * The curl easy handle 
+   */
   CURL *easyhandle;
+  
+  /**
+   * The related session 
+   */
   struct Session *s;
 };
 
@@ -344,9 +355,17 @@ client_stop_session_timeout (struct Session *s);
 static int
 client_schedule (struct HTTP_Client_Plugin *plugin, int now);
 
+
+/**
+ * Connect a HTTP put connection 
+ *
+ * @param s the session to connect
+ * @return GNUNET_SYSERR for hard failure, GNUNET_OK for success
+ */
 static int
 client_connect_put (struct Session *s);
 
+
 /**
  * Does a session s exists?
  *
@@ -370,21 +389,24 @@ client_exist_session (struct HTTP_Client_Plugin *plugin, struct Session *s)
   return GNUNET_NO;
 }
 
+
 /**
  * Loggging function
  *
  * @param curl the curl easy handle
  * @param type message type
- * @param data data as a not \0-terminated string
+ * @param data data to log, NOT a 0-terminated string
  * @param size data length
  * @param cls the closure
  * @return always 0
  */
 static int
-client_log (CURL *curl, curl_infotype type, char *data, size_t size, void *cls)
+client_log (CURL *curl, curl_infotype type, 
+           const char *data, size_t size, void *cls)
 {
   struct ConnectionHandle *ch = cls;
-  char *ttype = "UNSPECIFIED";
+  const char *ttype = "UNSPECIFIED";
+
   if ((type == CURLINFO_TEXT) || (type == CURLINFO_HEADER_IN) || (type == CURLINFO_HEADER_OUT))
   {
     char text[size + 2];
@@ -410,7 +432,6 @@ client_log (CURL *curl, curl_infotype type, char *data, size_t size, void *cls)
         break;
     }
 
-#if VERBOSE_CURL
     memcpy (text, data, size);
     if (text[size - 1] == '\n')
       text[size] = '\0';
@@ -427,7 +448,6 @@ client_log (CURL *curl, curl_infotype type, char *data, size_t size, void *cls)
                      "Connection %p %s: %s", ch->easyhandle, ttype, text);
 #endif
   }
-#endif
   return 0;
 }
 
@@ -727,7 +747,13 @@ http_client_plugin_disconnect (void *cls, const struct GNUNET_PeerIdentity *targ
 
 }
 
-
+/**
+ * Check if a sessions exists for an specific address
+ * 
+ * @param plugin the plugin
+ * @param address the address
+ * @return the session or NULL
+ */
 static struct Session *
 client_lookup_session (struct HTTP_Client_Plugin *plugin,
                        const struct GNUNET_HELLO_Address *address)
@@ -993,7 +1019,7 @@ client_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
 /**
  * Function setting up file descriptors and scheduling task to run
  *
- * @param  plugin plugin as closure
+ * @param plugin the plugin as closure
  * @param now schedule task in 1ms, regardless of what curl may say
  * @return GNUNET_SYSERR for hard failure, GNUNET_OK for ok
  */
@@ -1152,7 +1178,11 @@ client_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
             if (GNUNET_YES == s->put_reconnect_required)
             {
                 s->put_reconnect_required = GNUNET_NO;
-                client_connect_put(s);
+                if (GNUNET_SYSERR == client_connect_put(s))
+                {
+                    GNUNET_break (s->client_put == NULL);
+                    GNUNET_break (s->put_tmp_disconnected == GNUNET_NO);
+                }
             }
         }
         if (easy_h == s->client_get)
@@ -1183,6 +1213,13 @@ client_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   client_schedule (plugin, GNUNET_NO);
 }
 
+
+/**
+ * Connect GET connection for a session
+ * 
+ * @param s the session to connect
+ * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ */
 static int
 client_connect_get (struct Session *s)
 {
@@ -1200,7 +1237,15 @@ client_connect_get (struct Session *s)
   curl_easy_setopt (s->client_get, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1);
   curl_easy_setopt (s->client_get, CURLOPT_SSL_VERIFYPEER, 0);
   curl_easy_setopt (s->client_get, CURLOPT_SSL_VERIFYHOST, 0);
+  curl_easy_setopt (s->client_get, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS);
+  curl_easy_setopt (s->client_get, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTPS);
+#else
+  curl_easy_setopt (s->client_get, CURLOPT_PROTOCOLS, CURLPROTO_HTTP);
+  curl_easy_setopt (s->client_get, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP);
 #endif
+
+  curl_easy_setopt (s->client_get, CURLOPT_URL, s->url);
+  curl_easy_setopt (s->client_get, CURLOPT_URL, s->url);
   curl_easy_setopt (s->client_get, CURLOPT_URL, s->url);
   //curl_easy_setopt (s->client_get, CURLOPT_HEADERFUNCTION, &curl_get_header_cb);
   //curl_easy_setopt (s->client_get, CURLOPT_WRITEHEADER, ps);
@@ -1218,6 +1263,8 @@ client_connect_get (struct Session *s)
 #if CURL_TCP_NODELAY
   curl_easy_setopt (ps->recv_endpoint, CURLOPT_TCP_NODELAY, 1);
 #endif
+  curl_easy_setopt (s->client_get, CURLOPT_FOLLOWLOCATION, 0);
+
   mret = curl_multi_add_handle (s->plugin->curl_multi_handle, s->client_get);
   if (mret != CURLM_OK)
   {
@@ -1235,6 +1282,12 @@ client_connect_get (struct Session *s)
   return GNUNET_OK;
 }
 
+/**
+ * Connect a HTTP put connection 
+ *
+ * @param s the session to connect
+ * @return GNUNET_SYSERR for hard failure, GNUNET_OK for ok
+ */
 static int
 client_connect_put (struct Session *s)
 {
@@ -1254,6 +1307,11 @@ client_connect_put (struct Session *s)
   curl_easy_setopt (s->client_put, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1);
   curl_easy_setopt (s->client_put, CURLOPT_SSL_VERIFYPEER, 0);
   curl_easy_setopt (s->client_put, CURLOPT_SSL_VERIFYHOST, 0);
+  curl_easy_setopt (s->client_get, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS);
+  curl_easy_setopt (s->client_get, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTPS);
+#else
+  curl_easy_setopt (s->client_get, CURLOPT_PROTOCOLS, CURLPROTO_HTTP);
+  curl_easy_setopt (s->client_get, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP);
 #endif
   curl_easy_setopt (s->client_put, CURLOPT_URL, s->url);
   curl_easy_setopt (s->client_put, CURLOPT_UPLOAD, 1L);
@@ -1283,11 +1341,20 @@ client_connect_put (struct Session *s)
     s->client_put = NULL;
     s->put.easyhandle = NULL;
     s->put.s = NULL;
+    s->put_tmp_disconnected = GNUNET_YES;
     return GNUNET_SYSERR;
   }
+  s->put_tmp_disconnected = GNUNET_NO;
   return GNUNET_OK;
 }
 
+
+/**
+ * Connect both PUT and GET connection for a session
+ * 
+ * @param s the session to connect
+ * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ */
 static int
 client_connect (struct Session *s)
 {
@@ -1398,11 +1465,12 @@ http_client_plugin_get_session (void *cls,
       {
           salen = sizeof (struct sockaddr_in);
       }
-      else if (AF_INET == sa->sa_family)
+      else if (AF_INET6 == sa->sa_family)
       {
           salen = sizeof (struct sockaddr_in6);
       }
       ats = plugin->env->get_address_type (plugin->env->cls, sa, salen);
+      //fprintf (stderr, "Address %s is in %s\n", GNUNET_a2s (sa,salen), GNUNET_ATS_print_network_type(ntohl(ats.value)));
       GNUNET_free (sa);
   }
   else if (GNUNET_NO == res)