-fix ftbfs

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

diff --git a/src/scalarproduct/gnunet-service-scalarproduct.h b/src/scalarproduct/gnunet-service-scalarproduct.h
index fbbd4397c9672538b87e305d74c0ef6adfbce62e..514a771e94b1b38923cb917c6d48c935b0411ef4 100644 (file)
--- a/src/scalarproduct/gnunet-service-scalarproduct.h
+++ b/src/scalarproduct/gnunet-service-scalarproduct.h
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2013, 2014 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2013, 2014 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -89,10 +89,10 @@ struct AliceCryptodataMessage
  * Message type passed from responding service Bob to responding
  * service Alice to complete a request and allow Alice to compute the
  * result.  If Bob's reply does not fit into this one message, the
- * conversation may be continued with `struct MultipartMessage`
+ * conversation may be continued with `struct BobCryptodataMultipartMessage`
  * messages afterwards.
  */
-struct ServiceResponseMessage
+struct BobCryptodataMessage
 {
   /**
    * GNUNET message header with type
@@ -100,28 +100,11 @@ struct ServiceResponseMessage
    */
   struct GNUNET_MessageHeader header;
 
-  /**
-   * How many elements the session input had (in NBO).
-   */
-  uint32_t total_element_count GNUNET_PACKED;
-
-  /**
-   * How many elements were included after the mask was applied
-   * including all multipart msgs (in NBO).
-   */
-  uint32_t used_element_count GNUNET_PACKED;
-
   /**
    * How many elements this individual message delivers (in NBO).
    */
   uint32_t contained_element_count GNUNET_PACKED;
 
-  /**
-   * The transaction/session key used to identify a session.
-   * FIXME: needed? CADET should already identify sessions!
-   */
-  struct GNUNET_HashCode key;
-
   /**
    * followed by s | s' | k[i][perm]
    */
@@ -131,11 +114,11 @@ struct ServiceResponseMessage
 /**
  * Multipart Message type passed between to supply additional elements
  * for the peer.  Send from Bob to Alice with additional elements
- * of k[i][perm] after his `struct ServiceResponseMessage *`.
+ * of k[i][perm] after his `struct BobCryptodataMessage *`.
  * Once all k-values have been transmitted, Bob is finished and
  * Alice can transmit the final result to the client.
  */
-struct MultipartMessage
+struct BobCryptodataMultipartMessage
 {
   /**
    * GNUNET message header
@@ -148,7 +131,8 @@ struct MultipartMessage
   uint32_t contained_element_count GNUNET_PACKED;
 
   /**
-   * struct GNUNET_CRYPTO_PaillierCiphertext[multipart_element_count]
+   * Followed by `struct
+   * GNUNET_CRYPTO_PaillierCiphertext[contained_element_count]`
    */
 };