(no commit message)

[oweals/gnunet.git] / src / hostlist / gnunet-daemon-hostlist.c

diff --git a/src/hostlist/gnunet-daemon-hostlist.c b/src/hostlist/gnunet-daemon-hostlist.c
index c06ee5f56eb28d1c58491c01d49bf71c9d0cd1f5..bbc0d7e088ec2d8925aa7bf811dea6488c92cf10 100644 (file)
--- a/src/hostlist/gnunet-daemon-hostlist.c
+++ b/src/hostlist/gnunet-daemon-hostlist.c
@@ -22,17 +22,11 @@
  * @file hostlist/gnunet-daemon-hostlist.c
  * @brief code for bootstrapping via hostlist servers
  * @author Christian Grothoff
- *
- * TODO:
- * - implement -a and -e switches (send P2P messages about our hostlist URL,
- *   receive such messages and automatically update our hostlist URL config
- *   value).
  */
 
 #include <stdlib.h>
 #include "platform.h"
 #include "hostlist-client.h"
-#include "hostlist-server.h"
 #include "gnunet_core_service.h"
 #include "gnunet_getopt_lib.h"
 #include "gnunet_protocols.h"
@@ -42,11 +36,32 @@
 #include "gnunet_time_lib.h"
 #include "gnunet_util_lib.h"
 
+#if HAVE_MHD
+
+#include "hostlist-server.h"
+
 /**
  * Set if we are allowed to advertise our hostlist to others.
  */
 static int advertising;
 
+/**
+ * Set if the user wants us to run a hostlist server.
+ */
+static int provide_hostlist;
+
+/**
+ * Handle to hostlist server's connect handler
+ */
+static GNUNET_CORE_ConnectEventHandler server_ch = NULL;
+
+/**
+ * Handle to hostlist server's disconnect handler
+ */
+static GNUNET_CORE_DisconnectEventHandler server_dh = NULL;
+
+#endif
+
 /**
  * Set if we are allowed to learn about peers by accessing
  * hostlist servers.
@@ -59,11 +74,6 @@ static int bootstrapping;
  */
 static int learning;
 
-/**
- * Set if the user wants us to run a hostlist server.
- */
-static int provide_hostlist;
-
 /**
  * Statistics handle.
  */
@@ -89,32 +99,26 @@ static GNUNET_CORE_ConnectEventHandler client_ch = NULL;
  */
 static GNUNET_CORE_DisconnectEventHandler client_dh = NULL;
 
-/**
- * Handle to hostlist server's connect handler
- */
-static GNUNET_CORE_ConnectEventHandler server_ch = NULL;
-
-/**
- * Handle to hostlist server's disconnect handler
- */
-static GNUNET_CORE_DisconnectEventHandler server_dh = NULL;
-
 /**
  * gnunet-daemon-hostlist command line options.
  */
 static struct GNUNET_GETOPT_CommandLineOption options[] = {
+#if HAVE_MHD
   { 'a', "advertise", NULL, 
     gettext_noop ("advertise our hostlist to other peers"),
     GNUNET_NO, &GNUNET_GETOPT_set_one, &advertising },
+#endif
   { 'b', "bootstrap", NULL, 
     gettext_noop ("bootstrap using hostlists (it is highly recommended that you always use this option)"),
     GNUNET_NO, &GNUNET_GETOPT_set_one, &bootstrapping },
   { 'e', "enable-learning", NULL,
     gettext_noop ("enable learning about hostlist servers from other peers"),
     GNUNET_NO, &GNUNET_GETOPT_set_one, &learning},
+#if HAVE_MHD
   { 'p', "provide-hostlist", NULL, 
     gettext_noop ("provide a hostlist server"),
     GNUNET_NO, &GNUNET_GETOPT_set_one, &provide_hostlist},
+#endif
   GNUNET_GETOPT_OPTION_END
 };
 
@@ -153,10 +157,7 @@ core_init (void *cls,
           GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *
           publicKey)
 {
-  if (advertising && (NULL != server))
-    {    
-      /* FIXME: provide "server" to 'hostlist' module */
-    }
+ /* Nothing to do here */
 }
 
 /**
@@ -192,8 +193,10 @@ connect_handler (void *cls,
               "A new peer connected, notifying client and server\n");
   if ( NULL != client_ch)
     (*client_ch) (cls, peer, latency, distance);
+#if HAVE_MHD
   if ( NULL != server_ch)
     (*server_ch) (cls, peer, latency, distance);
+#endif
 }
 
 /**
@@ -201,8 +204,6 @@ connect_handler (void *cls,
  *
  * @param cls closure
  * @param peer peer identity this notification is about
- * @param latency reported latency of the connection with 'other'
- * @param distance reported distance (DV) to 'other'
  */
 static void
 disconnect_handler (void *cls,
@@ -213,10 +214,11 @@ disconnect_handler (void *cls,
   /* call hostlist client disconnect handler*/
   if ( NULL != client_dh)
     (*client_dh) (cls, peer);
-
+#if HAVE_MHD
   /* call hostlist server disconnect handler*/
   if ( NULL != server_dh)
     (*server_dh) (cls, peer);
+#endif
 }
 
 /**
@@ -227,20 +229,22 @@ static void
 cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Hostlist daemon is shutting down\n");
+              "Hostlist daemon is shutting down\n");
+  if (core != NULL)
+    {
+      GNUNET_CORE_disconnect (core);
+      core = NULL;
+    }
   if (bootstrapping)
     {
       GNUNET_HOSTLIST_client_stop ();
     }
+#if HAVE_MHD
   if (provide_hostlist)
     {      
       GNUNET_HOSTLIST_server_stop ();
     }
-  if (core != NULL)
-    {
-      GNUNET_CORE_disconnect (core);
-      core = NULL;
-    }
+#endif
   if (stats != NULL)
     {
       GNUNET_STATISTICS_destroy (stats,
@@ -283,20 +287,26 @@ run (void *cls,
      const struct GNUNET_CONFIGURATION_Handle * cfg)
 {
   if ( (! bootstrapping) &&
-       (! learning) &&
-       (! provide_hostlist) )
+       (! learning) 
+#if HAVE_MHD
+       && (! provide_hostlist) 
+#endif
+       )
     {
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                  _("None of the functions for the hostlist daemon were enabled.  I have no reason to run!\n"));
       return;
     }
+
+
+
   stats = GNUNET_STATISTICS_create (sched, "hostlist", cfg);
 
   core = GNUNET_CORE_connect (sched, cfg,
                              GNUNET_TIME_UNIT_FOREVER_REL,
                              NULL,
                              &core_init,
-                             NULL, &connect_handler, &disconnect_handler,
+                             &connect_handler, &disconnect_handler,
                              NULL, GNUNET_NO,
                              NULL, GNUNET_NO,
                              learning? learn_handlers : no_learn_handlers);
@@ -306,14 +316,17 @@ run (void *cls,
       GNUNET_HOSTLIST_client_start (cfg, sched, stats,
                                    &client_ch, &client_dh, &client_adv_handler, learning);
     }
+
+  #if HAVE_MHD
   if (provide_hostlist)
     {      
       GNUNET_HOSTLIST_server_start (cfg, sched, stats, core, &server_ch, &server_dh, advertising );
     }
-
+#endif
   GNUNET_SCHEDULER_add_delayed (sched,
                                 GNUNET_TIME_UNIT_FOREVER_REL,
                                 &cleaning_task, NULL);
+
   if (NULL == core)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,