[GNUnet-SVN] r11199 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2010-05-05 15:43:52 +0200 (Wed, 05 May 2010)
New Revision: 11199

Modified:
   gnunet/src/transport/plugin_transport_http.c
   gnunet/src/transport/test_plugin_transport_http.c
Log:


Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c        2010-05-05 13:42:16 UTC 
(rev 11198)
+++ gnunet/src/transport/plugin_transport_http.c        2010-05-05 13:43:52 UTC 
(rev 11199)
@@ -325,12 +325,12 @@
     /* PUT method here */
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Got PUT Request with size %u 
\n",upload_data_size);
 
-    GNUNET_STATISTICS_update( plugin->env->stats , gettext_noop("# PUT 
requests"), 1, GNUNET_NO);
+    // GNUNET_STATISTICS_update( plugin->env->stats , gettext_noop("# PUT 
requests"), 1, GNUNET_NO);
   }
   if ( 0 == strcmp (MHD_HTTP_METHOD_GET, method) )
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Got GET Request with size\n");
-    GNUNET_STATISTICS_update( plugin->env->stats , gettext_noop("# GET 
requests"), 1, GNUNET_NO);
+    // GNUNET_STATISTICS_update( plugin->env->stats , gettext_noop("# GET 
requests"), 1, GNUNET_NO);
   }
 
   response = MHD_create_response_from_data (strlen (HTTP_PUT_RESPONSE),
@@ -563,13 +563,14 @@
   if (http_daemon_v6 != NULL)
     http_task_v6 = prepare_daemon (http_daemon_v6);
 
+  /*
   if (NULL == plugin->env->stats)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("Failed to retrieve statistics handle\n"));
     libgnunet_plugin_transport_http_done (api);
     return NULL;
-  }
+  }*/
 
   GNUNET_STATISTICS_set ( env->stats, "# PUT requests", 0, GNUNET_NO);
   GNUNET_STATISTICS_set ( env->stats, "# GET requests", 0, GNUNET_NO);

Modified: gnunet/src/transport/test_plugin_transport_http.c
===================================================================
--- gnunet/src/transport/test_plugin_transport_http.c   2010-05-05 13:42:16 UTC 
(rev 11198)
+++ gnunet/src/transport/test_plugin_transport_http.c   2010-05-05 13:43:52 UTC 
(rev 11199)
@@ -223,14 +223,13 @@
     }
 
 
-  stats = GNUNET_STATISTICS_create (sched, "http-transport", cfg);
+  // stats = GNUNET_STATISTICS_create (sched, "http-transport", cfg);
 
   /*
   max_connect_per_transport = (uint32_t) tneigh;
   my_private_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
-  */
   GNUNET_free (keyfile);
-  /*
+
   if (my_private_key == NULL)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -283,7 +282,7 @@
   };
   int ret;
   char *const argv_prog[] = {
-    "test-gnunetd-plugin-transport_http",
+    "test_plugin_transport_http",
     "-c",
     "test_plugin_transport_data_http.conf",
     "-L",
@@ -294,7 +293,7 @@
 #endif
     NULL
   };
-  GNUNET_log_setup ("test-gnunetd-plugin-transport_http",
+  GNUNET_log_setup ("test_plugin_transport_http",
 #if VERBOSE
                     "DEBUG",
 #else
@@ -305,9 +304,9 @@
   ret = (GNUNET_OK ==
          GNUNET_PROGRAM_run (5,
                              argv_prog,
-                             "test-plugin-transport_http",
+                             "test_plugin_transport_http",
                              "testcase", options, &run, NULL)) ? fail : 1;
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-plugin-transport_http");
+  GNUNET_DISK_directory_remove ("/tmp/test_plugin_transport_http");
 
   return fail;
 }