- fix operation cancellation in SET

3 files changed, 38 insertions, 12 deletions

diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c
index 73d8f95cd..bb0d2ce18 100644
--- a/src/set/gnunet-service-set.c
+++ b/src/set/gnunet-service-set.c
@@ -224,6 +224,7 @@ listener_destroy (struct Listener *listener)
   {
     struct GNUNET_SERVER_Client *client = listener->client;
     listener->client = NULL;
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "disconnecting listener client\n");
     GNUNET_SERVER_client_disconnect (client);
     return;
   }
@@ -1053,24 +1054,30 @@ handle_client_cancel (void *cls,
     GNUNET_SERVER_client_disconnect (client);
     return;
   }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "client requested cancel for op %u\n", ntohl (msg->request_id));
+
   found = GNUNET_NO;
   for (op = set->ops_head; NULL != op; op = op->next)
   {
-    if (op->spec->client_request_id == msg->request_id)
+    if (op->spec->client_request_id == ntohl (msg->request_id))
     {
       found = GNUNET_YES;
       break;
     }
   }
 
-  if (GNUNET_NO == found)
-  {
-    GNUNET_break (0);
-    GNUNET_SERVER_client_disconnect (client);
-    return;
-  }
+  /* It may happen that the operation was destroyed due to
+   * the other peer disconnecting.  The client may not know about this
+   * yet and try to cancel the (non non-existent) operation.
+   */
+  if (GNUNET_NO != found)
+    _GSS_operation_destroy (op);
+  else
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "client canceled non-existent op\n");
 
-  _GSS_operation_destroy (op);
+
+  GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
 
diff --git a/src/set/set_api.c b/src/set/set_api.c
index 951ac2b5b..0c9df22e4 100644
--- a/src/set/set_api.c
+++ b/src/set/set_api.c
@@ -283,7 +283,13 @@ handle_result (void *cls, const struct GNUNET_MessageHeader *mh)
   result_status = ntohs (msg->result_status);
 
   oh = GNUNET_MQ_assoc_get (set->mq, ntohl (msg->request_id));
-  GNUNET_assert (NULL != oh);
+  // 'oh' can be NULL if we canceled the operation, but the service
+  // did not get the cancel message yet.
+  if (NULL == oh)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ignoring result from canceled operation\n");
+    return;
+  }
   /* status is not STATUS_OK => there's no attached element,
    * and this is the last result message we get */
   if (GNUNET_SET_STATUS_OK != result_status)
@@ -356,7 +362,7 @@ handle_client_listener_error (void *cls, enum GNUNET_MQ_Error error)
 {
   struct GNUNET_SET_ListenHandle *lh = cls;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "listener broke down, re-connecting\n");
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "listener broke down, re-connecting\n");
   GNUNET_CLIENT_disconnect (lh->client);
   lh->client = NULL;
   GNUNET_MQ_destroy (lh->mq);
@@ -381,6 +387,7 @@ set_destroy (struct GNUNET_SET_Handle *set)
     set->destroy_requested = GNUNET_YES;
     return GNUNET_NO;
   }
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Really destroying set\n");
   GNUNET_CLIENT_disconnect (set->client);
   set->client = NULL;
   GNUNET_MQ_destroy (set->mq);
@@ -415,16 +422,21 @@ set_operation_cancel (struct GNUNET_SET_OperationHandle *oh)
   if (NULL != oh->set)
   {
     struct GNUNET_SET_OperationHandle *h_assoc;
+    struct GNUNET_SET_CancelMessage *m;
     struct GNUNET_MQ_Envelope *mqm;
 
     GNUNET_CONTAINER_DLL_remove (oh->set->ops_head, oh->set->ops_tail, oh);
     h_assoc = GNUNET_MQ_assoc_remove (oh->set->mq, oh->request_id);
     GNUNET_assert ((h_assoc == NULL) || (h_assoc == oh));
-    mqm = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_CANCEL);
+    mqm = GNUNET_MQ_msg (m, GNUNET_MESSAGE_TYPE_SET_CANCEL);
+    m->request_id = htonl (oh->request_id);
     GNUNET_MQ_send (oh->set->mq, mqm);
 
     if (GNUNET_YES == oh->set->destroy_requested)
+    {
+      LOG (GNUNET_ERROR_TYPE_DEBUG, "destroying set after operation cancel\n");
       ret = set_destroy (oh->set);
+    }
   }
 
   GNUNET_free (oh);
@@ -451,6 +463,8 @@ handle_client_set_error (void *cls, enum GNUNET_MQ_Error error)
 {
   struct GNUNET_SET_Handle *set = cls;
 
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "handling client set error\n");
+
   while (NULL != set->ops_head)
   {
     if (NULL != set->ops_head->result_cb)
@@ -836,6 +850,7 @@ GNUNET_SET_iterate (struct GNUNET_SET_Handle *set, GNUNET_SET_ElementIterator it
 {
   struct GNUNET_MQ_Envelope *ev;
 
+
   GNUNET_assert (NULL != iter);
 
   if (GNUNET_YES == set->invalid)
@@ -843,6 +858,8 @@ GNUNET_SET_iterate (struct GNUNET_SET_Handle *set, GNUNET_SET_ElementIterator it
   if (NULL != set->iterator)
     return GNUNET_NO;
 
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "iterating set\n");
+
   set->iterator = iter;
   set->iterator_cls = cls;
   ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_ITER_REQUEST);
diff --git a/src/set/test_set_api.c b/src/set/test_set_api.c
index ec5226d50..d2a0262c8 100644
--- a/src/set/test_set_api.c
+++ b/src/set/test_set_api.c
@@ -241,7 +241,9 @@ run (void *cls,
   set2 = GNUNET_SET_create (cfg, GNUNET_SET_OPERATION_UNION);
   GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, &app_id);
 
-  /* test if canceling an uncommited request works! */
+
+
+  ///* test if canceling an uncommited request works! */
   my_oh = GNUNET_SET_prepare (&local_id, &app_id, NULL, 0,
                               GNUNET_SET_RESULT_ADDED, NULL, NULL);