fix out-of-tree build of GNUnet

[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 7d075cf808df69ffd43b961fbbb171d76b916ae0..7181a913b51c5665871f2df2dd92c02e23cc2034 100644 (file)
--- a/src/hostlist/gnunet-daemon-hostlist.c
+++ b/src/hostlist/gnunet-daemon-hostlist.c
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
 /*
      This file is part of GNUnet.

-     (C) 2007, 2008, 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2007, 2008, 2009, 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
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published

-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your

      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but


@@ -14,40 +14,43 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
 
      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 hostlist/gnunet-daemon-hostlist.c
  * @brief code for bootstrapping via hostlist servers
  * @author Christian Grothoff
 */
 
 /**
  * @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 "platform.h"

-#include "hostlist-client.h"
-#include "hostlist-server.h"
+#include "gnunet-daemon-hostlist_client.h"

 #include "gnunet_core_service.h"
 #include "gnunet_core_service.h"

-#include "gnunet_getopt_lib.h"
+#include "gnunet_util_lib.h"

 #include "gnunet_protocols.h"
 #include "gnunet_protocols.h"

-#include "gnunet_program_lib.h"

 #include "gnunet_statistics_service.h"
 #include "gnunet_statistics_service.h"

-#include "gnunet_strings_lib.h"
-#include "gnunet_time_lib.h"
-#include "gnunet_util_lib.h"

 
 

+#if HAVE_MHD
+
+#include "gnunet-daemon-hostlist_server.h"

 
 /**
  * Set if we are allowed to advertise our hostlist to others.
  */
 static int advertising;
 
 
 /**
  * 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;
+
+#endif
+

 /**
  * Set if we are allowed to learn about peers by accessing
  * hostlist servers.
 /**
  * Set if we are allowed to learn about peers by accessing
  * hostlist servers.


@@ -61,63 +64,221 @@ static int bootstrapping;
 static int learning;
 
 /**
 static int learning;
 
 /**

- * Set if the user wants us to run a hostlist server.
+ * Statistics handle.

  */
  */

-static int provide_hostlist;
+static struct GNUNET_STATISTICS_Handle *stats;

 
 /**
 
 /**

- * Statistics handle.
+ * Handle to the core service (NULL until we've connected to it).

  */
  */

-static struct GNUNET_STATISTICS_Handle *stats;
+static struct GNUNET_CORE_Handle *core;

 
 /**
 
 /**

- * gnunet-daemon-hostlist command line options.
- */
-static struct GNUNET_GETOPT_CommandLineOption options[] = {
-  { 'a', "advertise", NULL, 
-    gettext_noop ("advertise our hostlist to other peers"),
-    GNUNET_NO, &GNUNET_GETOPT_set_one, &advertising },
-  { '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},
-  { 'p', "provide-hostlist", NULL, 
-    gettext_noop ("provide a hostlist server"),
-    GNUNET_NO, &GNUNET_GETOPT_set_one, &provide_hostlist},
-  GNUNET_GETOPT_OPTION_END
+ * Handle to the hostlist client's advertisement handler
+ */
+static GNUNET_HOSTLIST_UriHandler client_adv_handler;
+
+/**
+ * Handle to hostlist client's connect handler
+ */
+static GNUNET_CORE_ConnecTEventHandler client_ch;
+
+/**
+ * Handle to hostlist client's disconnect handler
+ */
+static GNUNET_CORE_DisconnecTEventHandler client_dh;
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
+/**
+ * A HOSTLIST_ADV message is used to exchange information about
+ * hostlist advertisements.  This struct is always
+ * followed by the actual url under which the hostlist can be obtained:
+ *
+ * 1) transport-name (0-terminated)
+ * 2) address-length (uint32_t, network byte order; possibly
+ *    unaligned!)
+ * 3) address expiration (GNUNET_TIME_AbsoluteNBO); possibly
+ *    unaligned!)
+ * 4) address (address-length bytes; possibly unaligned!)
+ */
+struct GNUNET_HOSTLIST_ADV_Message
+{
+  /**
+   * Type will be GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT.
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Always zero (for alignment).
+   */
+  uint32_t reserved GNUNET_PACKED;

 };
 };

+GNUNET_NETWORK_STRUCT_END
+
+
+/**
+ * Our own peer identity.
+ */
+static struct GNUNET_PeerIdentity me;

 
 
 
 

+/**
+ * Callback invoked once our connection to CORE service is up.
+ *
+ * @param cls NULL
+ * @param my_identity our peer's identity
+ */

 static void
 core_init (void *cls,
 static void
 core_init (void *cls,

-          struct GNUNET_CORE_Handle * server,
-          const struct GNUNET_PeerIdentity *
-          my_identity,
-          const struct
-          GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *
-          publicKey)
+           const struct GNUNET_PeerIdentity *my_identity)

 {
 {

-  if (advertising && (NULL != server))
-    {    
-      /* FIXME: provide "server" to 'hostlist' module */
-    }
+  me = *my_identity;
+}
+
+
+/**
+ * Core handler for p2p hostlist advertisements
+ *
+ * @param cls closure
+ * @param message advertisement message we got
+ * @return #GNUNET_OK if message is well-formed
+ */
+static int
+check_advertisement (void *cls,
+                    const struct GNUNET_MessageHeader *message)
+{
+  size_t size;
+  size_t uri_size;
+  const char *uri;
+
+  size = ntohs (message->size);
+  if (size <= sizeof (struct GNUNET_MessageHeader))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  uri = (const char *) &message[1];
+  uri_size = size - sizeof (struct GNUNET_MessageHeader);
+  if (uri[uri_size - 1] != '\0')
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+/**
+ * Core handler for p2p hostlist advertisements
+ *
+ * @param cls closure
+ * @param message advertisement message we got
+ * @return #GNUNET_OK on success
+ */
+static void
+handle_advertisement (void *cls,
+                     const struct GNUNET_MessageHeader *message)
+{
+  const char *uri = (const char *) &message[1];
+ 
+  GNUNET_assert (NULL != client_adv_handler);
+  (void) (*client_adv_handler) (uri);
+}
+
+
+/**
+ * Method called whenever a given peer connects.  Wrapper to call both
+ * client's and server's functions
+ *
+ * @param cls closure
+ * @param peer peer identity this notification is about
+ * @param mq queue for sending messages to @a peer
+ * @return peer
+ */
+static void *
+connect_handler (void *cls,
+                const struct GNUNET_PeerIdentity *peer,
+                struct GNUNET_MQ_Handle *mq)
+{
+  if (0 == memcmp (&me,
+                  peer,
+                  sizeof (struct GNUNET_PeerIdentity)))
+    return NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "A new peer connected, notifying client and server\n");
+  if (NULL != client_ch)
+    GNUNET_assert (NULL ==
+                  (*client_ch) (cls,
+                                peer,
+                                mq));
+#if HAVE_MHD
+  if (NULL != server_ch)
+    GNUNET_assert (NULL ==
+                  (*server_ch) (cls,
+                                peer,
+                                mq));
+#endif
+  return (void *) peer;
+}
+
+
+/**
+ * Method called whenever a given peer disconnects. Wrapper to call
+ * both client's and server's functions
+ *
+ * @param cls closure
+ * @param peer peer identity this notification is about
+ */
+static void
+disconnect_handler (void *cls,
+                    const struct GNUNET_PeerIdentity *peer,
+                   void *internal_cls)
+{
+  if (0 == memcmp (&me,
+                  peer,
+                  sizeof (struct GNUNET_PeerIdentity)))
+    return;
+  /* call hostlist client disconnect handler */
+  if (NULL != client_dh)
+    (*client_dh) (cls,
+                 peer,
+                 NULL);

 }
 
 
 /**
  * Last task run during shutdown.  Disconnects us from
  * the other services.
 }
 
 
 /**
  * Last task run during shutdown.  Disconnects us from
  * the other services.

+ *
+ * @param cls NULL

  */
 static void
  */
 static void

-cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+cleaning_task (void *cls)

 {
 {

-  if (stats != NULL)
-    {
-      GNUNET_STATISTICS_destroy (stats);
-      stats = NULL;
-    }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Hostlist daemon is shutting down\n");
+  if (NULL != core)
+  {
+    GNUNET_CORE_disconnecT (core);
+    core = NULL;
+  }
+  if (bootstrapping)
+  {
+    GNUNET_HOSTLIST_client_stop ();
+  }
+#if HAVE_MHD
+  if (provide_hostlist)
+  {
+    GNUNET_HOSTLIST_server_stop ();
+  }
+#endif
+  if (NULL != stats)
+  {
+    GNUNET_STATISTICS_destroy (stats,
+                              GNUNET_NO);
+    stats = NULL;
+  }

 }
 
 
 }
 
 


@@ -125,62 +286,76 @@ cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * Main function that will be run.
  *
  * @param cls closure
  * Main function that will be run.
  *
  * @param cls closure

- * @param sched the scheduler to use

  * @param args remaining command-line arguments
  * @param cfgfile name of the configuration file used (for saving, can be NULL!)
  * @param cfg configuration
  */
  * @param args remaining command-line arguments
  * @param cfgfile name of the configuration file used (for saving, can be NULL!)
  * @param cfg configuration
  */

-static void 
+static void

 run (void *cls,
 run (void *cls,

-     struct GNUNET_SCHEDULER_Handle * sched,

      char *const *args,
      const char *cfgfile,
      char *const *args,
      const char *cfgfile,

-     const struct GNUNET_CONFIGURATION_Handle * cfg)
+     const struct GNUNET_CONFIGURATION_Handle *cfg)

 {
 {

-  GNUNET_CORE_ClientEventHandler ch = NULL;
-  GNUNET_CORE_ClientEventHandler dh = NULL;
-  struct GNUNET_CORE_MessageHandler handlers[] = 
-    {
-      { NULL, 0, 0 }
-    };
-
-  if ( (! bootstrapping) &&
-       (! learning) &&
-       (! provide_hostlist) )
-    {
-      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);
-  if (learning)
-    {
-      /* FIXME (register handler with core for hostlist ads) */
-    }
+  struct GNUNET_MQ_MessageHandler learn_handlers[] = {
+    GNUNET_MQ_hd_var_size (advertisement,
+                           GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT,
+                           struct GNUNET_MessageHeader,
+                           NULL),
+    GNUNET_MQ_handler_end ()
+  };
+  struct GNUNET_MQ_MessageHandler no_learn_handlers[] = {
+    GNUNET_MQ_handler_end ()
+  };
+  if ((! bootstrapping) && (! 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 ("hostlist", cfg);
+  if (NULL == stats)
+  {
+    GNUNET_break (0);
+    return;
+  }

   if (bootstrapping)
   if (bootstrapping)

-    {
-      GNUNET_HOSTLIST_client_start (cfg, sched, stats,
-                                   &ch, &dh);
-    }
+    GNUNET_HOSTLIST_client_start (cfg,
+                                 stats,
+                                  &client_ch,
+                                  &client_dh,
+                                  &client_adv_handler,
+                                  learning);
+  core =
+    GNUNET_CORE_connecT (cfg,
+                        NULL,
+                        &core_init,
+                        &connect_handler,
+                        &disconnect_handler,
+                        learning ? learn_handlers : no_learn_handlers);
+
+
+#if HAVE_MHD

   if (provide_hostlist)
   if (provide_hostlist)

-    {      
-      GNUNET_HOSTLIST_server_start (cfg, sched, stats);
-    }
-  GNUNET_CORE_connect (sched, cfg,
-                      GNUNET_TIME_UNIT_FOREVER_REL,
-                      NULL,
-                      &core_init,
-                      ch, dh,
-                      NULL,
-                      NULL, GNUNET_NO,
-                      NULL, GNUNET_NO,
-                      handlers);
-  GNUNET_SCHEDULER_add_delayed (sched,
-                                GNUNET_YES,
-                                GNUNET_SCHEDULER_PRIORITY_IDLE,
-                                GNUNET_SCHEDULER_NO_TASK,
-                                GNUNET_TIME_UNIT_FOREVER_REL,
-                                &cleaning_task, NULL);
+    GNUNET_HOSTLIST_server_start (cfg,
+                                 stats,
+                                 core,
+                                 &server_ch,
+                                  advertising);
+#endif
+  GNUNET_SCHEDULER_add_shutdown (&cleaning_task,
+                                NULL);
+
+  if (NULL == core)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Failed to connect to `%s' service.\n"), "core");
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }

 }
 
 
 }
 
 


@@ -194,15 +369,41 @@ run (void *cls,
 int
 main (int argc, char *const *argv)
 {
 int
 main (int argc, char *const *argv)
 {

+  static const 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
+  };
+

   int ret;
 
   int ret;
 

-  ret = (GNUNET_OK ==
-         GNUNET_PROGRAM_run (argc,
-                             argv,
-                             "hostlist", 
-                            _("GNUnet hostlist server and client"),
-                            options,
-                            &run, NULL)) ? 0 : 1;
+  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+    return 2;
+
+  GNUNET_log_setup ("hostlist", "WARNING", NULL);
+  ret =
+      (GNUNET_OK ==
+       GNUNET_PROGRAM_run (argc, argv,
+                           "hostlist",
+                           _("GNUnet hostlist server and client"),
+                           options,
+                           &run, NULL)) ? 0 : 1;
+  GNUNET_free ((void*) argv);

   return ret;
 }
 
   return ret;
 }