fix zombie-fest

[oweals/gnunet.git] / src / include / block_regex.h

diff --git a/src/include/block_regex.h b/src/include/block_regex.h
index 282c626a251ed5117458276ab4498d696fe5cf7e..a709bd3f0c2213d1dd5004cf8cfaed27e6a5a117 100644 (file)
--- a/src/include/block_regex.h
+++ b/src/include/block_regex.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,13 +14,14 @@
 
      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 include/block_regex.h
- * @brief regex block formats
+ * @file
+ * regex block formats
+ *
  * @author Bartlomiej Polot
  */
 #ifndef BLOCK_REGEX_H
@@ -39,77 +40,46 @@ extern "C"
 #include <stdint.h>
 
 
-/**
- * @brief A RegexBlock contains one or more of this struct in the payload.
- */
-struct RegexEdge
-{
-      /**
-       * Destination of this edge.
-       */
-    struct GNUNET_HashCode key;
-
-      /**
-       * Length of the token towards the new state.
-       */
-    unsigned int n_token;
+GNUNET_NETWORK_STRUCT_BEGIN
 
-    /* char token[n_token] */
-};
-
-/**
- * @brief Block to announce a regex state.
- */
-struct RegexBlock
-{
-      /**
-       * The key of the state.
-       */
-    struct GNUNET_HashCode key;
-
-      /**
-       * Length of the proof regex string.
-       */
-    unsigned int n_proof;
-
-      /**
-       * Numer of edges parting from this state.
-       */
-    unsigned int n_edges;
-
-      /**
-       * Is this state an accepting state?
-       */
-    int accepting;
-
-    /* char proof[n_proof] */
-    /* struct RegexEdge edges[n_edges] */
-};
 
 /**
  * @brief Block to announce a peer accepting a state.
  */
-struct RegexAccept
+struct RegexAcceptBlock
 {
-      /**
-       * The key of the state.
-       */
-    struct GNUNET_HashCode key;
-
-      /**
-       * Length of the proof regex string.
-       * FIXME necessary???
-       * already present in the leading MeshRegexBlock
-       */
-    // unsigned int n_proof;
-
-      /**
-       * The identity of the peer accepting the state
-       */
-    struct GNUNET_PeerIdentity id;
 
+  /**
+   * Accept blocks must be signed.  Signature
+   * goes over expiration time and key.
+   */
+  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+
+  /**
+   * When does the signature expire?
+   */
+  struct GNUNET_TIME_AbsoluteNBO expiration_time;
+
+  /**
+   * The key of the state.
+   */
+  struct GNUNET_HashCode key;
+
+  /**
+   * Public key of the peer signing.
+   */
+  struct GNUNET_PeerIdentity peer;
+
+  /**
+   * The signature.
+   */
+  struct GNUNET_CRYPTO_EddsaSignature signature;
 };
 
+
+GNUNET_NETWORK_STRUCT_END
+
+
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
 #endif
@@ -117,4 +87,4 @@ struct RegexAccept
 }
 #endif
 
-#endif
\ No newline at end of file
+#endif