-doxygen, style, possibly fixing hostlist-client missing first core connect notification

[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 c49aec765a417f04ac312dbd89f8f998f0d8daaf..b83356d101ed7f068359f2b64d70c65d7711427c 100644 (file)
--- a/src/hostlist/gnunet-daemon-hostlist.c
+++ b/src/hostlist/gnunet-daemon-hostlist.c
@@ -28,13 +28,9 @@
 #include "platform.h"
 #include "hostlist-client.h"
 #include "gnunet_core_service.h"
-#include "gnunet_getopt_lib.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
-#include "gnunet_program_lib.h"
 #include "gnunet_statistics_service.h"
-#include "gnunet_strings_lib.h"
-#include "gnunet_time_lib.h"
-#include "gnunet_util_lib.h"
 
 #if HAVE_MHD
 
@@ -99,6 +95,8 @@ static GNUNET_CORE_ConnectEventHandler client_ch;
  */
 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
@@ -123,60 +121,62 @@ struct GNUNET_HOSTLIST_ADV_Message
    */
   uint32_t reserved GNUNET_PACKED;
 };
-
+GNUNET_NETWORK_STRUCT_END
 
 static struct GNUNET_PeerIdentity me;
 
+
 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)
 {
   me = *my_identity;
 }
 
+
 /**
  * Core handler for p2p hostlist advertisements
+ *
+ * @param cls closure
+ * @param peer identity of the sender
+ * @param message advertisement message we got
+ * @return #GNUNET_OK on success
  */
 static int
-advertisement_handler (void *cls,
-                       const struct GNUNET_PeerIdentity *peer,
-                       const struct GNUNET_MessageHeader *message,
-                       const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+advertisement_handler (void *cls, const struct GNUNET_PeerIdentity *peer,
+                       const struct GNUNET_MessageHeader *message)
 {
   GNUNET_assert (NULL != client_adv_handler);
-  return (*client_adv_handler) (cls, peer, message, atsi);
+  return (*client_adv_handler) (cls, peer, message);
 }
 
 
 /**
- * Method called whenever a given peer connects.  Wrapper to call both client's and server's functions
+ * 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 atsi performance data
  */
 static void
-connect_handler (void *cls,
-                 const struct
-                 GNUNET_PeerIdentity *peer,
-                 const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
   if (0 == memcmp (&me, peer, sizeof (struct GNUNET_PeerIdentity)))
     return;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "A new peer connected, notifying client and server\n");
   if (NULL != client_ch)
-    (*client_ch) (cls, peer, atsi);
+    (*client_ch) (cls, peer);
 #if HAVE_MHD
   if (NULL != server_ch)
-    (*server_ch) (cls, peer, atsi);
+    (*server_ch) (cls, peer);
 #endif
 }
 
+
 /**
- * Method called whenever a given peer disconnects. Wrapper to call both client's and server's functions
+ * 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
@@ -196,6 +196,7 @@ disconnect_handler (void *cls, const struct GNUNET_PeerIdentity *peer)
 #endif
 }
 
+
 /**
  * Last task run during shutdown.  Disconnects us from
  * the other services.
@@ -203,7 +204,8 @@ disconnect_handler (void *cls, const struct GNUNET_PeerIdentity *peer)
 static void
 cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Hostlist daemon is shutting down\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+             "Hostlist daemon is shutting down\n");
   if (core != NULL)
   {
     GNUNET_CORE_disconnect (core);
@@ -236,9 +238,8 @@ cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * @param cfg configuration
  */
 static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   static const struct GNUNET_CORE_MessageHandler learn_handlers[] = {
     {&advertisement_handler, GNUNET_MESSAGE_TYPE_HOSTLIST_ADVERTISEMENT, 0},
@@ -258,36 +259,28 @@ run (void *cls,
                 ("None of the functions for the hostlist daemon were enabled.  I have no reason to run!\n"));
     return;
   }
-
-
-
   stats = GNUNET_STATISTICS_create ("hostlist", cfg);
-
-  core = GNUNET_CORE_connect (cfg,
-                              1,
-                              NULL,
-                              &core_init,
-                              &connect_handler, &disconnect_handler, NULL,
-                              NULL, GNUNET_NO,
-                              NULL, GNUNET_NO,
-                              learning ? learn_handlers : no_learn_handlers);
-
   if (bootstrapping)
-  {
-    GNUNET_HOSTLIST_client_start (cfg, stats,
-                                  &client_ch, &client_dh, &client_adv_handler,
-                                  learning);
-  }
+    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, NULL, 
+                        GNUNET_NO, NULL,
+                        GNUNET_NO,
+                        learning ? learn_handlers : no_learn_handlers);
+
 
 #if HAVE_MHD
   if (provide_hostlist)
-  {
     GNUNET_HOSTLIST_server_start (cfg, stats, core, &server_ch, &server_dh,
                                   advertising);
-  }
 #endif
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                &cleaning_task, NULL);
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, 
+                               &cleaning_task,
+                                NULL);
 
   if (NULL == core)
   {
@@ -332,14 +325,16 @@ main (int argc, char *const *argv)
 
   int ret;
 
-  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;
+  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;
 }