first batch of license fixes (boring)

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

diff --git a/src/peerstore/peerstore.h b/src/peerstore/peerstore.h
index 5757f784ec084ba3722f9bb121fd3eef5ffcaede..5c866f3c2c29ceda2ec3ecc3c85a5c625b1de928 100644 (file)
--- a/src/peerstore/peerstore.h
+++ b/src/peerstore/peerstore.h
@@ -1,21 +1,16 @@
 /*
       This file is part of GNUnet
-      (C) 2012-2013 Christian Grothoff (and other contributing authors)
+      Copyright (C) 2012-2013 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 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.
  */
 /**
  * @file peerstore/peerstore.h
@@ -30,7 +25,6 @@
 
 
 GNUNET_NETWORK_STRUCT_BEGIN
-
 /**
  * Message carrying a PEERSTORE record message
  */
@@ -45,7 +39,13 @@ struct StoreRecordMessage
   /**
    * #GNUNET_YES if peer id value set, #GNUNET_NO otherwise
    */
-  uint16_t peer_set;
+  uint16_t peer_set GNUNET_PACKED;
+
+  /**
+   * Size of the sub_system string
+   * Allocated at position 0 after this struct
+   */
+  uint16_t sub_system_size GNUNET_PACKED;
 
   /**
    * Peer Identity
@@ -53,36 +53,33 @@ struct StoreRecordMessage
   struct GNUNET_PeerIdentity peer;
 
   /**
-   * Size of the sub_system string
-   * Allocated at position 0 after this struct
+   * Expiry time of entry
    */
-  size_t sub_system_size;
+  struct GNUNET_TIME_AbsoluteNBO expiry;
 
   /**
    * Size of the key string
    * Allocated at position 1 after this struct
    */
-  size_t key_size;
+  uint16_t key_size GNUNET_PACKED;
 
   /**
    * Size of value blob
    * Allocated at position 2 after this struct
    */
-  size_t value_size;
-
-  /**
-   * Expiry time of entry
-   */
-  struct GNUNET_TIME_Absolute expiry;
+  uint16_t value_size GNUNET_PACKED;
 
   /**
    * Options, needed only in case of a
    * store operation
    */
-  enum GNUNET_PEERSTORE_StoreOption options;
+  uint32_t /* enum GNUNET_PEERSTORE_StoreOption */ options GNUNET_PACKED;
+
+  /* Followed by key and value */
 
 };
 
+
 /**
  * Message carrying record key hash
  */
@@ -94,6 +91,11 @@ struct StoreKeyHashMessage
    */
   struct GNUNET_MessageHeader header;
 
+  /**
+   * Always 0, for alignment.
+   */
+  uint32_t reserved GNUNET_PACKED;
+
   /**
    * Hash of a record key
    */
@@ -102,5 +104,4 @@ struct StoreKeyHashMessage
 };
 
 GNUNET_NETWORK_STRUCT_END
-
 #endif