plugin datastore mysql

[oweals/gnunet.git] / src / pt / test_gnunet_vpn.c

diff --git a/src/pt/test_gnunet_vpn.c b/src/pt/test_gnunet_vpn.c
index eb90abf8f912a3c967249eef0bc26cc4a915a611..df87da30abc78eed3cbef05c94fe645acf712b7c 100644 (file)
--- a/src/pt/test_gnunet_vpn.c
+++ b/src/pt/test_gnunet_vpn.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -24,7 +24,11 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
+#if HAVE_CURL_CURL_H
 #include <curl/curl.h>
+#elif HAVE_GNURL_CURL_H
+#include <gnurl/curl.h>
+#endif
 #include <microhttpd.h>
 #include "gnunet_vpn_service.h"
 #include "gnunet_testing_lib.h"
@@ -167,8 +171,7 @@ do_shutdown ()
  * Function to run the HTTP client.
  */
 static void
-curl_main (void *cls,
-           const struct GNUNET_SCHEDULER_TaskContext *tc)
+curl_main (void *cls)
 {
   fd_set rs;
   fd_set ws;
@@ -278,7 +281,7 @@ allocation_cb (void *cls, int af, const void *address)
   curl_easy_setopt (curl, CURLOPT_TIMEOUT, 150L);
   curl_easy_setopt (curl, CURLOPT_CONNECTTIMEOUT, 15L);
   curl_easy_setopt (curl, CURLOPT_NOSIGNAL, 1);
-  curl_easy_setopt (curl, CURLOPT_VERBOSE, 1);
+  curl_easy_setopt (curl, CURLOPT_VERBOSE, 0);
 
   multi = curl_multi_init ();
   GNUNET_assert (multi != NULL);
@@ -300,7 +303,7 @@ mhd_main (void);
 
 
 static void
-mhd_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+mhd_task (void *cls)
 {
   mhd_task_id = NULL;
   MHD_run (mhd);
@@ -309,7 +312,7 @@ mhd_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 static void
-ctrl_c_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+ctrl_c_shutdown (void *cls)
 {
   ctrl_c_task_id = NULL;
   do_shutdown ();
@@ -351,7 +354,8 @@ mhd_main ()
 
 
 static void
-run (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
+run (void *cls,
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
      struct GNUNET_TESTING_Peer *peer)
 {
   struct in_addr v4;