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.
*/
/**
* @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"
* Function to run the HTTP client.
*/
static void
-curl_main (void);
-
-
-static void
-curl_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- curl_task_id = NULL;
- curl_main ();
-}
-
-
-static void
-curl_main ()
+curl_main (void *cls)
{
fd_set rs;
fd_set ws;
int running;
struct CURLMsg *msg;
+ curl_task_id = NULL;
max = 0;
FD_ZERO (&rs);
FD_ZERO (&ws);
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);
}
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);
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);
}
static void
-mhd_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+mhd_task (void *cls)
{
mhd_task_id = NULL;
MHD_run (mhd);
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 ();
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;