changing type

[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 71772a185a95acd31c1126b3eac8a0306d754d4d..212fb1b59ff2dcac0cc396364ff035963460b80d 100644 (file)
--- a/src/transport/plugin_transport_http_client.c
+++ b/src/transport/plugin_transport_http_client.c
@@ -169,6 +169,11 @@ struct Session
    */
   int put_tmp_disconnected;
 
+  /**
+   * We received data to send while disconnecting, reconnect immediately
+   */
+  int put_reconnect_required;
+
   /**
    * Client receive handle
    */
@@ -410,7 +415,7 @@ client_log (CURL * curl, curl_infotype type, char *data, size_t size, void *cls)
  * a fresh connection to another peer.
  *
  * @param cls closure
- * @param session which session must be used
+ * @param s which session must be used
  * @param msgbuf the message to transmit
  * @param msgbuf_size number of bytes in 'msgbuf'
  * @param priority how important is the message (most plugins will
@@ -449,8 +454,8 @@ http_client_plugin_send (void *cls,
     return GNUNET_SYSERR;
   }
 
-  GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name,
-                   "Session %p/connection %p: Sending message with %u to peer `%s' with \n",
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
+                   "Session %p/connection %p: Sending message with %u to peer `%s' \n",
                    s, s->client_put,
                    msgbuf_size, GNUNET_i2s (&s->target));
 
@@ -465,29 +470,41 @@ http_client_plugin_send (void *cls,
   memcpy (msg->buf, msgbuf, msgbuf_size);
   GNUNET_CONTAINER_DLL_insert_tail (s->msg_head, s->msg_tail, msg);
 
-  if (GNUNET_YES == s->put_tmp_disconnected)
+  if (GNUNET_YES == s->put_tmp_disconnecting)
   {
-      GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name,
-                       "Session %p: Reconnecting PUT connection\n",
-                       s);
-      s->put_tmp_disconnected = GNUNET_NO;
-      if (GNUNET_SYSERR == client_connect_put (s))
-      {
-        return GNUNET_SYSERR;
-      }
+    /* PUT connection is currently getting disconnected */
+    s->put_reconnect_required = GNUNET_YES;
+    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
+                     "Session %p/connection %jp: currently disconnecting, reconnecting immediately\n",
+                     s, s->client_put);
+    return msgbuf_size;
   }
-
-  if (GNUNET_YES == s->put_paused)
+  else if (GNUNET_YES == s->put_paused)
   {
+    /* PUT connection was paused, unpause */
     GNUNET_assert (s->put_disconnect_task != GNUNET_SCHEDULER_NO_TASK);
     GNUNET_SCHEDULER_cancel (s->put_disconnect_task);
     s->put_disconnect_task = GNUNET_SCHEDULER_NO_TASK;
-    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name,
+    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
                      "Session %p/connection %p: unpausing connection\n",
                      s, s->client_put);
     s->put_paused = GNUNET_NO;
     curl_easy_pause (s->client_put, CURLPAUSE_CONT);
   }
+  else if (GNUNET_YES == s->put_tmp_disconnected)
+  {
+    /* PUT connection was disconnected, reconnect */
+    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
+                     "Session %p: Reconnecting PUT connection\n",
+                     s);
+    s->put_tmp_disconnected = GNUNET_NO;
+    GNUNET_break (s->client_put == NULL);
+    if (GNUNET_SYSERR == client_connect_put (s))
+    {
+      return GNUNET_SYSERR;
+    }
+  }
+
   client_schedule (s->plugin, GNUNET_YES);
   client_reschedule_session_timeout (s);
   return msgbuf_size;
@@ -729,11 +746,9 @@ client_send_cb (void *stream, size_t size, size_t nmemb, void *cls)
   if (GNUNET_YES == s->put_tmp_disconnecting)
   {
 
-      GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name,
+      GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
                        "Session %p/connection %p: disconnect due to inactivity\n",
                        s, s->client_put);
-      s->put_tmp_disconnecting = GNUNET_NO;
-      s->put_tmp_disconnected = GNUNET_YES;
       return 0;
   }
 
@@ -998,7 +1013,7 @@ client_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct HTTP_Client_Plugin *plugin = cls;
   int running;
-  int http_statuscode;
+  long http_statuscode;
   CURLMcode mret;
 
   GNUNET_assert (cls != NULL);
@@ -1049,7 +1064,7 @@ client_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
         {
             if  ((0 != msg->data.result) || (http_statuscode != 200))
             {
-                GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
+                GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
                   "Session %p/connection %p: PUT connection to `%s' ended with status %i reason %i: `%s'\n",
                   s, msg->easy_handle, GNUNET_i2s (&s->target),
                   http_statuscode,
@@ -1057,7 +1072,7 @@ client_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                   curl_easy_strerror (msg->data.result));
             }
             else
-              GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
+              GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
                 "Session %p/connection %p: PUT connection to `%s' ended normal\n",
                 s, msg->easy_handle, GNUNET_i2s (&s->target));
             if (s->client_get == NULL)
@@ -1066,7 +1081,20 @@ client_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
             }
             curl_multi_remove_handle (plugin->curl_multi_handle, easy_h);
             curl_easy_cleanup (easy_h);
+            s->put_tmp_disconnecting = GNUNET_NO;
+            s->put_tmp_disconnected = GNUNET_YES;
             s->client_put = NULL;
+
+            /*
+             * Handling a rare case:
+             * plugin_send was called during temporary put disconnect,
+             * reconnect required after connection was disconnected
+             */
+            if (GNUNET_YES == s->put_reconnect_required)
+            {
+                s->put_reconnect_required = GNUNET_NO;
+                client_connect_put(s);
+            }
         }
         if (easy_h == s->client_get)
         {
@@ -1147,17 +1175,9 @@ client_connect_put (struct Session *s)
 {
   CURLMcode mret;
   /* create put connection */
-  if (NULL == s->client_put)
-  {
-      GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name,
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, 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);
-  }
+  s->client_put = curl_easy_init ();
 #if VERBOSE_CURL
   curl_easy_setopt (s->client_put, CURLOPT_VERBOSE, 1L);
   curl_easy_setopt (s->client_put, CURLOPT_DEBUGFUNCTION, &client_log);