[GNUnet-SVN] r35832 - gnunet/src/pt

[gnunet]

Author: grothoff
Date: 2015-05-28 15:39:31 +0200 (Thu, 28 May 2015)
New Revision: 35832

Modified:
   gnunet/src/pt/test_gns_vpn.c
   gnunet/src/pt/test_gns_vpn.conf
   gnunet/src/pt/test_gnunet_vpn.c
Log:
-delay HTTP request 1s to ensure VPN is really up

Modified: gnunet/src/pt/test_gns_vpn.c
===================================================================
--- gnunet/src/pt/test_gns_vpn.c        2015-05-28 13:39:12 UTC (rev 35831)
+++ gnunet/src/pt/test_gns_vpn.c        2015-05-28 13:39:31 UTC (rev 35832)
@@ -322,7 +322,7 @@
   }
   /* wait a little bit before downloading, as we just created the record */
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                (GNUNET_TIME_UNIT_SECONDS, 5),
+                                (GNUNET_TIME_UNIT_SECONDS, 1),
                                 &start_curl,
                                 NULL);
 }

Modified: gnunet/src/pt/test_gns_vpn.conf
===================================================================
--- gnunet/src/pt/test_gns_vpn.conf     2015-05-28 13:39:12 UTC (rev 35831)
+++ gnunet/src/pt/test_gns_vpn.conf     2015-05-28 13:39:31 UTC (rev 35832)
@@ -35,6 +35,9 @@
 AUTOSTART = NO
 FORCESTART = NO
 
+#[vpn]
+#PREFIX = valgrind
+
 [nse]
 WORKBITS = 1
 

Modified: gnunet/src/pt/test_gnunet_vpn.c
===================================================================
--- gnunet/src/pt/test_gnunet_vpn.c     2015-05-28 13:39:12 UTC (rev 35831)
+++ gnunet/src/pt/test_gnunet_vpn.c     2015-05-28 13:39:31 UTC (rev 35832)
@@ -167,20 +167,9 @@
  * Function to run the HTTP client.
  */
 static void
-curl_main (void);
-
-
-static void
-curl_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+curl_main (void *cls,
+           const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  curl_task_id = NULL;
-  curl_main ();
-}
-
-
-static void
-curl_main ()
-{
   fd_set rs;
   fd_set ws;
   fd_set es;
@@ -192,6 +181,7 @@
   int running;
   struct CURLMsg *msg;
 
+  curl_task_id = NULL;
   max = 0;
   FD_ZERO (&rs);
   FD_ZERO (&ws);
@@ -241,7 +231,7 @@
   GNUNET_NETWORK_fdset_copy_native (&nws, &ws, max + 1);
   curl_task_id =
       GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT, delay,
-                                   &nrs, &nws, &curl_task, NULL);
+                                   &nrs, &nws, &curl_main, NULL);
 }
 
 
@@ -296,7 +286,9 @@
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Beginning HTTP download from `%s'\n",
               url);
-  curl_main ();
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+                                &curl_main,
+                                NULL);
 }