- use tunnel encryption state to select decryption key

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

diff --git a/src/datastore/datastore.h b/src/datastore/datastore.h
index 563b7486cac3fb1d08fb4f5223d0f2368afc5834..75e122058d30db0cf61bcfc3acb02e41b13e04d5 100644 (file)
--- a/src/datastore/datastore.h
+++ b/src/datastore/datastore.h
@@ -4,7 +4,7 @@
 
      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 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -27,10 +27,11 @@
 #ifndef DATASTORE_H
 #define DATASTORE_H
 
-#define DEBUG_DATASTORE GNUNET_EXTRA_LOGGING
 
 #include "gnunet_util_lib.h"
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
  * Message from datastore service informing client about
  * the current size of the datastore.
@@ -110,7 +111,7 @@ struct GetMessage
   /**
    * Type is GNUNET_MESSAGE_TYPE_DATASTORE_GET.  Size
    * can either be "sizeof(struct GetMessage)" or
-   * "sizeof(struct GetMessage) - sizeof(GNUNET_HashCode)"!
+   * "sizeof(struct GetMessage) - sizeof(struct GNUNET_HashCode)"!
    */
   struct GNUNET_MessageHeader header;
 
@@ -128,7 +129,7 @@ struct GetMessage
    * Desired key (optional).  Check the "size" of the
    * header to see if the key is actually present.
    */
-  GNUNET_HashCode key GNUNET_PACKED;
+  struct GNUNET_HashCode key;
 
 };
 
@@ -251,10 +252,10 @@ struct DataMessage
   /**
    * Key under which the item can be found.
    */
-  GNUNET_HashCode key GNUNET_PACKED;
+  struct GNUNET_HashCode key;
 
 };
-
+GNUNET_NETWORK_STRUCT_END