- fix

[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 a11d137360346b1988a35a654c419591eb2a80ce..0629417514beb5a45c1e4e0d0e1a4d62f87c70e3 100644 (file)
--- a/src/transport/plugin_transport_http_client.c
+++ b/src/transport/plugin_transport_http_client.c
@@ -747,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)
@@ -913,9 +919,15 @@ client_receive_mst_cb (void *cls, void *client,
   GNUNET_break (s->ats_address_network_type != ntohl (GNUNET_ATS_NET_UNSPECIFIED));
 
   delay = s->plugin->env->receive (plugin->env->cls, &s->target, message,
-                                   (const struct GNUNET_ATS_Information *) &atsi, 2,
                                    s, s->addr, s->addrlen);
 
+  plugin->env->update_address_metrics (plugin->env->cls,
+               &s->target,
+               s->addr,
+               s->addrlen,
+      s,
+      (struct GNUNET_ATS_Information *) &atsi, 2);
+
   GNUNET_asprintf (&stat_txt, "# bytes received via %s_client", plugin->protocol);
   GNUNET_STATISTICS_update (plugin->env->stats,
                             stat_txt, ntohs(message->size), GNUNET_NO);
@@ -1172,7 +1184,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)
@@ -1203,6 +1219,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)
 {
@@ -1220,7 +1243,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);
@@ -1238,6 +1269,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)
   {
@@ -1280,6 +1313,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);
@@ -1309,11 +1347,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)
 {
@@ -1424,11 +1471,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)