WIP commit of scalar product 2.0. It is unfinished and does not yet pass tests. This commit happens because of the move from mesh->cadet.

- reverted SP API back to the original design from 2012 (using key-value pairs)
- SP now uses set intersection to determine common elements from the set provided by the user
- values are sorted based on their keys after intersection
- removed state tracking, as simple tracking is now insufficient. Just checking for conditions directly is easier readable and less buggy
- modified/renamed SP message types to reflect the changed behavior of SP

1 files changed, 22 insertions, 30 deletions

diff --git a/src/include/gnunet_scalarproduct_service.h b/src/include/gnunet_scalarproduct_service.h
index 7a1eec91a..63bc29f0e 100644
--- a/src/include/gnunet_scalarproduct_service.h
+++ b/src/include/gnunet_scalarproduct_service.h
@@ -39,7 +39,7 @@ extern "C" {
 /**
  * Version of the scalarproduct API.
  */
-#define GNUNET_SCALARPRODUCT_VERSION 0x00000042
+#define GNUNET_SCALARPRODUCT_VERSION 0x00000043
 
 enum GNUNET_SCALARPRODUCT_ResponseStatus
 {
@@ -55,6 +55,14 @@ enum GNUNET_SCALARPRODUCT_ResponseStatus
  */
 struct GNUNET_SCALARPRODUCT_Handle;
 
+/**
+ * An element key-value pair for scalarproduct
+ */
+struct GNUNET_SCALARPRODUCT_Element {
+    int32_t value;
+    struct GNUNET_HashCode key;
+};
+
 
 /**
  * Continuation called to notify client about result of the
@@ -87,24 +95,21 @@ struct GNUNET_SCALARPRODUCT_ComputationHandle;
  * Request by Alice's client for computing a scalar product
  *
  * @param cfg the gnunet configuration handle
- * @param key Session key should be unique to the requesting client
+ * @param session_key Session key should be unique to the requesting client
  * @param peer PeerID of the other peer
  * @param elements Array of elements of the vector
  * @param element_count Number of elements in the vector
- * @param mask Array of the mask
- * @param mask_bytes number of bytes in the mask
  * @param cont Callback function
- * @param cont_cls Closure for @a cont
+ * @param cont_cls Closure for the callback function
+ *
  * @return a new handle for this computation
  */
 struct GNUNET_SCALARPRODUCT_ComputationHandle *
-GNUNET_SCALARPRODUCT_request (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                              const struct GNUNET_HashCode *key,
+GNUNET_SCALARPRODUCT_start_computation (const struct GNUNET_CONFIGURATION_Handle * cfg,
+                              const struct GNUNET_HashCode * session_key,
                               const struct GNUNET_PeerIdentity *peer,
-                              const int32_t *elements,
+                              const struct GNUNET_SCALARPRODUCT_Element * elements,
                               uint32_t element_count,
-                              const unsigned char *mask,
-                              uint32_t mask_bytes,
                               GNUNET_SCALARPRODUCT_DatumProcessor cont,
                               void * cont_cls);
 
@@ -112,20 +117,21 @@ GNUNET_SCALARPRODUCT_request (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * Used by Bob's client to cooperate with Alice,
  *
  * @param cfg the gnunet configuration handle
- * @param key Session key unique to the requesting client
+ * @param session_key Session key unique to the requesting client
  * @param elements Array of elements of the vector
  * @param element_count Number of elements in the vector
  * @param cont Callback function
- * @param cont_cls Closure for @a cont
+ * @param cont_cls Closure for the callback function
+ *
  * @return a new handle for this computation
  */
 struct GNUNET_SCALARPRODUCT_ComputationHandle *
-GNUNET_SCALARPRODUCT_response (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                               const struct GNUNET_HashCode *key,
-                               const int32_t *elements,
+GNUNET_SCALARPRODUCT_accept_computation (const struct GNUNET_CONFIGURATION_Handle * cfg,
+                               const struct GNUNET_HashCode * key,
+                               const struct GNUNET_SCALARPRODUCT_Element * elements,
                                uint32_t element_count,
                                GNUNET_SCALARPRODUCT_ContinuationWithStatus cont,
-                               void *cont_cls);
+                               void * cont_cls);
 
 
 /**
@@ -137,20 +143,6 @@ GNUNET_SCALARPRODUCT_response (const struct GNUNET_CONFIGURATION_Handle *cfg,
 void
 GNUNET_SCALARPRODUCT_cancel (struct GNUNET_SCALARPRODUCT_ComputationHandle *h);
 
-
-/**
- * Cancel ALL ongoing computation or revoke our collaboration offer.
- * Closes ALL connections to the service
- *
- * FIXME: this should take an argument, and we should
- * have an explicit 'connect' API which returns an opaque
- * connection handle.  Avoid (globals) in the library!
- * @deprecated in this form
- */
-void
-GNUNET_SCALARPRODUCT_disconnect ();
-
-
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
 #endif