- call operation_done on testbed operations in profiler

- destroy consensus handles in secretsharing service correctly

3 files changed, 127 insertions, 30 deletions

diff --git a/src/secretsharing/gnunet-secretsharing-profiler.c b/src/secretsharing/gnunet-secretsharing-profiler.c
index 7f118c6f0..5dc649178 100644
--- a/src/secretsharing/gnunet-secretsharing-profiler.c
+++ b/src/secretsharing/gnunet-secretsharing-profiler.c
@@ -67,15 +67,15 @@ static struct GNUNET_SECRETSHARING_Share **shares;
 
 static struct GNUNET_SECRETSHARING_PublicKey common_pubkey;
 
-/**
- * ???
- */
-static struct GNUNET_TESTBED_Operation **testbed_operations;
 
 static unsigned int num_connected_sessions;
 
 static unsigned int num_connected_decrypt;
 
+/**
+ * Handles to the running peers.
+ * When peers[i] is NULL, the i-th peer has stopped.
+ */
 static struct GNUNET_TESTBED_Peer **peers;
 
 static struct GNUNET_PeerIdentity *peer_ids;
@@ -103,6 +103,16 @@ static struct GNUNET_TIME_Absolute decrypt_start;
 
 static struct GNUNET_TIME_Absolute decrypt_deadline;
 
+/**
+ * Connect operations, one for every peer.
+ */
+static struct GNUNET_TESTBED_Operation **connect_ops;
+
+/**
+ * Are we performing a shutdown right now?
+ */
+static int in_shutdown;
+
 
 /**
  * Signature of the event handler function called by the
@@ -208,6 +218,11 @@ static void decrypt_cb (void *cls,
 
   *dhp = NULL;
 
+  // we should still be connected if this is called
+  GNUNET_assert (NULL != connect_ops[n]);
+
+  GNUNET_TESTBED_operation_done (connect_ops[n]);
+
   if (NULL == plaintext)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "decrypt failed for peer %u\n", n);
@@ -269,11 +284,18 @@ static void
 decrypt_disconnect_adapter(void *cls, void *op_result)
 {
   struct GNUNET_SECRETSHARING_DecryptionHandle **dh = cls;
+  unsigned int n = dh - decrypt_handles;
+
+  GNUNET_assert (*dh == decrypt_handles[n]);
+
   if (NULL != *dh)
   {
     GNUNET_SECRETSHARING_decrypt_cancel (*dh);
     *dh = NULL;
   }
+
+  GNUNET_assert (NULL == connect_ops[n]);
+  connect_ops[n] = NULL;
 }
 
 
@@ -317,30 +339,12 @@ secret_ready_cb (void *cls,
     }
   }
 
-  // FIXME: destroy testbed operation
+  // we should still be connected
+  GNUNET_assert (NULL != connect_ops[n]);
 
-  if (num_generated == num_peers)
-  {
-    int i;
-    if (GNUNET_NO == decrypt)
-    {
-      GNUNET_SCHEDULER_shutdown ();
-      return;
-    }
-
-    decrypt_start = GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (), delay);
-    decrypt_deadline = GNUNET_TIME_absolute_add (decrypt_start, timeout);
-
-
-    // compute g^42
-    GNUNET_SECRETSHARING_plaintext_generate_i (&reference_plaintext, 42);
-    GNUNET_SECRETSHARING_encrypt (&common_pubkey, &reference_plaintext, &ciphertext);
+  // disconnect from the service, will call the disconnect callback
+  GNUNET_TESTBED_operation_done (connect_ops[n]);
 
-    // FIXME: store the ops somewhere!
-    for (i = 0; i < num_peers; i++)
-      GNUNET_TESTBED_service_connect (NULL, peers[i], "secretsharing", &decrypt_connect_complete, NULL,
-                                      &decrypt_connect_adapter, &decrypt_disconnect_adapter, &decrypt_handles[i]);
-  }
 }
 
 
@@ -387,11 +391,47 @@ static void
 session_disconnect_adapter (void *cls, void *op_result)
 {
   struct GNUNET_SECRETSHARING_Session **sp = cls;
+  unsigned int n = (sp - session_handles);
+
+  GNUNET_assert (*sp == session_handles[n]);
+
   if (NULL != *sp)
   {
     GNUNET_SECRETSHARING_session_destroy (*sp);
     *sp = NULL;
   }
+
+  GNUNET_assert (NULL != connect_ops[n]);
+  connect_ops[n] = NULL;
+
+  if (GNUNET_YES == in_shutdown)
+    return;
+
+  // all peers received their secret
+  if (num_generated == num_peers)
+  {
+    int i;
+
+    // only do decryption if requested by the user
+    if (GNUNET_NO == decrypt)
+    {
+      GNUNET_SCHEDULER_shutdown ();
+      return;
+    }
+
+    decrypt_start = GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (), delay);
+    decrypt_deadline = GNUNET_TIME_absolute_add (decrypt_start, timeout);
+
+    // compute g^42 as the plaintext which we will decrypt and then
+    // cooperatively decrypt
+    GNUNET_SECRETSHARING_plaintext_generate_i (&reference_plaintext, 42);
+    GNUNET_SECRETSHARING_encrypt (&common_pubkey, &reference_plaintext, &ciphertext);
+
+    for (i = 0; i < num_peers; i++)
+      connect_ops[i] =
+          GNUNET_TESTBED_service_connect (NULL, peers[i], "secretsharing", &decrypt_connect_complete, NULL,
+                                          &decrypt_connect_adapter, &decrypt_disconnect_adapter, &decrypt_handles[i]);
+  }
 }
 
 
@@ -423,7 +463,7 @@ peer_info_cb (void *cb_cls,
     num_retrieved_peer_ids++;
     if (num_retrieved_peer_ids == num_peers)
       for (i = 0; i < num_peers; i++)
-        testbed_operations[i] =
+        connect_ops[i] =
             GNUNET_TESTBED_service_connect (NULL, peers[i], "secretsharing", session_connect_complete, NULL,
                                             session_connect_adapter, session_disconnect_adapter, &session_handles[i]);
   }
@@ -437,6 +477,32 @@ peer_info_cb (void *cb_cls,
 
 
 /**
+ * Signature of the main function of a task.
+ *
+ * @param cls closure
+ * @param tc context information (why was this task triggered now)
+ */
+static void
+handle_shutdown (void *cls,
+                 const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  in_shutdown = GNUNET_YES;
+
+  if (NULL != connect_ops)
+  {
+    unsigned int i;
+    for (i = 0; i < num_peers; i++)
+      if (NULL != connect_ops[i])
+        GNUNET_TESTBED_operation_done (connect_ops[i]);
+    GNUNET_free (connect_ops);
+  }
+
+  // killing the testbed operation will take care of remaining
+  // service handles in the disconnect callback
+}
+
+
+/**
  * Signature of a main function for a testcase.
  *
  * @param cls closure
@@ -463,21 +529,27 @@ test_master (void *cls,
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "test master\n");
 
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+                                &handle_shutdown, NULL);
+
   peers = started_peers;
 
   peer_ids = GNUNET_malloc (num_peers * sizeof (struct GNUNET_PeerIdentity));
 
   session_handles = GNUNET_new_array (num_peers, struct GNUNET_SECRETSHARING_Session *);
   decrypt_handles = GNUNET_new_array (num_peers, struct GNUNET_SECRETSHARING_DecryptionHandle *);
-  testbed_operations = GNUNET_new_array (num_peers, struct GNUNET_TESTBED_Operation *);
+  connect_ops = GNUNET_new_array (num_peers, struct GNUNET_TESTBED_Operation *);
   shares = GNUNET_new_array (num_peers, struct GNUNET_SECRETSHARING_Share *);
 
-
   for (i = 0; i < num_peers; i++)
+  {
+    // we do not store the returned operation, as peer_info_cb
+    // will receive it as a parameter and call GNUNET_TESTBED_operation_done.
     GNUNET_TESTBED_peer_get_information (peers[i],
                                          GNUNET_TESTBED_PIT_IDENTITY,
                                          peer_info_cb,
                                          &peer_ids[i]);
+  }
 }
 
 
diff --git a/src/secretsharing/gnunet-service-secretsharing.c b/src/secretsharing/gnunet-service-secretsharing.c
index 1778b6ca0..0359fd0d7 100644
--- a/src/secretsharing/gnunet-service-secretsharing.c
+++ b/src/secretsharing/gnunet-service-secretsharing.c
@@ -539,6 +539,12 @@ compute_lagrange_coefficient (gcry_mpi_t coeff, unsigned int j,
 }
 
 
+/**
+ * Destroy a decrypt session, removing it from
+ * the linked list of decrypt sessions.
+ *
+ * @param ds decrypt session to destroy
+ */
 static void
 decrypt_session_destroy (struct DecryptSession *ds)
 {
@@ -546,6 +552,12 @@ decrypt_session_destroy (struct DecryptSession *ds)
 
   GNUNET_CONTAINER_DLL_remove (decrypt_sessions_head, decrypt_sessions_tail, ds);
 
+  if (NULL != ds->consensus)
+  {
+    GNUNET_CONSENSUS_destroy (ds->consensus);
+    ds->consensus = NULL;
+  }
+
   if (NULL != ds->client_mq)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "destroying decrypt MQ\n");
