Merge branch 'master' into dev/thejackimonster/messengerdev/thejackimonster/messenger

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

4 files changed, 5 insertions, 26 deletions

diff --git a/src/service/cadet/.gitignore b/src/service/cadet/.gitignore
index e72d81bd8..bed27a3d3 100644
--- a/src/service/cadet/.gitignore
+++ b/src/service/cadet/.gitignore
@@ -1,27 +1,2 @@
 gnunet-service-cadet
-gnunet-cadet
-gnunet-cadet-profiler
-test_cadet_2_forward
-test_cadet_2_keepalive
-test_cadet_2_signal
-test_cadet_2_speed
-test_cadet_2_speed_ack
-test_cadet_2_speed_backwards
-test_cadet_2_speed_reliable
-test_cadet_2_speed_reliable_backwards
-test_cadet_5_forward
-test_cadet_5_keepalive
-test_cadet_5_signal
-test_cadet_5_speed
-test_cadet_5_speed_ack
-test_cadet_5_speed_backwards
-test_cadet_5_speed_reliable
-test_cadet_5_speed_reliable_backwards
-test_cadet_local
-test_cadet_single
-gnunet-service-cadet-new
 test_cadet_local_mq
-test_cadet_*_newtest_cadet_2_reopen
-test_cadet_5_reopen
-test_cadet_2_reopen
-test_cadet_2_destroy
diff --git a/src/service/cadet/gnunet-service-cadet_dht.c b/src/service/cadet/gnunet-service-cadet_dht.c
index 28b5448fd..dcd1efaa2 100644
--- a/src/service/cadet/gnunet-service-cadet_dht.c
+++ b/src/service/cadet/gnunet-service-cadet_dht.c
@@ -217,6 +217,7 @@ announce_id (void *cls)
                   expiration,  /* Data expiration */
                   NULL,         /* Continuation */
                   NULL);        /* Continuation closure */
+  GNUNET_free (block);
 }
 
 
diff --git a/src/service/cadet/gnunet-service-cadet_hello.c b/src/service/cadet/gnunet-service-cadet_hello.c
index cc28f0fde..889f3d588 100644
--- a/src/service/cadet/gnunet-service-cadet_hello.c
+++ b/src/service/cadet/gnunet-service-cadet_hello.c
@@ -24,7 +24,6 @@
  * @author Bartlomiej Polot
  * @author Christian Grothoff
  */
-#include "gnunet_common.h"
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/service/cadet/meson.build b/src/service/cadet/meson.build
index 0f465e0e2..d49dcdd2a 100644
--- a/src/service/cadet/meson.build
+++ b/src/service/cadet/meson.build
@@ -57,6 +57,8 @@ executable ('gnunet-service-cadet',
             install: true,
             install_dir: get_option('libdir') / 'gnunet' / 'libexec')
 
+if false
+
 testcadetlocalmq = executable ('test_cadet_local_mq',
             ['test_cadet_local_mq.c'],
             dependencies: [libgnunetcadet_dep,
@@ -70,3 +72,5 @@ configure_file(input : 'test_cadet.conf',
                install: false)
 test('test_cadet_local_mq', testcadetlocalmq, workdir: meson.current_build_dir(), suite: 'cadet')
 
+
+endif
\ No newline at end of file