X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Finclude%2Fblock_regex.h;h=a709bd3f0c2213d1dd5004cf8cfaed27e6a5a117;hb=360d7afad50d1af425a20e89419d2063a6a0e220;hp=be9d305ad481b3b68dc915444f57ca6ca896eff4;hpb=3999807382f98843cdde19211fc94484d0793087;p=oweals%2Fgnunet.git

diff --git a/src/include/block_regex.h b/src/include/block_regex.h
index be9d305ad..a709bd3f0 100644
--- 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
@@ -42,51 +43,6 @@ extern "C"
 GNUNET_NETWORK_STRUCT_BEGIN
 
 
-/**
- * @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.
-   */
-  uint32_t n_token GNUNET_PACKED;
-
-  /* char token[n_token] */
-};
-
-
-/**
- * @brief Block to announce a regex state.
- */
-struct RegexBlock
-{
-
-  /**
-   * Length of the proof regex string.
-   */
-  uint16_t proof_len GNUNET_PACKED;
-
-  /**
-   * Is this state an accepting state?
-   */
-  int16_t is_accepting GNUNET_PACKED;
-
-  /**
-   * Numer of edges parting from this state.
-   */
-  uint32_t n_edges GNUNET_PACKED;
-
-  /* char proof[n_proof] */
-  /* struct RegexEdge edges[n_edges] */
-};
-
-
 /**
  * @brief Block to announce a peer accepting a state.
  */
@@ -108,16 +64,16 @@ struct RegexAcceptBlock
    * The key of the state.
    */
   struct GNUNET_HashCode key;
-  
+
   /**
    * Public key of the peer signing.
    */
-  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded public_key;
+  struct GNUNET_PeerIdentity peer;
 
   /**
    * The signature.
    */
-  struct GNUNET_CRYPTO_EccSignature signature;
+  struct GNUNET_CRYPTO_EddsaSignature signature;
 };