revert

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

diff --git a/src/fragmentation/fragmentation.h b/src/fragmentation/fragmentation.h
index 9473fa31a7c5bdee21d863914fd8fd5fa5de2829..6ca521d95d7e142e78a68269c22847e580d25da1 100644 (file)
--- a/src/fragmentation/fragmentation.h
+++ b/src/fragmentation/fragmentation.h
@@ -1,21 +1,19 @@
 /*
      This file is part of GNUnet
-     (C) 2009, 2011 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009, 2011 GNUnet e.V.
 
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Affero General Public License for more details.
+    
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /**
  * @file src/fragmentation/fragmentation.h
@@ -27,14 +25,36 @@
 #include "platform.h"
 #include "gnunet_fragmentation_lib.h"
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
- * Header for a message fragment.
+ * Header for a message fragment.  Followed by the
+ * original message.
  */
 struct FragmentHeader
 {
 
+  /**
+   * Message header.
+   */
   struct GNUNET_MessageHeader header;
 
+  /**
+   * Unique fragment ID.
+   */
+  uint32_t fragment_id GNUNET_PACKED;
+
+  /**
+   * Total message size of the original message.
+   */
+  uint16_t total_size GNUNET_PACKED;
+
+  /**
+   * Absolute offset (in bytes) of this fragment in the original
+   * message.  Will be a multiple of the MTU.
+   */
+  uint16_t offset GNUNET_PACKED;
+
 };
 
 
@@ -44,16 +64,24 @@ struct FragmentHeader
 struct FragmentAcknowledgement
 {
 
+  /**
+   * Message header.
+   */
   struct GNUNET_MessageHeader header;
 
+  /**
+   * Unique fragment ID.
+   */
+  uint32_t fragment_id GNUNET_PACKED;
+
   /**
    * Bits that are being acknowledged, in big-endian.
    * (bits that are set correspond to fragments that
    * have not yet been received).
    */
-  uint64_t bits;
+  uint64_t bits GNUNET_PACKED;
 
 };
-
+GNUNET_NETWORK_STRUCT_END
 
 #endif