From 7e4c760f920056ec1be6bc27bd880ea124be2145 Mon Sep 17 00:00:00 2001 From: Martin Schanzenbach Date: Tue, 26 Jun 2012 19:37:18 +0000 Subject: -fix warning --- src/vpn/test_gns_vpn.c | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) (limited to 'src') 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; static GNUNET_SCHEDULER_TaskIdentifier curl_task_id; -static GNUNET_SCHEDULER_TaskIdentifier ctrl_c_task_id; - static CURL *curl; static CURLM *multi; @@ -142,11 +140,6 @@ do_shutdown () 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); @@ -317,17 +310,6 @@ mhd_task (void *cls, } -static void -ctrl_c_shutdown (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) -{ - ctrl_c_task_id = GNUNET_SCHEDULER_NO_TASK; - do_shutdown (); - GNUNET_break (0); - global_ret = 1; -} - - static void mhd_main () { @@ -394,16 +376,7 @@ run (void *cls, MHD_OPTION_END); GNUNET_assert (NULL != mhd); mhd_main (); - /*rr = GNUNET_VPN_redirect_to_ip (vpn, - src_af, - dest_af, - addr, - GNUNET_YES, - GNUNET_TIME_UNIT_FOREVER_ABS, - &allocation_cb, NULL); - ctrl_c_task_id = GNUNET_SCHEDULER_add_delayed (TIMEOUT, - &ctrl_c_shutdown, - NULL);*/ + if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns", "ZONEKEY", &zone_keyfile)) -- cgit v1.2.3