-use keep as RC to address #3561

4 files changed, 12 insertions, 9 deletions

diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c
index c40ac9c53..746a9da02 100644
--- a/src/set/gnunet-service-set.c
+++ b/src/set/gnunet-service-set.c
@@ -1388,6 +1388,7 @@ channel_end_cb (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "channel_end_cb called\n");
   op->channel = NULL;
+  op->keep++;
   /* the vt can be null if a client already requested canceling op. */
   if (NULL != op->vt)
   {
@@ -1395,7 +1396,8 @@ channel_end_cb (void *cls,
                 "calling peer disconnect due to channel end\n");
     op->vt->peer_disconnect (op);
   }
-  if (GNUNET_YES != op->keep)
+  op->keep--;
+  if (0 == op->keep)
   {
     /* cadet will never call us with the context again! */
     GNUNET_free (op);
diff --git a/src/set/gnunet-service-set.h b/src/set/gnunet-service-set.h
index ab8155883..b2904dc06 100644
--- a/src/set/gnunet-service-set.h
+++ b/src/set/gnunet-service-set.h
@@ -388,10 +388,11 @@ struct Operation
   unsigned int generation_created;
 
   /**
-   * Set to #GNUNET_YES if the set service should not free the
-   * operation, as it is still needed (e.g. in some scheduled task).
+   * Incremented whenever (during shutdown) some component still
+   * needs to do something with this before the operation is freed.
+   * (Used as a reference counter, but only during termination.)
    */
-  int keep;
+  unsigned int keep;
 };
 
 
diff --git a/src/set/gnunet-service-set_intersection.c b/src/set/gnunet-service-set_intersection.c
index ceb6a3ccb..ed21cd1bb 100644
--- a/src/set/gnunet-service-set_intersection.c
+++ b/src/set/gnunet-service-set_intersection.c
@@ -549,7 +549,7 @@ send_remaining_elements (void *cls)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Sending done and destroy because iterator ran out\n");
-    op->keep = GNUNET_NO;
+    op->keep--;
     send_client_done_and_destroy (op);
     return;
   }
@@ -907,7 +907,7 @@ finish_and_destroy (struct Operation *op)
                 GNUNET_CONTAINER_multihashmap_size (op->state->my_elements));
     op->state->full_result_iter
       = GNUNET_CONTAINER_multihashmap_iterator_create (op->state->my_elements);
-    op->keep = GNUNET_YES;
+    op->keep++;
     send_remaining_elements (op);
     return;
   }
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c
index 459996eca..53c5ef43c 100644
--- a/src/set/gnunet-service-set_union.c
+++ b/src/set/gnunet-service-set_union.c
@@ -994,7 +994,6 @@ send_done_and_destroy (void *cls)
   struct Operation *op = cls;
   struct GNUNET_MQ_Envelope *ev;
   struct GNUNET_SET_ResultMessage *rm;
-  int keep = op->keep;
 
   ev = GNUNET_MQ_msg (rm, GNUNET_MESSAGE_TYPE_SET_RESULT);
   rm->request_id = htonl (op->spec->client_request_id);
@@ -1002,7 +1001,8 @@ send_done_and_destroy (void *cls)
   rm->element_type = htons (0);
   GNUNET_MQ_send (op->spec->set->client_mq, ev);
   _GSS_operation_destroy (op, GNUNET_YES);
-  if (GNUNET_YES == keep)
+  op->keep--;
+  if (0 == op->keep)
     GNUNET_free (op);
 }
 
@@ -1081,7 +1081,7 @@ finish_and_destroy (struct Operation *op)
   if (GNUNET_SET_RESULT_FULL == op->spec->result_mode)
   {
     /* prevent that the op is free'd by the tunnel end handler */
-    op->keep = GNUNET_YES;
+    op->keep++;
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "sending full result set\n");
     GNUNET_assert (NULL == op->state->full_result_iter);