-skeletons for transport-ng

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

diff --git a/src/peerstore/peerstore.h b/src/peerstore/peerstore.h
index 94970d90643a79faab2708900e02078203623590..f5e2cd19ca02571a709714a08a74cd3788357c64 100644 (file)
--- a/src/peerstore/peerstore.h
+++ b/src/peerstore/peerstore.h
@@ -1,6 +1,6 @@
 /*
       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
@@ -14,8 +14,8 @@
 
       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.
+      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+      Boston, MA 02110-1301, USA.
  */
 /**
  * @file peerstore/peerstore.h
@@ -44,7 +44,13 @@ GNUNET_NETWORK_STRUCT_BEGIN
   /**
    * #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
@@ -52,36 +58,32 @@ GNUNET_NETWORK_STRUCT_BEGIN
   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_Absolute expiry GNUNET_PACKED;
 
   /**
    * 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;
 
 };
 
+
 /**
  * Message carrying record key hash
  */
@@ -93,6 +95,11 @@ struct StoreKeyHashMessage
    */
   struct GNUNET_MessageHeader header;
 
+  /**
+   * Always 0, for alignment.
+   */
+  uint32_t reserved GNUNET_PACKED;
+
   /**
    * Hash of a record key
    */