Start implementation of some functions.

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

diff --git a/src/dht/gnunet-service-wdht.c b/src/dht/gnunet-service-wdht.c
index 13e60acf464a477b90a2773b2ec739ead1ee22f9..c440730e9b77152c926d48d452445900cb717cf8 100644 (file)
--- a/src/dht/gnunet-service-wdht.c
+++ b/src/dht/gnunet-service-wdht.c
@@ -35,10 +35,8 @@
 #include "gnunet-service-wdht.h"
 #include "gnunet-service-wdht_clients.h"
 #include "gnunet-service-wdht_datacache.h"
-#include "gnunet-service-wdht_hello.h"
 #include "gnunet-service-wdht_neighbours.h"
 #include "gnunet-service-wdht_nse.h"
-#include "gnunet-service-wdht_routing.h"
 
 
 
@@ -57,55 +55,6 @@ struct GNUNET_BLOCK_Context *GDS_block_context;
  */
 const struct GNUNET_CONFIGURATION_Handle *GDS_cfg;
 
-/**
- * Our HELLO
- */
-struct GNUNET_MessageHeader *GDS_my_hello;
-
-/**
- * Handle to the transport service, for getting our hello
- */
-struct GNUNET_TRANSPORT_Handle *GDS_transport_handle;
-
-/**
- * Handle to get our current HELLO.
- */
-static struct GNUNET_TRANSPORT_GetHelloHandle *ghh;
-
-/**
- * Hello address expiration
- */
-struct GNUNET_TIME_Relative hello_expiration;
-
-/**
- * Should we store our topology predecessor and successor IDs into statistics?
- */
-extern unsigned int track_topology;
-
-#if ENABLE_MALICIOUS
-/**
- * Should this peer act malicious?
- */
-unsigned int malicious;
-#endif
-
-
-/**
- * Receive the HELLO from transport service, free current and replace
- * if necessary.
- *
- * @param cls NULL
- * @param message HELLO message of peer
- */
-static void
-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));
-}
-
 
 /**
  * Task run during shutdown.
@@ -116,21 +65,8 @@ process_hello (void *cls, const struct GNUNET_MessageHeader *message)
 static void
 shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  if (NULL != ghh)
-  {
-    GNUNET_TRANSPORT_get_hello_cancel (ghh);
-    ghh = NULL;
-  }
-  if (GDS_transport_handle != NULL)
-  {
-    GNUNET_TRANSPORT_disconnect (GDS_transport_handle);
-    GDS_transport_handle = NULL;
-  }
-
   GDS_NEIGHBOURS_done ();
   GDS_DATACACHE_done ();
-  GDS_ROUTING_done ();
-  GDS_HELLO_done ();
   GDS_NSE_done ();
   if (GDS_block_context != NULL)
   {
@@ -142,8 +78,6 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_STATISTICS_destroy (GDS_stats, GNUNET_YES);
     GDS_stats = NULL;
   }
-  GNUNET_free_non_null (GDS_my_hello);
-  GDS_my_hello = NULL;
 }
 
 
@@ -158,42 +92,20 @@ static void
 run (void *cls, struct GNUNET_SERVER_Handle *server,
      const struct GNUNET_CONFIGURATION_Handle *c)
 {
-  unsigned long long _track_topology;
   GDS_cfg = c;
-  if (GNUNET_OK !=
-      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_ROUTING_init ();
   GDS_NSE_init ();
   GDS_DATACACHE_init ();
-  GDS_HELLO_init ();
   GDS_CLIENTS_init (server);
-  if (GNUNET_OK ==
-      GNUNET_CONFIGURATION_get_value_number (c, "xdht", "track_toplogy",
-                                             &_track_topology))
-  {
-    track_topology = (unsigned int) _track_topology;
-  }
   if (GNUNET_OK != GDS_NEIGHBOURS_init ())
   {
     shutdown_task (NULL, NULL);
     return;
   }
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+                                &shutdown_task,
                                 NULL);
-  GDS_transport_handle =
-      GNUNET_TRANSPORT_connect (GDS_cfg, NULL, NULL, NULL, NULL, NULL);
-  if (GDS_transport_handle == NULL)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _("Failed to connect to transport service!\n"));
-    return;
-  }
-  ghh = GNUNET_TRANSPORT_get_hello (GDS_transport_handle, &process_hello, NULL);
 }
 
 
@@ -211,10 +123,11 @@ main (int argc, char *const *argv)
 
   ret =
       (GNUNET_OK ==
-       GNUNET_SERVICE_run (argc, argv, "dht", GNUNET_SERVICE_OPTION_NONE, &run,
+       GNUNET_SERVICE_run (argc, argv, "wdht",
+                           GNUNET_SERVICE_OPTION_NONE, &run,
                            NULL)) ? 0 : 1;
   GDS_CLIENTS_done ();
   return ret;
 }
 
-/* end of gnunet-service-dht.c */
+/* end of gnunet-service-wdht.c */