-fix crash observed on FreeBSD

[oweals/gnunet.git] / src / scalarproduct / scalarproduct.h

diff --git a/src/scalarproduct/scalarproduct.h b/src/scalarproduct/scalarproduct.h
index 9304c0c7ee002280747de6dd6e4046580f02af0c..4bafb18fb7a8e9a2ec8631138d63e49692c247bc 100644 (file)
--- a/src/scalarproduct/scalarproduct.h
+++ b/src/scalarproduct/scalarproduct.h
@@ -33,20 +33,8 @@
 extern "C"
 {
 #endif
-///////////////////////////////////////////////////////////////////////////////
-//                      Defines
-///////////////////////////////////////////////////////////////////////////////
-/**
- * Length of the key used for encryption
- */
-#define KEYBITS 2048
 
-/**
- * When performing our crypto, we may add two encrypted values with each 
- * a maximal length of GNUNET_CRYPTO_RSA_DATA_ENCODING_LENGTH.
- * thus we can receive a slightly longer element (+1 byte)
- */
-#define PAILLIER_ELEMENT_LENGTH (2*KEYBITS/8 +1)
+GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
  * Log an error message at log-level 'level' that indicates
@@ -55,15 +43,12 @@ extern "C"
  */
 #define LOG_GCRY(level, cmd, rc) do { LOG(level, _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__, gcry_strerror(rc)); } while(0)
 
-///////////////////////////////////////////////////////////////////////////////
-//                     Scalar Product Message Types
-///////////////////////////////////////////////////////////////////////////////
 
 /**
- * Message type passed from client to service 
+ * Message type passed from client to service
  * to initiate a request or responder role
  */
-struct GNUNET_SCALARPRODUCT_client_request
+struct ComputationMessage
 {
   /**
    * GNUNET message header
@@ -73,103 +58,60 @@ struct GNUNET_SCALARPRODUCT_client_request
   /**
    * how many elements the vector in payload contains
    */
-  uint16_t element_count GNUNET_PACKED;
-
-  /**
-   * how many bytes the mask has
-   */
-  uint16_t mask_length GNUNET_PACKED;
-
-  /**
-   * the transaction/session key used to identify a session
-   */
-  struct GNUNET_HashCode key;
-
-  /**
-   * the identity of a remote peer we want to communicate with
-   */
-  struct GNUNET_PeerIdentity peer;
-
-  /**
-   * followed by long vector[element_count] | [unsigned char mask[mask_bytes]]
-   */
-};
-  
-/**
- * Message type passed from requesting service Alice to responding service Bob
- * to initiate a request and make bob participate in our protocol
- */
-struct GNUNET_SCALARPRODUCT_service_request {
-  /**
-   * GNUNET message header
-   */
-  struct GNUNET_MessageHeader header;
+  uint32_t element_count_total GNUNET_PACKED;
 
   /**
-   * how many bytes the mask has
+   * contained elements the vector in payload contains
    */
-  uint16_t mask_length GNUNET_PACKED;
+  uint32_t element_count_contained GNUNET_PACKED;
 
   /**
-   * the length of the publickey contained within this message
+   * Always zero.
    */
-  uint16_t pk_length GNUNET_PACKED;
+  uint32_t reserved GNUNET_PACKED;
 
   /**
    * the transaction/session key used to identify a session
    */
-  struct GNUNET_HashCode key;
+  struct GNUNET_HashCode session_key;
 
   /**
-   * how many elements the vector in payload contains
-   */
-  uint16_t element_count GNUNET_PACKED;
-
-  /**
-   * how many elements are actually included after the mask was applied.
+   * the identity of a remote peer we want to communicate with
    */
-  uint16_t used_element_count GNUNET_PACKED;
+  struct GNUNET_PeerIdentity peer;
 
   /**
-   * followed by mask | public_key | vector[used_element_count]
+   * followed by struct GNUNET_SCALARPRODUCT_Element[]
    */
 };
 
+
 /**
- * Message type passed from responding service Bob to responding service Alice
- * to complete a request and allow Alice to compute the result
+ * multipart messages following `struct ComputationMessage`
  */
-struct GNUNET_SCALARPRODUCT_service_response {
+struct ComputationMultipartMessage
+{
   /**
    * GNUNET message header
    */
   struct GNUNET_MessageHeader header;
 
   /**
-   * how many elements the vector in payload contains
-   */
-  uint16_t element_count GNUNET_PACKED;
-
-  /**
-   * how many elements are actually included after the mask was applied.
+   * contained elements the vector in payload contains
    */
-  uint16_t used_element_count GNUNET_PACKED;
+  uint32_t element_count_contained GNUNET_PACKED;
 
   /**
-   * the transaction/session key used to identify a session
-   */
-  struct GNUNET_HashCode key;
-
-  /**
-   * followed by s | s' | kp[] | kq[]
+   * followed by struct GNUNET_SCALARPRODUCT_Element[]
    */
 };
 
+
 /**
  * Message type passed from service client
  * to finalize a session as requester or responder
  */
-struct GNUNET_SCALARPRODUCT_client_response
+struct ClientResponseMessage
 {
   /**
    * GNUNET message header
@@ -182,25 +124,22 @@ struct GNUNET_SCALARPRODUCT_client_response
   uint32_t product_length GNUNET_PACKED;
 
   /**
-   * the transaction/session key used to identify a session
-   */
-  struct GNUNET_HashCode key;
-
-  /**
-   * the identity of a remote peer we want to communicate with
+   * status information about the outcome of this session
    */
-  struct GNUNET_PeerIdentity peer;
+  int32_t status GNUNET_PACKED;
 
   /**
    * Workaround for libgcrypt: -1 if negative, 0 if zero, else 1
    */
-  int8_t range;
+  int32_t range GNUNET_PACKED;
 
   /**
    * followed by product of length product_length (or nothing)
    */
 };
-  
+
+GNUNET_NETWORK_STRUCT_END
+
 #ifdef __cplusplus
 }
 #endif