refactor DHT for new service API

[oweals/gnunet.git] / src / nse / gnunet-nse.c

diff --git a/src/nse/gnunet-nse.c b/src/nse/gnunet-nse.c
index ec2ad26d3757162f3387482541f4e4f2128990de..840b8e64df304373f15f526025c433c6f1ea1f7e 100644 (file)
--- a/src/nse/gnunet-nse.c
+++ b/src/nse/gnunet-nse.c
@@ -1,6 +1,6 @@
 /*
       This file is part of GNUnet
-      (C) 2008--2014 Christian Grothoff (and other contributing authors)
+      Copyright (C) 2008--2014 GNUnet e.V.
 
       GNUnet is free software; you can redistribute it and/or modify
       it under the terms of the GNU General Public License as published
@@ -14,14 +14,14 @@
 
       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.
 */
 
 /**
  * @file nse/gnunet-nse.c
  * @brief Program to display network size estimates from the NSE service
- * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  */
 
 #include "platform.h"
@@ -45,7 +45,7 @@ static struct GNUNET_CLIENT_TestHandle *test;
 /**
  * Shutdown task
  */
-static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+static struct GNUNET_SCHEDULER_Task * shutdown_task;
 
 /**
  * The program status; 0 for success.
@@ -57,12 +57,11 @@ static int status;
  * Task to shutdown and clean up all state
  *
  * @param cls NULL
- * @param tc the scheduler task context
  */
 static void
-do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls)
 {
-  shutdown_task = GNUNET_SCHEDULER_NO_TASK;
+  shutdown_task = NULL;
   if (NULL != test)
     GNUNET_CLIENT_service_test_cancel (test);
   if (NULL != nse)
@@ -144,8 +143,8 @@ run (void *cls, char *const *args, const char *cfgfile,
                                      GNUNET_TIME_UNIT_SECONDS,
                                      nse_test_result,
                                      NULL);
-  shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                                &do_shutdown, NULL);
+  shutdown_task = GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
+                                                NULL);
 }
 
 
@@ -160,7 +159,7 @@ main (int argc, char *const *argv)
   static struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
-  
+
   status = 1;
   if (GNUNET_OK !=
       GNUNET_PROGRAM_run (argc, argv, "gnunet-nse",