add unique operation ID for distinction in the cb

7 files changed, 93 insertions, 20 deletions

diff --git a/src/escrow/escrow.h b/src/escrow/escrow.h
index 7c29104b0..2acb1391e 100644
--- a/src/escrow/escrow.h
+++ b/src/escrow/escrow.h
@@ -169,6 +169,11 @@ struct ESCROW_Plugin_AnchorContinuationWrapper
    * The escrow anchor
    */
   struct GNUNET_ESCROW_Anchor *escrowAnchor;
+
+  /**
+   * The unique ID of the respective ESCROW_Operation
+   */
+  uint32_t op_id;
 };
 
 /**
@@ -188,6 +193,11 @@ struct ESCROW_Plugin_EgoContinuationWrapper
    * The restored ego
    */
   const struct GNUNET_IDENTITY_Ego *ego;
+
+  /**
+   * The unique ID of the respective ESCROW_Operation
+   */
+  uint32_t op_id;
 };
 
 /**
@@ -207,6 +217,11 @@ struct ESCROW_Plugin_VerifyContinuationWrapper
    * The result of the verification
    */
   int verificationResult;
+
+  /**
+   * The unique ID of the respective ESCROW_Operation
+   */
+  uint32_t op_id;
 };
 
 
diff --git a/src/escrow/escrow_api.c b/src/escrow/escrow_api.c
index 510f6a898..7714152c0 100644
--- a/src/escrow/escrow_api.c
+++ b/src/escrow/escrow_api.c
@@ -115,6 +115,20 @@ init_plugin (struct GNUNET_ESCROW_Handle *h,
 
 
 /**
+ * Get a fresh operation id to distinguish between escrow operations
+ *
+ * @param h the escrow handle
+ * 
+ * @return next operation id to use
+ */
+static uint32_t
+get_op_id (struct GNUNET_ESCROW_Handle *h)
+{
+  return h->last_op_id_used++;
+}
+
+
+/**
  * Initialize the escrow component.
  * 
  * @param cfg the configuration to use
@@ -191,7 +205,7 @@ handle_start_escrow_result (void *cls)
   struct GNUNET_ESCROW_Operation *op;
 
   for (op = w->h->op_head; NULL != op; op = op->next)
-    if (1) // TODO: find condition (e.g. unique ID)
+    if (op->id == w->op_id)
       break;
 
   if (NULL == op)
@@ -229,13 +243,14 @@ GNUNET_ESCROW_put (struct GNUNET_ESCROW_Handle *h,
 
   op = GNUNET_new (struct GNUNET_ESCROW_Operation);
   op->h = h;
+  op->id = get_op_id (h);
   op->method = method;
   op->cb_put = cb;
   op->cb_cls = cb_cls;
   GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, op);
 
   api = init_plugin (h, method);
-  op->plugin_op_wrap = api->start_key_escrow (h, ego, &handle_start_escrow_result);
+  op->plugin_op_wrap = api->start_key_escrow (h, ego, &handle_start_escrow_result, op->id);
 
   return op;
 }
@@ -248,7 +263,7 @@ handle_restore_key_result (void *cls)
   struct GNUNET_ESCROW_Operation *op;
 
   for (op = w->h->op_head; NULL != op; op = op->next)
-    if (1) // TODO: find condition (e.g. unique ID)
+    if (op->id == w->op_id)
       break;
 
   if (NULL == op)
@@ -288,13 +303,14 @@ GNUNET_ESCROW_get (struct GNUNET_ESCROW_Handle *h,
 
   op = GNUNET_new (struct GNUNET_ESCROW_Operation);
   op->h = h;
+  op->id = get_op_id (h);
   op->method = method;
   op->cb_get = cb;
   op->cb_cls = cb_cls;
   GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, op);
 
   api = init_plugin (h, method);
-  op->plugin_op_wrap = api->restore_key (h, escrowAnchor, egoName, &handle_restore_key_result);
+  op->plugin_op_wrap = api->restore_key (h, escrowAnchor, egoName, &handle_restore_key_result, op->id);
 
   return op;
 }
@@ -307,7 +323,7 @@ handle_verify_escrow_result (void *cls)
   struct GNUNET_ESCROW_Operation *op;
 
   for (op = w->h->op_head; NULL != op; op = op->next)
-    if (1) // TODO: find condition (e.g. unique ID)
+    if (op->id == w->op_id)
       break;
 
   if (NULL == op)
@@ -318,8 +334,6 @@ handle_verify_escrow_result (void *cls)
   GNUNET_CONTAINER_DLL_remove (w->h->op_head, w->h->op_tail, op);
   if (NULL != op->cb_verify)
     op->cb_verify (op->cb_cls, w->verificationResult);
-  GNUNET_free (op->plugin_op_wrap->plugin_op);
-  GNUNET_free (op->plugin_op_wrap);
   GNUNET_free (op);
 }
 
@@ -349,13 +363,14 @@ GNUNET_ESCROW_verify (struct GNUNET_ESCROW_Handle *h,
 
   op = GNUNET_new (struct GNUNET_ESCROW_Operation);
   op->h = h;
+  op->id = get_op_id (h);
   op->method = method;
   op->cb_verify = cb;
   op->cb_cls = cb_cls;
   GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, op);
 
   api = init_plugin (h, method);
-  op->plugin_op_wrap = api->verify_key_escrow (h, ego, escrowAnchor, &handle_verify_escrow_result);
+  op->plugin_op_wrap = api->verify_key_escrow (h, ego, escrowAnchor, &handle_verify_escrow_result, op->id);
 
   return op;
 }
diff --git a/src/escrow/plugin_escrow_anastasis.c b/src/escrow/plugin_escrow_anastasis.c
index a66410099..3d3abdf29 100644
--- a/src/escrow/plugin_escrow_anastasis.c
+++ b/src/escrow/plugin_escrow_anastasis.c
@@ -48,18 +48,21 @@ struct ESCROW_PluginHandle ph;
  * @param h the handle for the escrow component
  * @param ego the identity ego containing the private key
  * @param cb the function called upon completion
+ * @param op_id unique ID of the respective ESCROW_Operation
  * 
  * @return plugin operation wrapper
  */
 struct ESCROW_PluginOperationWrapper *
 start_anastasis_key_escrow (struct GNUNET_ESCROW_Handle *h,
                             const struct GNUNET_IDENTITY_Ego *ego,
-                            GNUNET_SCHEDULER_TaskCallback cb)
+                            GNUNET_SCHEDULER_TaskCallback cb,
+                            uint32_t op_id)
 {
   struct ESCROW_Plugin_AnchorContinuationWrapper *w;
 
   w = GNUNET_new (struct ESCROW_Plugin_AnchorContinuationWrapper);
   w->h = h;
+  w->op_id = op_id;
 
   // TODO: implement
   w->escrowAnchor = NULL;
@@ -75,6 +78,7 @@ start_anastasis_key_escrow (struct GNUNET_ESCROW_Handle *h,
  * @param ego the identity ego containing the private key
  * @param escrowAnchor the escrow anchor needed to restore the key
  * @param cb the function called upon completion
+ * @param op_id unique ID of the respective ESCROW_Operation
  * 
  * @return plugin operation wrapper
  */
@@ -82,12 +86,14 @@ struct ESCROW_PluginOperationWrapper *
 verify_anastasis_key_escrow (struct GNUNET_ESCROW_Handle *h,
                              const struct GNUNET_IDENTITY_Ego *ego,
                              struct GNUNET_ESCROW_Anchor *escrowAnchor,
-                             GNUNET_SCHEDULER_TaskCallback cb)
+                             GNUNET_SCHEDULER_TaskCallback cb,
+                             uint32_t op_id)
 {
   struct ESCROW_Plugin_VerifyContinuationWrapper *w;
 
   w = GNUNET_new (struct ESCROW_Plugin_VerifyContinuationWrapper);
   w->h = h;
+  w->op_id = op_id;
 
   // TODO: implement
   w->verificationResult = GNUNET_ESCROW_INVALID;
@@ -103,6 +109,7 @@ verify_anastasis_key_escrow (struct GNUNET_ESCROW_Handle *h,
  * @param escrowAnchor the escrow anchor needed to restore the key
  * @param egoName the name of the ego to restore
  * @param cb the function called upon completion
+ * @param op_id unique ID of the respective ESCROW_Operation
  * 
  * @return plugin operation wrapper
  */
@@ -110,12 +117,14 @@ struct ESCROW_PluginOperationWrapper *
 restore_anastasis_key_escrow (struct GNUNET_ESCROW_Handle *h,
                               struct GNUNET_ESCROW_Anchor *escrowAnchor,
                               char *egoName,
-                              GNUNET_SCHEDULER_TaskCallback cb)
+                              GNUNET_SCHEDULER_TaskCallback cb,
+                              uint32_t op_id)
 {
   struct ESCROW_Plugin_EgoContinuationWrapper *w;
 
   w = GNUNET_new (struct ESCROW_Plugin_EgoContinuationWrapper);
   w->h = h;
+  w->op_id = op_id;
 
   // TODO: implement
   w->ego = NULL;
diff --git a/src/escrow/plugin_escrow_gns.c b/src/escrow/plugin_escrow_gns.c
index 618591393..e55019ad9 100644
--- a/src/escrow/plugin_escrow_gns.c
+++ b/src/escrow/plugin_escrow_gns.c
@@ -63,13 +63,15 @@ struct ESCROW_PluginHandle ph;
  * @param h the handle for the escrow component
  * @param ego the identity ego containing the private key
  * @param cb the function called upon completion
+ * @param op_id unique ID of the respective ESCROW_Operation
  * 
  * @return plugin operation wrapper
  */
 struct ESCROW_PluginOperationWrapper *
 start_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
                       const struct GNUNET_IDENTITY_Ego *ego,
-                      GNUNET_SCHEDULER_TaskCallback cb)
+                      GNUNET_SCHEDULER_TaskCallback cb,
+                      uint32_t op_id)
 {
   const struct GNUNET_CRYPTO_EcdsaPrivateKey *pk;
   sss_Keyshare keyshares;
@@ -92,6 +94,7 @@ start_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
 
   w = GNUNET_new (struct ESCROW_Plugin_AnchorContinuationWrapper);
   w->h = h;
+  w->op_id = op_id;
 
   if (NULL == ego)
   {
@@ -150,6 +153,7 @@ start_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
  * @param ego the identity ego containing the private key
  * @param escrowAnchor the escrow anchor needed to restore the key
  * @param cb the function called upon completion
+ * @param op_id unique ID of the respective ESCROW_Operation
  * 
  * @return plugin operation wrapper
  */
@@ -157,7 +161,8 @@ struct ESCROW_PluginOperationWrapper *
 verify_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
                        const struct GNUNET_IDENTITY_Ego *ego,
                        struct GNUNET_ESCROW_Anchor *escrowAnchor,
-                       GNUNET_SCHEDULER_TaskCallback cb)
+                       GNUNET_SCHEDULER_TaskCallback cb,
+                       uint32_t op_id)
 {
   struct ESCROW_PluginOperationWrapper *plugin_op_wrap;
   struct ESCROW_GnsPluginOperation *p_op;
@@ -175,6 +180,7 @@ verify_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
 
   w = GNUNET_new (struct ESCROW_Plugin_VerifyContinuationWrapper);
   w->h = h;
+  w->op_id = op_id;
 
   // TODO: implement
   w->verificationResult = GNUNET_ESCROW_INVALID;
@@ -190,6 +196,7 @@ verify_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
  * @param escrowAnchor the escrow anchor needed to restore the key
  * @param egoName the name of the ego to restore
  * @param cb the function called upon completion
+ * @param op_id unique ID of the respective ESCROW_Operation
  * 
  * @return plugin operation wrapper
  */
@@ -197,7 +204,8 @@ struct ESCROW_PluginOperationWrapper *
 restore_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
                         struct GNUNET_ESCROW_Anchor *escrowAnchor,
                         char *egoName,
-                        GNUNET_SCHEDULER_TaskCallback cb)
+                        GNUNET_SCHEDULER_TaskCallback cb,
+                        uint32_t op_id)
 {
   struct ESCROW_PluginOperationWrapper *plugin_op_wrap;
   struct ESCROW_GnsPluginOperation *p_op;
@@ -215,6 +223,7 @@ restore_gns_key_escrow (struct GNUNET_ESCROW_Handle *h,
 
   w = GNUNET_new (struct ESCROW_Plugin_EgoContinuationWrapper);
   w->h = h;
+  w->op_id = op_id;
 
   // TODO: implement
   w->ego = NULL;
diff --git a/src/escrow/plugin_escrow_plaintext.c b/src/escrow/plugin_escrow_plaintext.c
index 72579b829..83b2345c6 100644
--- a/src/escrow/plugin_escrow_plaintext.c
+++ b/src/escrow/plugin_escrow_plaintext.c
@@ -133,13 +133,15 @@ start_cont (void *cls)
  * @param h the handle for the escrow component
  * @param ego the identity ego containing the private key
  * @param cb the function called upon completion
+ * @param op_id unique ID of the respective ESCROW_Operation
  * 
  * @return plugin operation wrapper
  */
 struct ESCROW_PluginOperationWrapper *
 start_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
                             const struct GNUNET_IDENTITY_Ego *ego,
-                            ESCROW_Plugin_Continuation cb)
+                            ESCROW_Plugin_Continuation cb,
+                            uint32_t op_id)
 {
   const struct GNUNET_CRYPTO_EcdsaPrivateKey *pk;
   struct GNUNET_ESCROW_Anchor *anchor;
@@ -162,6 +164,7 @@ start_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
 
   w = GNUNET_new (struct ESCROW_Plugin_AnchorContinuationWrapper);
   w->h = h;
+  w->op_id = op_id;
   p_op->anchor_wrap = w;
 
   if (NULL == ego)
@@ -206,6 +209,7 @@ verify_cont (void *cls)
  * @param ego the identity ego containing the private key
  * @param escrowAnchor the escrow anchor needed to restore the key
  * @param cb the function called upon completion
+ * @param op_id unique ID of the respective ESCROW_Operation
  * 
  * @return plugin operation wrapper
  */
@@ -213,7 +217,8 @@ struct ESCROW_PluginOperationWrapper *
 verify_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
                              const struct GNUNET_IDENTITY_Ego *ego,
                              struct GNUNET_ESCROW_Anchor *escrowAnchor,
-                             ESCROW_Plugin_Continuation cb)
+                             ESCROW_Plugin_Continuation cb,
+                             uint32_t op_id)
 {
   const struct GNUNET_CRYPTO_EcdsaPrivateKey *pk;
   char *pkString;
@@ -235,6 +240,7 @@ verify_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
 
   w = GNUNET_new (struct ESCROW_Plugin_VerifyContinuationWrapper);
   w->h = h;
+  w->op_id = op_id;
   p_op->verify_wrap = w;
 
   if (NULL == ego)
@@ -344,6 +350,7 @@ handle_restore_error (void *cls)
  * @param escrowAnchor the escrow anchor needed to restore the key
  * @param egoName the name of the ego to restore
  * @param cb the function called upon completion
+ * @param op_id unique ID of the respective ESCROW_Operation
  * 
  * @return plugin operation wrapper
  */
@@ -351,7 +358,8 @@ struct ESCROW_PluginOperationWrapper *
 restore_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
                               struct GNUNET_ESCROW_Anchor *escrowAnchor,
                               char *egoName,
-                              ESCROW_Plugin_Continuation cb)
+                              ESCROW_Plugin_Continuation cb,
+                              uint32_t op_id)
 {
   struct GNUNET_CRYPTO_EcdsaPrivateKey pk;
   struct GNUNET_IDENTITY_Operation *id_op;
@@ -373,6 +381,7 @@ restore_plaintext_key_escrow (struct GNUNET_ESCROW_Handle *h,
 
   w = GNUNET_new (struct ESCROW_Plugin_EgoContinuationWrapper);
   w->h = h;
+  w->op_id = op_id;
   p_op->ego_wrap = w;
 
   if (NULL == escrowAnchor)
diff --git a/src/include/gnunet_escrow_lib.h b/src/include/gnunet_escrow_lib.h
index 4eeaff3fd..9a6849a52 100644
--- a/src/include/gnunet_escrow_lib.h
+++ b/src/include/gnunet_escrow_lib.h
@@ -157,6 +157,11 @@ struct GNUNET_ESCROW_Handle
    * Tail of active operations.
    */
   struct GNUNET_ESCROW_Operation *op_tail;
+
+  /**
+   * The last operation id used for an ESCROW operation.
+   */
+  uint32_t last_op_id_used;
 };
 
 
@@ -171,6 +176,11 @@ struct GNUNET_ESCROW_Operation
   struct GNUNET_ESCROW_Handle *h;
 
   /**
+   * ID of the operation.
+   */
+  uint32_t id;
+
+  /**
    * We keep operations in a DLL.
    */
   struct GNUNET_ESCROW_Operation *next;
diff --git a/src/include/gnunet_escrow_plugin.h b/src/include/gnunet_escrow_plugin.h
index 449921a8e..9b0f0356f 100644
--- a/src/include/gnunet_escrow_plugin.h
+++ b/src/include/gnunet_escrow_plugin.h
@@ -50,13 +50,15 @@ extern "C" {
  * @param h the handle for the escrow component
  * @param ego the identity ego containing the private key
  * @param cb the function called upon completion
+ * @param op_id unique ID of the respective ESCROW_Operation
  * 
  * @return a wrapper for the plugin operation
  */
 typedef struct ESCROW_PluginOperationWrapper *(*GNUNET_ESCROW_StartKeyEscrowFunction) (
   struct GNUNET_ESCROW_Handle *h,
   const struct GNUNET_IDENTITY_Ego *ego,
-  GNUNET_SCHEDULER_TaskCallback cb);
+  GNUNET_SCHEDULER_TaskCallback cb,
+  uint32_t op_id);
 
 /**
  * Function called to verify the escrow of the key
@@ -65,6 +67,7 @@ typedef struct ESCROW_PluginOperationWrapper *(*GNUNET_ESCROW_StartKeyEscrowFunc
  * @param ego the identity ego containing the private key
  * @param escrowAnchor the escrow anchor needed to restore the key
  * @param cb the function called upon completion
+ * @param op_id unique ID of the respective ESCROW_Operation
  * 
  * @return a wrapper for the plugin operation
  */
@@ -72,7 +75,8 @@ typedef struct ESCROW_PluginOperationWrapper *(*GNUNET_ESCROW_VerifyKeyEscrowFun
   struct GNUNET_ESCROW_Handle *h,
   const struct GNUNET_IDENTITY_Ego *ego,
   struct GNUNET_ESCROW_Anchor *escrowAnchor,
-  GNUNET_SCHEDULER_TaskCallback cb);
+  GNUNET_SCHEDULER_TaskCallback cb,
+  uint32_t op_id);
 
 /**
  * Function called to restore a key from an escrow
@@ -81,6 +85,7 @@ typedef struct ESCROW_PluginOperationWrapper *(*GNUNET_ESCROW_VerifyKeyEscrowFun
  * @param escrowAnchor the escrow anchor needed to restore the key
  * @param egoName the name of the ego to restore
  * @param cb the function called upon completion
+ * @param op_id unique ID of the respective ESCROW_Operation
  * 
  * @return a wrapper for the plugin operation
  */
@@ -88,7 +93,8 @@ typedef struct ESCROW_PluginOperationWrapper *(*GNUNET_ESCROW_RestoreKeyFunction
   struct GNUNET_ESCROW_Handle *h,
   struct GNUNET_ESCROW_Anchor *escrowAnchor,
   char *egoName,
-  GNUNET_SCHEDULER_TaskCallback cb);
+  GNUNET_SCHEDULER_TaskCallback cb,
+  uint32_t op_id);
 
 
 /**