[GNUnet-SVN] r22315 - gnunet/src/vpn

[gnunet]

Author: schanzen
Date: 2012-06-26 21:37:18 +0200 (Tue, 26 Jun 2012)
New Revision: 22315

Modified:
   gnunet/src/vpn/test_gns_vpn.c
Log:
-fix warning

Modified: gnunet/src/vpn/test_gns_vpn.c
===================================================================
--- gnunet/src/vpn/test_gns_vpn.c       2012-06-26 19:22:39 UTC (rev 22314)
+++ gnunet/src/vpn/test_gns_vpn.c       2012-06-26 19:37:18 UTC (rev 22315)
@@ -48,8 +48,6 @@
 
 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 @@
     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 @@
 }
 
 
-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 @@
                          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))