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 7dbbe7b9fbb0b88921d735ec08b783b3dd07a800..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,7 +454,7 @@ http_client_plugin_send (void *cls,
     return GNUNET_SYSERR;
   }
 
-  GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name,
+  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));
@@ -468,7 +473,10 @@ http_client_plugin_send (void *cls,
   if (GNUNET_YES == s->put_tmp_disconnecting)
   {
     /* PUT connection is currently getting disconnected */
-    GNUNET_break (0);
+    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;
   }
   else if (GNUNET_YES == s->put_paused)
@@ -477,7 +485,7 @@ http_client_plugin_send (void *cls,
     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;
@@ -486,7 +494,7 @@ http_client_plugin_send (void *cls,
   else if (GNUNET_YES == s->put_tmp_disconnected)
   {
     /* PUT connection was disconnected, reconnect */
-    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name,
+    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
                      "Session %p: Reconnecting PUT connection\n",
                      s);
     s->put_tmp_disconnected = GNUNET_NO;
@@ -738,7 +746,7 @@ 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);
       return 0;
@@ -1005,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);
@@ -1056,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,
@@ -1064,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)
@@ -1076,6 +1084,17 @@ client_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
             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)
         {
@@ -1156,7 +1175,7 @@ client_connect_put (struct Session *s)
 {
   CURLMcode mret;
   /* create put connection */
-  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 ();
 #if VERBOSE_CURL