/*
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
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
/**
- * @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.
+ * @brief Block to announce a peer accepting a state.
*/
-struct RegexBlock
+struct RegexAcceptBlock
{
/**
- * Length of the proof regex string.
+ * Accept blocks must be signed. Signature
+ * goes over expiration time and key.
*/
- uint16_t proof_len GNUNET_PACKED;
+ struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
/**
- * Is this state an accepting state?
+ * When does the signature expire?
*/
- int16_t is_accepting GNUNET_PACKED;
+ struct GNUNET_TIME_AbsoluteNBO expiration_time;
- /**
- * 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.
- */
-struct RegexAccept
-{
/**
* The key of the state.
*/
struct GNUNET_HashCode key;
-
+
/**
- * The identity of the peer accepting the state
+ * Public key of the peer signing.
*/
- struct GNUNET_PeerIdentity id;
+ struct GNUNET_PeerIdentity peer;
+ /**
+ * The signature.
+ */
+ struct GNUNET_CRYPTO_EddsaSignature signature;
};