Merge remote-tracking branch 'origin/master' into credentials

diff --git a/src/multicast/Makefile.am b/src/multicast/Makefile.am
index a4054f5f697d0b78a65c346243bf15a1443957bf..a680a9d5a59e7d946c84d86603dcc23cf3e7dbb8 100644 (file)
--- a/src/multicast/Makefile.am
+++ b/src/multicast/Makefile.am
@@ -19,8 +19,7 @@ endif
 lib_LTLIBRARIES = libgnunetmulticast.la
 
 libgnunetmulticast_la_SOURCES = \
-  multicast_api.c \
-  multicast.h
+  multicast_api.c
 libgnunetmulticast_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL) $(XLIB)

diff --git a/src/multicast/test_multicast.conf b/src/multicast/test_multicast.conf
index 3dc96adbbb6e60beee5cfa4e2129bf611c934dd6..8e80650db04e9d79de6d3641da5b5358f67df921 100644 (file)
--- a/src/multicast/test_multicast.conf
+++ b/src/multicast/test_multicast.conf
@@ -1,12 +1,12 @@
 [testbed]
 HOSTNAME = localhost
-#OVERLAY_TOPOLOGY = LINE
+OVERLAY_TOPOLOGY = STAR
 
 [arm]
 GLOBAL_POSTFIX=-L ERROR
 
 [hostlist]
-SERVERS = http://localhost:8080/
+SERVERS =
 
 [multicast]
 #PREFIX = tmux split-window -v gdb -x ./cmd.gdb  --args

diff --git a/src/set/set_api.c b/src/set/set_api.c
index 27e2ccf04b0dc94051e87e15a0c6bca147bfba22..1d0d00b4458b0c0462c199db9e8cd9ca95e6e4fb 100644 (file)
--- a/src/set/set_api.c
+++ b/src/set/set_api.c
@@ -497,7 +497,8 @@ set_operation_destroy (struct GNUNET_SET_OperationHandle *oh)
                                  oh);
     h_assoc = GNUNET_MQ_assoc_remove (set->mq,
                                       oh->request_id);
-    GNUNET_assert ((NULL == h_assoc) || (h_assoc == oh));
+    GNUNET_assert ( (NULL == h_assoc) ||
+                   (h_assoc == oh) );
   }
   GNUNET_free (oh);
 }
@@ -556,7 +557,8 @@ handle_client_set_error (void *cls,
        error);
   while (NULL != set->ops_head)
   {
-    if (NULL != set->ops_head->result_cb)
+    if ( (NULL != set->ops_head->result_cb) &&
+        (GNUNET_NO == set->destroy_requested) )
       set->ops_head->result_cb (set->ops_head->result_cls,
                                 NULL,
                                 0,