[GNUnet-SVN] r11019 - in gnunet/src: . hostlist

[gnunet]

Author: grothoff
Date: 2010-04-22 10:29:36 +0200 (Thu, 22 Apr 2010)
New Revision: 11019

Modified:
   gnunet/src/Makefile.am
   gnunet/src/hostlist/Makefile.am
   gnunet/src/hostlist/gnunet-daemon-hostlist.c
Log:
create hostlist client if we have no MHD

Modified: gnunet/src/Makefile.am
===================================================================
--- gnunet/src/Makefile.am      2010-04-22 07:37:22 UTC (rev 11018)
+++ gnunet/src/Makefile.am      2010-04-22 08:29:36 UTC (rev 11019)
@@ -2,11 +2,6 @@
 #  INTLEMU_SUBDIRS = intlemu
 #endif
 
-
-if HAVE_MHD
- HOSTLIST_DIR = hostlist
-endif
-
 if !MINGW
  NAT_DIR = nat
 endif
@@ -25,7 +20,7 @@
   peerinfo-tool \
   core \
   testing \
-  $(HOSTLIST_DIR) \
+  hostlist \
   topology \
   $(NAT_DIR) \
   fs

Modified: gnunet/src/hostlist/Makefile.am
===================================================================
--- gnunet/src/hostlist/Makefile.am     2010-04-22 07:37:22 UTC (rev 11018)
+++ gnunet/src/hostlist/Makefile.am     2010-04-22 08:29:36 UTC (rev 11019)
@@ -4,6 +4,10 @@
   AM_CFLAGS = --coverage -O0
 endif
 
+if HAVE_MHD
+ HOSTLIST_SERVER_SOURCES =  hostlist-server.c hostlist-server.h 
+ GN_LIBMHD = -lmicrohttpd
+endif
 
 bin_PROGRAMS = \
  gnunet-daemon-hostlist
@@ -11,7 +15,7 @@
 gnunet_daemon_hostlist_SOURCES = \
  gnunet-daemon-hostlist.c gnunet-daemon-hostlist.h \
  hostlist-client.c hostlist-client.h \
- hostlist-server.c hostlist-server.h 
+ $(HOSTLIST_SERVER_SOURCES)
 
 gnunet_daemon_hostlist_LDADD = \
   $(top_builddir)/src/core/libgnunetcore.la \
@@ -20,7 +24,7 @@
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/util/libgnunetutil.la \
-  -lmicrohttpd \
+  $(GN_LIBMHD) \
   @LIBCURL@ \
   $(GN_LIBINTL)
 
@@ -31,9 +35,10 @@
  test_gnunet_daemon_hostlist \
  test_gnunet_daemon_hostlist_learning
 
-
+if HAVE_MHD
 TESTS = test_gnunet_daemon_hostlist \
  test_gnunet_daemon_hostlist_learning
+endif
 
 test_gnunet_daemon_hostlist_SOURCES = \
  test_gnunet_daemon_hostlist.c
@@ -48,7 +53,7 @@
   $(top_builddir)/src/transport/libgnunettransport.la \
   $(top_builddir)/src/arm/libgnunetarm.la \
   $(top_builddir)/src/core/libgnunetcore.la \
-  $(top_builddir)/src/statistics/libgnunetstatistics.la \  
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la  
 
 EXTRA_DIST = \

Modified: gnunet/src/hostlist/gnunet-daemon-hostlist.c
===================================================================
--- gnunet/src/hostlist/gnunet-daemon-hostlist.c        2010-04-22 07:37:22 UTC 
(rev 11018)
+++ gnunet/src/hostlist/gnunet-daemon-hostlist.c        2010-04-22 08:29:36 UTC 
(rev 11019)
@@ -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,12 +36,33 @@
 #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.
  */
@@ -60,11 +75,6 @@
 static int learning;
 
 /**
- * Set if the user wants us to run a hostlist server.
- */
-static int provide_hostlist;
-
-/**
  * Statistics handle.
  */
 static struct GNUNET_STATISTICS_Handle *stats;
@@ -90,31 +100,25 @@
 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,12 @@
           GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *
           publicKey)
 {
+#if HAVE_MHD
   if (advertising && (NULL != server))
     {    
       /* FIXME: provide "server" to 'hostlist' module */
     }
+#endif
 }
 
 /**
@@ -192,8 +198,10 @@
               "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
 }
 
 /**
@@ -211,10 +219,11 @@
   /* 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
 }
 
 /**
@@ -230,10 +239,12 @@
     {
       GNUNET_HOSTLIST_client_stop ();
     }
+#if HAVE_MHD
   if (provide_hostlist)
     {      
       GNUNET_HOSTLIST_server_stop ();
     }
+#endif
   if (core != NULL)
     {
       GNUNET_CORE_disconnect (core);
@@ -281,8 +292,11 @@
      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"));
@@ -304,11 +318,12 @@
       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);