commented out wrong message type

[oweals/gnunet.git] / src / dht / gnunet-service-dht.c

diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c
index e3b9d59a4b0e029bd352118d0090c74e6bf4436c..f2b922dc42d0deec7777b7262cd5decd0792ae03 100644 (file)
--- a/src/dht/gnunet-service-dht.c
+++ b/src/dht/gnunet-service-dht.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2009, 2010, 2011 GNUnet e.V.
+     Copyright (C) 2009, 2010, 2011, 2016 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
@@ -28,39 +28,17 @@
 #include "gnunet_block_lib.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_transport_service.h"
+#include "gnunet_transport_hello_service.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_dht_service.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet-service-dht.h"
-#include "gnunet-service-dht_clients.h"
 #include "gnunet-service-dht_datacache.h"
 #include "gnunet-service-dht_hello.h"
 #include "gnunet-service-dht_neighbours.h"
 #include "gnunet-service-dht_nse.h"
 #include "gnunet-service-dht_routing.h"
 
-
-
-/**
- * Handle for the statistics service.
- */
-struct GNUNET_STATISTICS_Handle *GDS_stats;
-
-/**
- * Our handle to the BLOCK library.
- */
-struct GNUNET_BLOCK_Context *GDS_block_context;
-
-/**
- * The configuration the DHT service is running with
- */
-const struct GNUNET_CONFIGURATION_Handle *GDS_cfg;
-
-/**
- * Handle to our server.
- */
-struct GNUNET_SERVER_Handle *GDS_server;
-
 /**
  * Our HELLO
  */
@@ -69,7 +47,7 @@ struct GNUNET_MessageHeader *GDS_my_hello;
 /**
  * Handle to get our current HELLO.
  */
-static struct GNUNET_TRANSPORT_GetHelloHandle *ghh;
+static struct GNUNET_TRANSPORT_HelloGetHandle *ghh;
 
 /**
  * Hello address expiration
@@ -77,6 +55,10 @@ static struct GNUNET_TRANSPORT_GetHelloHandle *ghh;
 struct GNUNET_TIME_Relative hello_expiration;
 
 
+/* Code shared between different DHT implementations */
+#include "gnunet-service-dht_clients.c"
+
+
 /**
  * Receive the HELLO from transport service, free current and replace
  * if necessary.
@@ -85,12 +67,14 @@ struct GNUNET_TIME_Relative hello_expiration;
  * @param message HELLO message of peer
  */
 static void
-process_hello (void *cls, const struct GNUNET_MessageHeader *message)
+process_hello (void *cls,
+              const struct GNUNET_MessageHeader *message)
 {
-  GNUNET_assert (message != NULL);
   GNUNET_free_non_null (GDS_my_hello);
   GDS_my_hello = GNUNET_malloc (ntohs (message->size));
-  memcpy (GDS_my_hello, message, ntohs (message->size));
+  GNUNET_memcpy (GDS_my_hello,
+                 message,
+                 ntohs (message->size));
 }
 
 
@@ -104,7 +88,7 @@ shutdown_task (void *cls)
 {
   if (NULL != ghh)
   {
-    GNUNET_TRANSPORT_get_hello_cancel (ghh);
+    GNUNET_TRANSPORT_hello_get_cancel (ghh);
     ghh = NULL;
   }
   GDS_NEIGHBOURS_done ();
@@ -112,18 +96,20 @@ shutdown_task (void *cls)
   GDS_ROUTING_done ();
   GDS_HELLO_done ();
   GDS_NSE_done ();
-  if (GDS_block_context != NULL)
+  if (NULL != GDS_block_context)
   {
     GNUNET_BLOCK_context_destroy (GDS_block_context);
     GDS_block_context = NULL;
   }
-  if (GDS_stats != NULL)
+  if (NULL != GDS_stats)
   {
-    GNUNET_STATISTICS_destroy (GDS_stats, GNUNET_YES);
+    GNUNET_STATISTICS_destroy (GDS_stats,
+                              GNUNET_YES);
     GDS_stats = NULL;
   }
   GNUNET_free_non_null (GDS_my_hello);
   GDS_my_hello = NULL;
+  GDS_CLIENTS_stop ();
 }
 
 
@@ -131,24 +117,29 @@ shutdown_task (void *cls)
  * Process dht requests.
  *
  * @param cls closure
- * @param server the initialized server
  * @param c configuration to use
+ * @param service the initialized service
  */
 static void
 run (void *cls,
-     struct GNUNET_SERVER_Handle *server,
-     const struct GNUNET_CONFIGURATION_Handle *c)
+     const struct GNUNET_CONFIGURATION_Handle *c,
+     struct GNUNET_SERVICE_Handle *service)
 {
   GDS_cfg = c;
-  GDS_server = server;
-  GNUNET_SERVER_suspend (server);
+  GDS_service = service;
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_time (c, "transport", "HELLO_EXPIRATION", &hello_expiration))
+      GNUNET_CONFIGURATION_get_value_time (c,
+                                          "transport",
+                                          "HELLO_EXPIRATION",
+                                          &hello_expiration))
   {
     hello_expiration = GNUNET_CONSTANTS_HELLO_ADDRESS_EXPIRATION;
   }
   GDS_block_context = GNUNET_BLOCK_context_create (GDS_cfg);
-  GDS_stats = GNUNET_STATISTICS_create ("dht", GDS_cfg);
+  GDS_stats = GNUNET_STATISTICS_create ("dht",
+                                        GDS_cfg);
+  GNUNET_SERVICE_suspend (GDS_service);
+  GDS_CLIENTS_init ();
   GDS_ROUTING_init ();
   GDS_NSE_init ();
   GDS_DATACACHE_init ();
@@ -160,30 +151,17 @@ run (void *cls,
   }
   GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
                                 NULL);
-  ghh = GNUNET_TRANSPORT_get_hello (GDS_cfg,
+  ghh = GNUNET_TRANSPORT_hello_get (GDS_cfg,
+                                   GNUNET_TRANSPORT_AC_GLOBAL,
                                     &process_hello,
                                     NULL);
 }
 
 
-/**
- * The main function for the dht service.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char *const *argv)
-{
-  int ret;
-
-  ret =
-      (GNUNET_OK ==
-       GNUNET_SERVICE_run (argc, argv, "dht", GNUNET_SERVICE_OPTION_NONE, &run,
-                           NULL)) ? 0 : 1;
-  GDS_CLIENTS_done ();
-  return ret;
-}
+/* Finally, define the main method */
+GDS_DHT_SERVICE_INIT("dht", &run);
+
+
+
 
 /* end of gnunet-service-dht.c */