massive rework of scalarproduct service, splitting into Alice and Bob

1 files changed, 41 insertions, 15 deletions

diff --git a/src/scalarproduct/scalarproduct.h b/src/scalarproduct/scalarproduct.h
index 4bafb18fb..bcd2d6821 100644
--- a/src/scalarproduct/scalarproduct.h
+++ b/src/scalarproduct/scalarproduct.h
@@ -17,23 +17,14 @@
      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
      Boston, MA 02111-1307, USA.
 */
-
 /**
  * @file   scalarproduct.h
  * @brief  Scalar Product Message Types
  * @author Christian M. Fuchs
- *
- * Created on September 2, 2013, 3:43 PM
  */
-
 #ifndef SCALARPRODUCT_H
 #define SCALARPRODUCT_H
 
-#ifdef  __cplusplus
-extern "C"
-{
-#endif
-
 GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
@@ -48,10 +39,11 @@ GNUNET_NETWORK_STRUCT_BEGIN
  * Message type passed from client to service
  * to initiate a request or responder role
  */
-struct ComputationMessage
+struct AliceComputationMessage
 {
   /**
-   * GNUNET message header
+   * GNUNET message header with type
+   * #GNUNET_MESSAGE_TYPE_SCALARPRODUCT_CLIENT_TO_ALICE
    */
   struct GNUNET_MessageHeader header;
 
@@ -87,6 +79,44 @@ struct ComputationMessage
 
 
 /**
+ * Message type passed from client to service
+ * to initiate a request or responder role
+ */
+struct BobComputationMessage
+{
+  /**
+   * GNUNET message header with type
+   * #GNUNET_MESSAGE_TYPE_SCALARPRODUCT_CLIENT_TO_BOB
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * how many elements the vector in payload contains
+   */
+  uint32_t element_count_total GNUNET_PACKED;
+
+  /**
+   * contained elements the vector in payload contains
+   */
+  uint32_t element_count_contained GNUNET_PACKED;
+
+  /**
+   * Always zero.
+   */
+  uint32_t reserved GNUNET_PACKED;
+
+  /**
+   * the transaction/session key used to identify a session
+   */
+  struct GNUNET_HashCode session_key;
+
+  /**
+   * followed by struct GNUNET_SCALARPRODUCT_Element[]
+   */
+};
+
+
+/**
  * multipart messages following `struct ComputationMessage`
  */
 struct ComputationMultipartMessage
@@ -140,9 +170,5 @@ struct ClientResponseMessage
 
 GNUNET_NETWORK_STRUCT_END
 
-#ifdef  __cplusplus
-}
-#endif
-
 #endif  /* SCALARPRODUCT_H */