-some fixes for monkey

[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 9f4ac94a8cea1bb9629918d7fb70d6a79200af16..536e7382b6ae79398ee11ccf3f9620ea7dd26f81 100644 (file)
--- a/src/transport/plugin_transport_http_client.c
+++ b/src/transport/plugin_transport_http_client.c
@@ -415,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
@@ -443,6 +443,7 @@ http_client_plugin_send (void *cls,
 {
   struct HTTP_Client_Plugin *plugin = cls;
   struct HTTP_Message *msg;
+  char *stat_txt;
 
   GNUNET_assert (plugin != NULL);
   GNUNET_assert (s != NULL);
@@ -454,7 +455,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));
@@ -470,11 +471,19 @@ http_client_plugin_send (void *cls,
   memcpy (msg->buf, msgbuf, msgbuf_size);
   GNUNET_CONTAINER_DLL_insert_tail (s->msg_head, s->msg_tail, msg);
 
+  GNUNET_asprintf (&stat_txt, "# bytes currently in %s_client buffers", plugin->protocol);
+  GNUNET_STATISTICS_update (plugin->env->stats,
+                            stat_txt, msgbuf_size, GNUNET_NO);
+
+  GNUNET_free (stat_txt);
+
   if (GNUNET_YES == s->put_tmp_disconnecting)
   {
     /* PUT connection is currently getting disconnected */
     s->put_reconnect_required = GNUNET_YES;
-    GNUNET_break (0);
+    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)
@@ -483,7 +492,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;
@@ -492,7 +501,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;
@@ -735,6 +744,7 @@ client_send_cb (void *stream, size_t size, size_t nmemb, void *cls)
   struct HTTP_Client_Plugin *plugin = s->plugin;
   struct HTTP_Message *msg = s->msg_head;
   size_t len;
+  char *stat_txt;
 
   if (GNUNET_YES != client_exist_session (plugin, s))
   {
@@ -744,7 +754,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;
@@ -777,6 +787,17 @@ client_send_cb (void *stream, size_t size, size_t nmemb, void *cls)
       msg->transmit_cont (msg->transmit_cont_cls, &s->target, GNUNET_OK);
     GNUNET_free (msg);
   }
+
+  GNUNET_asprintf (&stat_txt, "# bytes currently in %s_client buffers", plugin->protocol);
+  GNUNET_STATISTICS_update (plugin->env->stats,
+                            stat_txt, -len, GNUNET_NO);
+  GNUNET_free (stat_txt);
+
+  GNUNET_asprintf (&stat_txt, "# bytes transmitted via %s_client", plugin->protocol);
+  GNUNET_STATISTICS_update (plugin->env->stats,
+                            stat_txt, len, GNUNET_NO);
+  GNUNET_free (stat_txt);
+
   client_reschedule_session_timeout (s);
   return len;
 }
@@ -824,6 +845,7 @@ client_receive_mst_cb (void *cls, void *client,
   struct HTTP_Client_Plugin *plugin;
   struct GNUNET_TIME_Relative delay;
   struct GNUNET_ATS_Information atsi[2];
+  char *stat_txt;
   if (GNUNET_YES != client_exist_session(p, s))
   {
     GNUNET_break (0);
@@ -841,6 +863,11 @@ client_receive_mst_cb (void *cls, void *client,
                                    (const struct GNUNET_ATS_Information *) &atsi, 2,
                                    s, s->addr, s->addrlen);
 
+  GNUNET_asprintf (&stat_txt, "# bytes received via %s_client", plugin->protocol);
+  GNUNET_STATISTICS_update (plugin->env->stats,
+                            stat_txt, ntohs(message->size), GNUNET_NO);
+  GNUNET_free (stat_txt);
+
   s->next_receive =
       GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (), delay);
 
@@ -1011,7 +1038,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);
@@ -1062,7 +1089,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,
@@ -1070,7 +1097,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)
@@ -1173,7 +1200,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