fix build issues

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

diff --git a/src/peerstore/peerstore.h b/src/peerstore/peerstore.h
index 29e2ed8665d60aec83e1c8351f166aca54655eac..c6b9546764dd93073fbae5a704e64494bd663421 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
@@ -23,15 +23,17 @@
  * @author Omar Tarabai
  */
 
+#ifndef PEERSTORE_H_
+#define PEERSTORE_H_
+
 #include "gnunet_peerstore_service.h"
 
 
 GNUNET_NETWORK_STRUCT_BEGIN
-
 /**
- * Message carrying a PEERSTORE store request
+ * Message carrying a PEERSTORE record message
  */
-struct StoreRequestMessage
+struct StoreRecordMessage
 {
 
   /**
@@ -39,34 +41,72 @@ struct StoreRequestMessage
    */
   struct GNUNET_MessageHeader header;
 
+  /**
+   * #GNUNET_YES if peer id value set, #GNUNET_NO otherwise
+   */
+  uint16_t peer_set GNUNET_PACKED;
+
   /**
    * Size of the sub_system string
    * Allocated at position 0 after this struct
    */
-  size_t sub_system_size;
+  uint16_t sub_system_size GNUNET_PACKED;
 
   /**
    * Peer Identity
    */
   struct GNUNET_PeerIdentity peer;
 
+  /**
+   * Expiry time of entry
+   */
+  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;
+  uint16_t value_size GNUNET_PACKED;
+
+  /**
+   * Options, needed only in case of a
+   * store operation
+   */
+  uint32_t /* enum GNUNET_PEERSTORE_StoreOption */ options GNUNET_PACKED;
+
+  /* Followed by key and value */
+
+};
+
+
+/**
+ * Message carrying record key hash
+ */
+struct StoreKeyHashMessage
+{
+
+  /**
+   * GNUnet message header
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Always 0, for alignment.
+   */
+  uint32_t reserved GNUNET_PACKED;
 
   /**
-   * Lifetime of entry
+   * Hash of a record key
    */
-  struct GNUNET_TIME_Relative lifetime;
+  struct GNUNET_HashCode keyhash;
 
 };
 
 GNUNET_NETWORK_STRUCT_END
+#endif