change plugin functions to support async code

1 files changed, 122 insertions, 17 deletions

diff --git a/src/include/gnunet_escrow_lib.h b/src/include/gnunet_escrow_lib.h
index 297926581..01abae846 100644
--- a/src/include/gnunet_escrow_lib.h
+++ b/src/include/gnunet_escrow_lib.h
@@ -65,12 +65,103 @@ enum GNUNET_ESCROW_Verification_Result {
  * Struct for the escrow anchor
  */
 struct GNUNET_ESCROW_Anchor {
+  /**
+   * The escrow method.
+   */
   enum GNUNET_ESCROW_Key_Escrow_Method method;
+
+  /**
+   * The size of the anchor data.
+   */
   uint32_t size;
 };
 
 
 /**
+ * Function called after the initialization of the identity service.
+ * Passed via cls to the callback of GNUNET_IDENTITY_connect
+ */
+typedef void (*GNUNET_ESCROW_IdentityInitContinuation) ();
+
+/**
+ * Continuation for PUT and RENEW operations.
+ * 
+ * @param cls closure
+ * @param escrowAnchor the escrow anchor needed to get the data back
+ */
+typedef void (*GNUNET_ESCROW_AnchorContinuation) (
+  void *cls,
+  struct GNUNET_ESCROW_Anchor *escrowAnchor);
+
+/**
+ * Continuation for a GET operation.
+ * 
+ * @param cls closure
+ * @param ego a new identity ego restored from the escrow
+ */
+typedef void (*GNUNET_ESCROW_EgoContinuation) (
+  void *cls,
+  const struct GNUNET_IDENTITY_Ego *ego);
+
+/**
+ * Continuation for a VERIFY operation.
+ * 
+ * @param cls closure
+ * @param verificationResult the result of the verification, i.e.
+ *   GNUNET_ESCROW_VALID if the escrow could successfully by restored,
+ *   GNUNET_ESCROW_RENEW_NEEDED if the escrow needs to be renewed,
+ *   GNUNET_ESCROW_INVALID otherwise
+ */
+typedef void (*GNUNET_ESCROW_VerifyContinuation) (
+  void *cls,
+  int verificationResult);
+
+
+/**
+ * Handle for the escrow component.
+ */
+struct GNUNET_ESCROW_Handle
+{
+  /**
+   * Configuration to use.
+   */
+  const struct GNUNET_CONFIGURATION_Handle *cfg;
+};
+
+
+/**
+ * Handle for an operation with the escrow component.
+ */
+struct GNUNET_ESCROW_Operation
+{
+  /**
+   * Main escrow handle.
+   */
+  struct GNUNET_ESCROW_Handle *h;
+
+  /**
+   * Continuation for a PUT operation.
+   */
+  GNUNET_ESCROW_AnchorContinuation cb_put;
+
+  /**
+   * Continuation for a RENEW operation.
+   */
+  GNUNET_ESCROW_AnchorContinuation cb_renew;
+
+  /**
+   * Continuation for a GET operation.
+   */
+  GNUNET_ESCROW_EgoContinuation cb_get;
+
+  /**
+   * Continuation for a VERIFY operation.
+   */
+  GNUNET_ESCROW_VerifyContinuation cb_verify;
+};
+
+
+/**
  * Initialize the escrow component.
  * 
  * @param cfg the configuration to use
@@ -98,14 +189,18 @@ GNUNET_ESCROW_fini (
  * @param h the handle for the escrow component
  * @param ego the identity ego to put in escrow
  * @param method the escrow method to use
+ * @param cb function to call with the escrow anchor on completion
+ * @param cb_cls closure for @a cb
  * 
- * @return the escrow anchor needed to get the data back
+ * @return handle to abort the operation
  */
-void *
+struct GNUNET_ESCROW_Operation *
 GNUNET_ESCROW_put (
   struct GNUNET_ESCROW_Handle *h,
   const struct GNUNET_IDENTITY_Ego *ego,
-  enum GNUNET_ESCROW_Key_Escrow_Method method);
+  enum GNUNET_ESCROW_Key_Escrow_Method method,
+  GNUNET_ESCROW_AnchorContinuation cb,
+  void *cb_cls);
 
 
 /**
@@ -114,14 +209,18 @@ GNUNET_ESCROW_put (
  * @param h the handle for the escrow component
  * @param escrowAnchor the escrow anchor returned by the GNUNET_ESCROW_put method
  * @param method the escrow method to use
+ * @param cb function to call with the escrow anchor on completion
+ * @param cb_cls closure for @a cb
  * 
- * @return the escrow anchor needed to get the data back
+ * @return handle to abort the operation
  */
-void *
+struct GNUNET_ESCROW_Operation *
 GNUNET_ESCROW_renew (
   struct GNUNET_ESCROW_Handle *h,
-  void *escrowAnchor,
-  enum GNUNET_ESCROW_Key_Escrow_Method method);
+  struct GNUNET_ESCROW_Anchor *escrowAnchor,
+  enum GNUNET_ESCROW_Key_Escrow_Method method,
+  GNUNET_ESCROW_AnchorContinuation cb,
+  void *cb_cls);
 
 
 /**
@@ -131,15 +230,19 @@ GNUNET_ESCROW_renew (
  * @param escrowAnchor the escrow anchor returned by the GNUNET_ESCROW_put method
  * @param egoName the name of the ego to get back
  * @param method the escrow method to use
+ * @param cb function to call with the restored ego on completion
+ * @param cb_cls closure for @a cb
  * 
- * @return a new identity ego restored from the escrow
+ * @return handle to abort the operation
  */
-const struct GNUNET_IDENTITY_Ego *
+struct GNUNET_ESCROW_Operation *
 GNUNET_ESCROW_get (
   struct GNUNET_ESCROW_Handle *h,
-  void *escrowAnchor,
+  struct GNUNET_ESCROW_Anchor *escrowAnchor,
   char *egoName,
-  enum GNUNET_ESCROW_Key_Escrow_Method method);
+  enum GNUNET_ESCROW_Key_Escrow_Method method,
+  GNUNET_ESCROW_EgoContinuation cb,
+  void *cb_cls);
 
 
 /**
@@ -149,17 +252,19 @@ GNUNET_ESCROW_get (
  * @param ego the identity ego that was put into escrow
  * @param escrowAnchor the escrow anchor returned by the GNUNET_ESCROW_put method
  * @param method the escrow method to use
+ * @param cb function to call with the verification result on completion
+ * @param cb_cls closure for @a cb
  * 
- * @return GNUNET_ESCROW_VALID if the escrow could successfully by restored,
- *         GNUNET_ESCROW_RENEW_NEEDED if the escrow needs to be renewed,
- *         GNUNET_ESCROW_INVALID otherwise
+ * @return handle to abort the operation
  */
-int
+struct GNUNET_ESCROW_Operation *
 GNUNET_ESCROW_verify (
   struct GNUNET_ESCROW_Handle *h,
   const struct GNUNET_IDENTITY_Ego *ego,
-  void *escrowAnchor,
-  enum GNUNET_ESCROW_Key_Escrow_Method method);
+  struct GNUNET_ESCROW_Anchor *escrowAnchor,
+  enum GNUNET_ESCROW_Key_Escrow_Method method,
+  GNUNET_ESCROW_VerifyContinuation cb,
+  void *cb_cls);
 
 
 /**