@@ -570,6 +582,12 @@ keygen_session_destroy (struct KeygenSession *ks)
 
   GNUNET_CONTAINER_DLL_remove (keygen_sessions_head, keygen_sessions_tail, ks);
 
+  if (NULL != ks->consensus)
+  {
+    GNUNET_CONSENSUS_destroy (ks->consensus);
+    ks->consensus = NULL;
+  }
+
   if (NULL != ks->client_mq)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "destroying keygen MQ\n");
@@ -734,6 +752,9 @@ keygen_round2_conclude (void *cls)
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "round2 conclude\n");
 
+  GNUNET_CONSENSUS_destroy (ks->consensus);
+  ks->consensus = NULL;
+
   share = GNUNET_new (struct GNUNET_SECRETSHARING_Share);
 
   share->num_peers = 0;
@@ -1289,6 +1310,9 @@ decrypt_conclude (void *cls)
   unsigned int i;
   unsigned int j;
 
+  GNUNET_CONSENSUS_destroy (ds->consensus);
+  ds->consensus = NULL;
+
   GNUNET_assert (0 != (lagrange = gcry_mpi_new (0)));
   GNUNET_assert (0 != (m = gcry_mpi_new (0)));
   GNUNET_assert (0 != (tmp = gcry_mpi_new (0)));
diff --git a/src/secretsharing/test_secretsharing.conf b/src/secretsharing/test_secretsharing.conf
index 44b9adf3d..f0b04052b 100644
--- a/src/secretsharing/test_secretsharing.conf
+++ b/src/secretsharing/test_secretsharing.conf
@@ -1,13 +1,14 @@
 [secretsharing]
 AUTOSTART = YES
 #PREFIX = valgrind
-OPTIONS = -LINFO
+#OPTIONS = -LINFO
 
 [consensus]
 AUTOSTART = YES
 
 [transport]
 OPTIONS = -LERROR
+PLUGINS = unix
 
 [arm]
 DEFAULTSERVICES = core consensus set secretsharing