diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-06-26 19:37:18 +0000 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-06-26 19:37:18 +0000 |
commit | 7e4c760f920056ec1be6bc27bd880ea124be2145 (patch) | |
tree | cdafa38d2428805113e3a94a53424804d06ad67b /src/vpn | |
parent | 5c9fac9cafe7d0911b80cc1aeab52b2e0d0cff9b (diff) | |
download | gnunet-7e4c760f920056ec1be6bc27bd880ea124be2145.tar.gz gnunet-7e4c760f920056ec1be6bc27bd880ea124be2145.zip |
-fix warning
Diffstat (limited to 'src/vpn')
-rw-r--r-- | src/vpn/test_gns_vpn.c | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/src/vpn/test_gns_vpn.c b/src/vpn/test_gns_vpn.c index f1295903d..0c6e42500 100644 --- a/src/vpn/test_gns_vpn.c +++ b/src/vpn/test_gns_vpn.c | |||
@@ -48,8 +48,6 @@ static GNUNET_SCHEDULER_TaskIdentifier mhd_task_id; | |||
48 | 48 | ||
49 | static GNUNET_SCHEDULER_TaskIdentifier curl_task_id; | 49 | static GNUNET_SCHEDULER_TaskIdentifier curl_task_id; |
50 | 50 | ||
51 | static GNUNET_SCHEDULER_TaskIdentifier ctrl_c_task_id; | ||
52 | |||
53 | static CURL *curl; | 51 | static CURL *curl; |
54 | 52 | ||
55 | static CURLM *multi; | 53 | static CURLM *multi; |
@@ -142,11 +140,6 @@ do_shutdown () | |||
142 | GNUNET_SCHEDULER_cancel (curl_task_id); | 140 | GNUNET_SCHEDULER_cancel (curl_task_id); |
143 | curl_task_id = GNUNET_SCHEDULER_NO_TASK; | 141 | curl_task_id = GNUNET_SCHEDULER_NO_TASK; |
144 | } | 142 | } |
145 | if (ctrl_c_task_id != GNUNET_SCHEDULER_NO_TASK) | ||
146 | { | ||
147 | GNUNET_SCHEDULER_cancel (ctrl_c_task_id); | ||
148 | ctrl_c_task_id = GNUNET_SCHEDULER_NO_TASK; | ||
149 | } | ||
150 | if (NULL != mhd) | 143 | if (NULL != mhd) |
151 | { | 144 | { |
152 | MHD_stop_daemon (mhd); | 145 | MHD_stop_daemon (mhd); |
@@ -317,17 +310,6 @@ mhd_task (void *cls, | |||
317 | } | 310 | } |
318 | 311 | ||
319 | 312 | ||
320 | static void | ||
321 | ctrl_c_shutdown (void *cls, | ||
322 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
323 | { | ||
324 | ctrl_c_task_id = GNUNET_SCHEDULER_NO_TASK; | ||
325 | do_shutdown (); | ||
326 | GNUNET_break (0); | ||
327 | global_ret = 1; | ||
328 | } | ||
329 | |||
330 | |||
331 | static void | 313 | static void |
332 | mhd_main () | 314 | mhd_main () |
333 | { | 315 | { |
@@ -394,16 +376,7 @@ run (void *cls, | |||
394 | MHD_OPTION_END); | 376 | MHD_OPTION_END); |
395 | GNUNET_assert (NULL != mhd); | 377 | GNUNET_assert (NULL != mhd); |
396 | mhd_main (); | 378 | mhd_main (); |
397 | /*rr = GNUNET_VPN_redirect_to_ip (vpn, | 379 | |
398 | src_af, | ||
399 | dest_af, | ||
400 | addr, | ||
401 | GNUNET_YES, | ||
402 | GNUNET_TIME_UNIT_FOREVER_ABS, | ||
403 | &allocation_cb, NULL); | ||
404 | ctrl_c_task_id = GNUNET_SCHEDULER_add_delayed (TIMEOUT, | ||
405 | &ctrl_c_shutdown, | ||
406 | NULL);*/ | ||
407 | if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns", | 380 | if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns", |
408 | "ZONEKEY", | 381 | "ZONEKEY", |
409 | &zone_keyfile)) | 382 | &zone_keyfile)) |