[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19354 - gnunet/src/vpn
From: |
gnunet |
Subject: |
[GNUnet-SVN] r19354 - gnunet/src/vpn |
Date: |
Tue, 24 Jan 2012 21:09:00 +0100 |
Author: grothoff
Date: 2012-01-24 21:09:00 +0100 (Tue, 24 Jan 2012)
New Revision: 19354
Modified:
gnunet/src/vpn/test_gnunet_vpn.c
Log:
-fixes
Modified: gnunet/src/vpn/test_gnunet_vpn.c
===================================================================
--- gnunet/src/vpn/test_gnunet_vpn.c 2012-01-24 18:58:32 UTC (rev 19353)
+++ gnunet/src/vpn/test_gnunet_vpn.c 2012-01-24 20:09:00 UTC (rev 19354)
@@ -71,9 +71,8 @@
struct CBC
{
- char *buf;
+ char buf[1024];
size_t pos;
- size_t size;
};
static struct CBC cbc;
@@ -85,7 +84,7 @@
{
struct CBC *cbc = ctx;
- if (cbc->pos + size * nmemb > cbc->size)
+ if (cbc->pos + size * nmemb > sizeof(cbc->buf))
return 0; /* overflow */
memcpy (&cbc->buf[cbc->pos], ptr, size * nmemb);
cbc->pos += size * nmemb;
@@ -106,7 +105,6 @@
struct MHD_Response *response;
int ret;
- fprintf (stderr, "MHD got request for URL `%s'\n", url);
if (0 != strcmp ("GET", method))
return MHD_NO; /* unexpected method */
if (&ptr != *unused)
@@ -135,6 +133,16 @@
GNUNET_SCHEDULER_cancel (mhd_task_id);
mhd_task_id = GNUNET_SCHEDULER_NO_TASK;
}
+ if (curl_task_id != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (curl_task_id);
+ curl_task_id = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (ctrl_c_task_id != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (ctrl_c_task_id);
+ ctrl_c_task_id = GNUNET_SCHEDULER_NO_TASK;
+ }
if (NULL != mhd)
{
MHD_stop_daemon (mhd);
@@ -167,7 +175,7 @@
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
curl_task_id = GNUNET_SCHEDULER_NO_TASK;
-
+ curl_main ();
}
@@ -211,14 +219,14 @@
global_ret = 2;
if (0 != strncmp ("/hello_world", cbc.buf, strlen ("/hello_world")))
global_ret = 3;
+ fprintf (stderr, "Download complete, shutting down!\n");
do_shutdown ();
return;
}
- GNUNET_assert (CURLM_OK == curl_multi_fdset (multi, &rs, &ws, &es, &max));
-
+ GNUNET_assert (CURLM_OK == curl_multi_fdset (multi, &rs, &ws, &es, &max));
if ( (CURLM_OK != curl_multi_timeout (multi, &timeout)) ||
(-1 == timeout) )
- delay = GNUNET_TIME_UNIT_FOREVER_REL;
+ delay = GNUNET_TIME_UNIT_SECONDS;
else
delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
(unsigned int) timeout);
GNUNET_NETWORK_fdset_copy_native (&nrs,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19354 - gnunet/src/vpn,
gnunet <=