made the service more resilient against out of order and simply incorrect messages

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

diff --git a/src/scalarproduct/scalarproduct.h b/src/scalarproduct/scalarproduct.h
index 43a866cf1b6a69d404a53a707628672fb4f5aed4..d476ae8ff735c94ef2826200a152a5da3314ed1f 100644 (file)
--- a/src/scalarproduct/scalarproduct.h
+++ b/src/scalarproduct/scalarproduct.h
@@ -42,18 +42,30 @@ extern "C"
 #define KEYBITS 2048
 
 /**
- * When performing our crypto, we may add two encrypted values with each 
+ * 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)
 
+/**
+ * Maximum count of elements we can put into a multipart message
+ */
+#define MULTIPART_ELEMENT_CAPACITY ((GNUNET_SERVER_MAX_MESSAGE_SIZE - 1 - sizeof (struct GNUNET_SCALARPRODUCT_multipart_message)) / PAILLIER_ELEMENT_LENGTH)
+    
+/**
+ * Log an error message at log-level 'level' that indicates
+ * a failure of the command 'cmd' with the message given
+ * by gcry_strerror(rc).
+ */
+#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
@@ -66,12 +78,12 @@ struct GNUNET_SCALARPRODUCT_client_request
   /**
    * how many elements the vector in payload contains
    */
-  uint16_t element_count GNUNET_PACKED;
+  uint32_t element_count GNUNET_PACKED;
 
   /**
    * how many bytes the mask has
    */
-  uint16_t mask_length GNUNET_PACKED;
+  uint32_t mask_length GNUNET_PACKED;
 
   /**
    * the transaction/session key used to identify a session
@@ -87,7 +99,7 @@ struct GNUNET_SCALARPRODUCT_client_request
    * 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
@@ -98,15 +110,25 @@ struct GNUNET_SCALARPRODUCT_service_request {
    */
   struct GNUNET_MessageHeader header;
 
+  /**
+   * how many elements the total message including all multipart msgs contains
+   */
+  uint32_t total_element_count GNUNET_PACKED;
+
+    /**
+   * how many elements are actually included after the mask was applied.
+   */
+  uint32_t contained_element_count GNUNET_PACKED;
+
   /**
    * how many bytes the mask has
    */
-  uint16_t mask_length GNUNET_PACKED;
+  uint32_t mask_length GNUNET_PACKED;
 
   /**
    * the length of the publickey contained within this message
    */
-  uint16_t pk_length GNUNET_PACKED;
+  uint32_t pk_length GNUNET_PACKED;
 
   /**
    * the transaction/session key used to identify a session
@@ -116,16 +138,28 @@ struct GNUNET_SCALARPRODUCT_service_request {
   /**
    * how many elements the vector in payload contains
    */
-  uint16_t element_count GNUNET_PACKED;
+  uint32_t element_count GNUNET_PACKED;
 
   /**
-   * how many elements are actually included after the mask was applied.
+   * followed by mask | public_key | vector[used_element_count]
+   */
+};
+
+/**
+ * Multipart Message type passed between to supply additional elements for the peer
+ */
+struct GNUNET_SCALARPRODUCT_multipart_message {
+  /**
+   * GNUNET message header
    */
-  uint16_t used_element_count GNUNET_PACKED;
+  struct GNUNET_MessageHeader header;
 
   /**
-   * followed by mask | public_key | vector[used_element_count]
+   * how many elements we supply within this message
    */
+  uint32_t multipart_element_count GNUNET_PACKED;
+
+  // followed by vector[multipart_element_count] or k[i][perm]
 };
 
 /**
@@ -139,14 +173,19 @@ struct GNUNET_SCALARPRODUCT_service_response {
   struct GNUNET_MessageHeader header;
 
   /**
-   * how many elements the vector in payload contains
+   * how many elements the session input had
    */
-  uint16_t element_count GNUNET_PACKED;
+  uint32_t total_element_count GNUNET_PACKED;
 
   /**
-   * how many elements are actually included after the mask was applied.
+   * how many elements were included after the mask was applied including all multipart msgs.
    */
-  uint16_t used_element_count GNUNET_PACKED;
+  uint32_t used_element_count GNUNET_PACKED;
+
+  /**
+   * how many elements this individual message delivers
+   */
+  uint32_t contained_element_count GNUNET_PACKED;
 
   /**
    * the transaction/session key used to identify a session
@@ -154,7 +193,7 @@ struct GNUNET_SCALARPRODUCT_service_response {
   struct GNUNET_HashCode key;
 
   /**
-   * followed by s | s' | kp[] | kq[]
+   * followed by s | s' | k[i][perm]
    */
 };
 
@@ -193,7 +232,7 @@ struct GNUNET_SCALARPRODUCT_client_response
    * followed by product of length product_length (or nothing)
    */
 };
-  
+
 #ifdef __cplusplus
 }
 #endif