21 files changed, 22 insertions, 71 deletions

diff --git a/src/cli/meson.build b/src/cli/meson.build
index cfaceab74..5c1fded1a 100644
--- a/src/cli/meson.build
+++ b/src/cli/meson.build
@@ -1,7 +1,5 @@
 subdir('util')
-if get_option('monolith') == false
-  subdir('arm')
-endif
+subdir('arm')
 subdir('statistics')
 subdir('datastore')
 subdir('nat')
diff --git a/src/contrib/service/consensus/meson.build b/src/contrib/service/consensus/meson.build
index b66acf2b9..50483e81f 100644
--- a/src/contrib/service/consensus/meson.build
+++ b/src/contrib/service/consensus/meson.build
@@ -13,7 +13,6 @@ if get_option('monolith')
   #foreach p : libgnunetconsensus_src + gnunetserviceconsensus_src
   #  gnunet_src += 'consensus/' + p
   #endforeach
-  subdir_done()
 endif
 
 libgnunetconsensus = shared_library('gnunetconsensus',
diff --git a/src/contrib/service/conversation/meson.build b/src/contrib/service/conversation/meson.build
index b3fb070d9..a7f1ee896 100644
--- a/src/contrib/service/conversation/meson.build
+++ b/src/contrib/service/conversation/meson.build
@@ -15,7 +15,6 @@ if get_option('monolith')
   foreach p : libgnunetconversation_src + gnunetserviceconversation_src
     gnunet_src += 'conversation/' + p
   endforeach
-  subdir_done()
 endif
 
 libgnunetmicrophone = library('gnunetmicrophone',
diff --git a/src/contrib/service/scalarproduct/meson.build b/src/contrib/service/scalarproduct/meson.build
index 296734c2c..a3d24cfa9 100644
--- a/src/contrib/service/scalarproduct/meson.build
+++ b/src/contrib/service/scalarproduct/meson.build
@@ -16,7 +16,6 @@ if get_option('monolith')
   foreach p : libgnunetscalarproduct_src + gnunetservicescalarproducta_src + gnunetservicescalarproductb_src + gnunetservicescalarproductecca_src + gnunetservicescalarproducteccb_src
     gnunet_src += 'scalarproduct/' + p
   endforeach
-  subdir_done()
 endif
 
 libgnunetscalarproduct = library('gnunetscalarproduct',
diff --git a/src/contrib/service/secretsharing/meson.build b/src/contrib/service/secretsharing/meson.build
index bfd66dddb..5f9935793 100644
--- a/src/contrib/service/secretsharing/meson.build
+++ b/src/contrib/service/secretsharing/meson.build
@@ -13,7 +13,6 @@ if get_option('monolith')
   #foreach p : libgnunetsecretsharing_src + gnunetservicesecretsharing_src
   #  gnunet_src += 'secretsharing/' + p
   #endforeach
-  subdir_done()
 endif
 
 libgnunetsecretsharing = library('gnunetsecretsharing',
diff --git a/src/contrib/service/set/meson.build b/src/contrib/service/set/meson.build
index fe4934cb9..153c16ac5 100644
--- a/src/contrib/service/set/meson.build
+++ b/src/contrib/service/set/meson.build
@@ -13,13 +13,6 @@ configure_file(input : 'set.conf.in',
                install_dir: pkgcfgdir)
 
 
-if get_option('monolith')
-  #foreach p : libgnunetset_src + gnunetserviceset_src
-  #  gnunet_src += 'set/' + p
-  #endforeach
-  subdir_done()
-endif
-
 libgnunetset = library('gnunetset',
         libgnunetset_src,
         soversion: '0',
diff --git a/src/include/meson.build b/src/include/meson.build
index 9a2483db5..57216c178 100644
--- a/src/include/meson.build
+++ b/src/include/meson.build
@@ -49,7 +49,6 @@ install_headers(
   'gnunet_gnsrecord_json_lib.h',
   'gnunet_gnsrecord_plugin.h',
   'gnu_name_system_record_types.h',
-  'gnunet_hello_lib.h',
   'gnunet_hello_uri_lib.h',
   'gnunet_helper_lib.h',
   'gnunet_identity_service.h',
@@ -115,7 +114,6 @@ install_headers(
   'gnunet_transport_application_service.h',
   'gnunet_transport_communication_service.h',
   'gnunet_transport_core_service.h',
-  'gnunet_transport_hello_service.h',
   'gnunet_transport_monitor_service.h',
   'gnunet_tun_lib.h',
   'gnunet_uri_lib.h',
diff --git a/src/lib/hello/Makefile.am b/src/lib/hello/Makefile.am
index cbc193a0a..c7b3e4a05 100644
--- a/src/lib/hello/Makefile.am
+++ b/src/lib/hello/Makefile.am
@@ -18,38 +18,16 @@ libgnunethello_la_LDFLAGS = \
   -version-info 1:0:1
 
 check_PROGRAMS = \
- test_hello \
- test_hello-uri \
- test_friend_hello \
- test_hello-ng
+ test_hello-uri
 
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 
-test_hello_SOURCES = \
- test_hello.c
-test_hello_LDADD = \
- libgnunethello.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_hello_ng_SOURCES = \
- test_hello-ng.c
-test_hello_ng_LDADD = \
- libgnunethello.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
 test_hello_uri_SOURCES = \
  test_hello-uri.c
 test_hello_uri_LDADD = \
  libgnunethello.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  -lgcrypt
-
-
-test_friend_hello_SOURCES = \
- test_friend_hello.c
-test_friend_hello_LDADD = \
- libgnunethello.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/lib/hello/meson.build b/src/lib/hello/meson.build
index 1986316ac..30e0f4c9c 100644
--- a/src/lib/hello/meson.build
+++ b/src/lib/hello/meson.build
@@ -1,7 +1,4 @@
-libgnunethello_src = [#'hello.c',
-                      'address.c',
-                      'hello-ng.c',
-                      'hello-uri.c']
+libgnunethello_src = ['hello-uri.c']
 
 libgnunethello = library('gnunethello',
         libgnunethello_src,
diff --git a/src/lib/hello/test_hello-uri.c b/src/lib/hello/test_hello-uri.c
index 1062f446b..bebed671b 100644
--- a/src/lib/hello/test_hello-uri.c
+++ b/src/lib/hello/test_hello-uri.c
@@ -22,6 +22,7 @@
  * @brief test for helper library for handling URI-based HELLOs
  * @author Christian Grothoff
  */
+#include "gnunet_time_lib.h"
 #include "platform.h"
 #include "gnunet_signatures.h"
 #include "gnunet_hello_uri_lib.h"
@@ -96,13 +97,13 @@ main (int argc,
                                                   &priv,
                                                   NULL,
                                                   &block_size,
-                                                  NULL));
+                                                  GNUNET_TIME_UNIT_FOREVER_REL));
     GNUNET_assert (GNUNET_NO ==
                    GNUNET_HELLO_builder_to_block (b,
                                                   &priv,
                                                   NULL,
                                                   &block_size,
-                                                  NULL));
+                                                  GNUNET_TIME_UNIT_FOREVER_REL));
     GNUNET_assert (0 != block_size);
     block = GNUNET_malloc (block_size);
     GNUNET_assert (GNUNET_OK ==
@@ -110,7 +111,7 @@ main (int argc,
                                                   &priv,
                                                   block,
                                                   &block_size,
-                                                  NULL));
+                                                  GNUNET_TIME_UNIT_FOREVER_REL));
     b2 = GNUNET_HELLO_builder_from_block (block,
                                           block_size);
     GNUNET_free (block);
@@ -158,7 +159,7 @@ main (int argc,
 
     env = GNUNET_HELLO_builder_to_env (b,
                                        &priv,
-                                       NULL);
+                                       GNUNET_TIME_UNIT_FOREVER_REL);
     b2 = GNUNET_HELLO_builder_from_msg (GNUNET_MQ_env_get_msg (env));
     GNUNET_free (env);
     GNUNET_assert (NULL != b2);
diff --git a/src/service/dhtu/meson.build b/src/service/dhtu/meson.build
index b2525e782..a3c5b0e0a 100644
--- a/src/service/dhtu/meson.build
+++ b/src/service/dhtu/meson.build
@@ -11,7 +11,6 @@ if get_option('monolith')
   foreach p : libgnunetplugindhtuip_src + libgnunetplugindhtugnunet_src
     gnunet_src += 'dhtu/' + p
   endforeach
-  subdir_done()
 endif
 
 libgnunettestingdhtu = library('gnunettestingdhtu',
@@ -42,6 +41,7 @@ shared_module('gnunet_plugin_dhtu_gnunet',
                          libgnunetcore_dep,
                          libgnunethello_dep,
                          libgnunetpeerstore_dep,
+                         libgnunettransportapplication_dep,
                          libgnunetnse_dep,
                          ],
           include_directories: [incdir, configuration_inc],
diff --git a/src/service/exit/meson.build b/src/service/exit/meson.build
index e75f2b080..8656986e1 100644
--- a/src/service/exit/meson.build
+++ b/src/service/exit/meson.build
@@ -5,11 +5,7 @@ configure_file(input : 'exit.conf',
                install_dir: pkgcfgdir)
 
 
-if get_option('monolith')
-  subdir_done()
-endif
-
-if host_machine.system() == 'linux' 
+if host_machine.system() == 'linux'
   executable ('gnunet-helper-exit',
               ['gnunet-helper-exit.c'],
             include_directories: [incdir, configuration_inc],
diff --git a/src/service/hostlist/gnunet-daemon-hostlist_client.c b/src/service/hostlist/gnunet-daemon-hostlist_client.c
index 75b497d14..5a61e62c2 100644
--- a/src/service/hostlist/gnunet-daemon-hostlist_client.c
+++ b/src/service/hostlist/gnunet-daemon-hostlist_client.c
@@ -1760,7 +1760,7 @@ void
 GNUNET_HOSTLIST_client_stop ()
 {
   struct GNUNET_PEERSTORE_StoreHelloContext *pos;
-  
+
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Hostlist client shutdown\n");
   while (NULL != (pos = shc_head))
   {
diff --git a/src/service/hostlist/meson.build b/src/service/hostlist/meson.build
index c05578334..01e7ecc01 100644
--- a/src/service/hostlist/meson.build
+++ b/src/service/hostlist/meson.build
@@ -9,9 +9,6 @@ configure_file(input : 'hostlist.conf',
                install_dir: pkgcfgdir)
 
 
-if get_option('monolith')
-  subdir_done()
-endif
 executable ('gnunet-daemon-hostlist',
             gnunetdaemonhostlist_src,
             dependencies: [libgnunetutil_dep,
diff --git a/src/service/pt/meson.build b/src/service/pt/meson.build
index 0b6cc1818..2fdb1c7fa 100644
--- a/src/service/pt/meson.build
+++ b/src/service/pt/meson.build
@@ -5,10 +5,6 @@ configure_file(input : 'pt.conf',
                install_dir: pkgcfgdir)
 
 
-if get_option('monolith')
-  subdir_done()
-endif
-
 executable ('gnunet-daemon-pt',
             ['gnunet-daemon-pt.c'],
             dependencies: [libgnunetdns_dep,
diff --git a/src/service/rest/gnunet-rest-server.c b/src/service/rest/gnunet-rest-server.c
index ce81704ae..7cc4025b0 100644
--- a/src/service/rest/gnunet-rest-server.c
+++ b/src/service/rest/gnunet-rest-server.c
@@ -34,7 +34,7 @@
 #include "identity_plugin.h"
 #include "namestore_plugin.h"
 #include "gns_plugin.h"
-#ifdef HAVE_JOSE
+#if HAVE_JOSE
 #include "openid_plugin.h"
 #endif
 #include "reclaim_plugin.h"
@@ -265,7 +265,7 @@ struct GNUNET_REST_Plugin *copying_plugin;
 struct GNUNET_REST_Plugin *identity_plugin;
 struct GNUNET_REST_Plugin *namestore_plugin;
 struct GNUNET_REST_Plugin *gns_plugin;
-#ifdef HAVE_JOSE
+#if HAVE_JOSE
 struct GNUNET_REST_Plugin *openid_plugin;
 #endif
 struct GNUNET_REST_Plugin *reclaim_plugin;
@@ -1020,7 +1020,7 @@ do_shutdown (void *cls)
   REST_copying_done (copying_plugin);
   REST_identity_done (identity_plugin);
   REST_gns_done (gns_plugin);
-#ifdef HAVE_JOSE
+#if HAVE_JOSE
   REST_openid_done (openid_plugin);
 #endif
   REST_reclaim_done (reclaim_plugin);
@@ -1403,7 +1403,7 @@ run (void *cls,
   {
     GNUNET_SCHEDULER_shutdown ();
   }
-#ifdef HAVE_JOSE
+#if HAVE_JOSE
   struct GNUNET_REST_Plugin *openid_plugin = REST_openid_init (cfg);
   if (GNUNET_OK != setup_plugin (openid_plugin->name, &REST_openid_process_request, openid_plugin))
   {
diff --git a/src/service/rest/meson.build b/src/service/rest/meson.build
index 347cbb852..1ccb89796 100644
--- a/src/service/rest/meson.build
+++ b/src/service/rest/meson.build
@@ -6,12 +6,14 @@ gnunetservicerest_src = ['gnunet-rest-server.c',
                          'identity_plugin.c',
                          'namestore_plugin.c',
                          'gns_plugin.c',
-                         'openid_plugin.c',
-                         'oidc_helper.c',
                          'json_reclaim.c',
                          'reclaim_plugin.c',
                          ]
 
+if jose_dep.found()
+  gnunetservicerest_src += ['oidc_helper.c', 'openid_plugin.c']
+endif
+
 configure_file(input : 'rest.conf',
                output : 'rest.conf',
                configuration : cdata,
diff --git a/src/service/topology/meson.build b/src/service/topology/meson.build
index b196d98f2..33b704b41 100644
--- a/src/service/topology/meson.build
+++ b/src/service/topology/meson.build
@@ -13,7 +13,6 @@ if get_option('monolith')
   foreach p : libgnunetfriends_src
     gnunet_src += 'topology/' + p
   endforeach
-  subdir_done()
 endif
 
 libgnunetfriends = library('gnunetfriends',
diff --git a/src/service/transport/gnunet-service-transport.c b/src/service/transport/gnunet-service-transport.c
index bb11da1cc..54d42fd51 100644
--- a/src/service/transport/gnunet-service-transport.c
+++ b/src/service/transport/gnunet-service-transport.c
@@ -3892,6 +3892,8 @@ free_address_list_entry (struct AddressListEntry *ale)
     GNUNET_SCHEDULER_cancel (ale->st);
     ale->st = NULL;
   }
+  if (NULL != ale->signed_address)
+    GNUNET_free (ale->signed_address);
   GNUNET_free (ale);
 }
 
@@ -5506,8 +5508,6 @@ shc_cont (void *cls, int success)
                                     GNUNET_PEERSTORE_STOREOPTION_MULTIPLE,
                                     &peerstore_store_own_cb,
                                     ale);
-  GNUNET_free (ale->signed_address);
-  GNUNET_free (ale);
 }
 
 
diff --git a/src/service/transport/transport-testing-communicator.c b/src/service/transport/transport-testing-communicator.c
index 168b29ce5..107051241 100644
--- a/src/service/transport/transport-testing-communicator.c
+++ b/src/service/transport/transport-testing-communicator.c
@@ -31,6 +31,7 @@
 #include "transport-testing-communicator.h"
 #include "gnunet_signatures.h"
 #include "transport.h"
+#include "gnunet_hello_uri_lib.h"
 #include <inttypes.h>
 
 #define LOG(kind, ...) GNUNET_log_from (kind, "transport-testing2", __VA_ARGS__)
diff --git a/src/service/zonemaster/meson.build b/src/service/zonemaster/meson.build
index 44c67edf2..92333ac8d 100644
--- a/src/service/zonemaster/meson.build
+++ b/src/service/zonemaster/meson.build
@@ -11,7 +11,6 @@ if get_option('monolith')
   foreach p : gnunetservicezonemaster_src
     gnunet_src += 'zonemaster/' + p
   endforeach
-  subdir_done()
 endif
 
 executable ('gnunet-service-zonemaster',