implementing 0003268

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

diff --git a/src/include/block_mesh.h b/src/include/block_mesh.h
index ef5979da2b848292627431fde67f8fca3b701759..7e6c1583bda0c0747be0f380bc3d557912e96c12 100644 (file)
--- a/src/include/block_mesh.h
+++ b/src/include/block_mesh.h
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2012 Christian Grothoff (and other contributing authors)
+     (C) 2012,2013 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -20,18 +20,26 @@
 
 /**
  * @file include/block_mesh.h
- * @brief fs block formats (shared between fs and block)
+ * @brief Mesh block formats.
  * @author Bartlomiej Polot
  */
 #ifndef BLOCK_MESH_H
 #define BLOCK_MESH_H
 
+#ifdef __cplusplus
+extern "C"
+{
+#if 0                           /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
 #include "gnunet_util_lib.h"
 #include "gnunet_mesh_service.h"
 #include <stdint.h>
 
 /**
- * @brief peer block (announce peer + type)
+ * @brief peer block (peer id)
  */
 struct PBlock
 {
@@ -40,80 +48,13 @@ struct PBlock
      */
   struct GNUNET_PeerIdentity id;
 
-    /**
-     * Type of service offered
-     */
-  GNUNET_MESH_ApplicationType type;
 };
 
-/**
- * @brief A MeshRegexBlock contains one or more of this struct in the payload.
- */
-struct MeshRegexEdge
-{
-      /**
-       * Destination of this edge.
-       */
-    struct GNUNET_HashCode key;
-
-      /**
-       * Length of the token towards the new state.
-       */
-    unsigned int n_token;
-
-    /* char token[n_token] */
-};
-
-/**
- * @brief Block to announce a regex state.
- */
-struct MeshRegexBlock
+#if 0                           /* keep Emacsens' auto-indent happy */
 {
-      /**
-       * The key of the state.
-       */
-    struct GNUNET_HashCode key;
+#endif
+#ifdef __cplusplus
+}
+#endif
 
-      /**
-       * 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 MeshEdge edges[n_edges] */
-};
-
-/**
- * @brief Block to announce a peer accepting a state.
- */
-struct MeshRegexAccept
-{
-      /**
-       * 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;
-
-};
 #endif
\ No newline at end of file