3 files changed, 130 insertions, 28 deletions

diff --git a/src/include/block_mesh.h b/src/include/block_regex.h
index f051e6666..282c626a2 100644
--- a/src/include/block_mesh.h
+++ b/src/include/block_regex.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
@@ -19,37 +19,30 @@
 */
 
 /**
- * @file include/block_mesh.h
- * @brief fs block formats (shared between fs and block)
+ * @file include/block_regex.h
+ * @brief regex block formats
  * @author Bartlomiej Polot
  */
-#ifndef BLOCK_MESH_H
-#define BLOCK_MESH_H
+#ifndef BLOCK_REGEX_H
+#define BLOCK_REGEX_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)
- */
-struct PBlock
-{
-    /**
-     * Identity of the peer
-     */
-  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.
+ * @brief A RegexBlock contains one or more of this struct in the payload.
  */
-struct MeshRegexEdge
+struct RegexEdge
 {
       /**
        * Destination of this edge.
@@ -67,7 +60,7 @@ struct MeshRegexEdge
 /**
  * @brief Block to announce a regex state.
  */
-struct MeshRegexBlock
+struct RegexBlock
 {
       /**
        * The key of the state.
@@ -90,13 +83,13 @@ struct MeshRegexBlock
     int accepting;
 
     /* char proof[n_proof] */
-    /* struct MeshEdge edges[n_edges] */
+    /* struct RegexEdge edges[n_edges] */
 };
 
 /**
  * @brief Block to announce a peer accepting a state.
  */
-struct MeshRegexAccept
+struct RegexAccept
 {
       /**
        * The key of the state.
@@ -116,4 +109,12 @@ struct MeshRegexAccept
     struct GNUNET_PeerIdentity id;
 
 };
+
+#if 0                           /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
 #endif
\ No newline at end of file
diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h
index cd4b2a0ac..002d5c11b 100644
--- a/src/include/gnunet_block_lib.h
+++ b/src/include/gnunet_block_lib.h
@@ -113,12 +113,12 @@ enum GNUNET_BLOCK_Type
     /**
      * Block to store a mesh regex state
      */
-  GNUNET_BLOCK_TYPE_MESH_REGEX = 22,
+  GNUNET_BLOCK_TYPE_REGEX = 22,
 
     /**
      * Block to store a mesh regex accepting state
      */
-  GNUNET_BLOCK_TYPE_MESH_REGEX_ACCEPT = 23
+  GNUNET_BLOCK_TYPE_REGEX_ACCEPT = 23
 };
 
 
diff --git a/src/include/gnunet_regex_lib.h b/src/include/gnunet_regex_lib.h
index 105ccee54..ebeb9e50c 100644
--- a/src/include/gnunet_regex_lib.h
+++ b/src/include/gnunet_regex_lib.h
@@ -28,6 +28,8 @@
 #define GNUNET_REGEX_LIB_H
 
 #include "gnunet_util_lib.h"
+#include "gnunet_dht_service.h"
+#include "gnunet_statistics_service.h"
 
 #ifdef __cplusplus
 extern "C"
@@ -250,6 +252,105 @@ GNUNET_REGEX_ipv6toregex (const struct in6_addr *ipv6,
 
 
 
+/**
+ * Handle to store cached data about a regex announce.
+ */
+struct GNUNET_REGEX_announce_handle;
+
+/**
+ * Handle to store data about a regex search.
+ */
+struct GNUNET_REGEX_search_handle;
+
+/**
+ * Announce a regular expression: put all states of the automaton in the DHT.
+ * Does not free resources, must call GNUNET_REGEX_announce_cancel for that.
+ * 
+ * @param dht An existing and valid DHT service handle.
+ * @param id ID to announce as provider of regex. Own ID in most cases.
+ * @param regex Regular expression to announce.
+ * @param compression How many characters per edge can we squeeze?
+ * @param stats Optional statistics handle to report usage. Can be NULL.
+ * 
+ * @return Handle to reuse o free cached resources.
+ *         Must be freed by calling GNUNET_REGEX_announce_cancel.
+ */
+struct GNUNET_REGEX_announce_handle *
+GNUNET_REGEX_announce (struct GNUNET_DHT_Handle *dht,
+                       struct GNUNET_PeerIdentity *id,
+                       const char *regex,
+                       uint16_t compression,
+                       struct GNUNET_STATISTICS_Handle *stats);
+
+/**
+ * Announce again a regular expression previously announced.
+ * Does use caching to speed up process.
+ * 
+ * @param h Handle returned by a previous GNUNET_REGEX_announce call.
+ */
+void
+GNUNET_REGEX_reannounce (struct GNUNET_REGEX_announce_handle *h);
+
+
+/**
+ * Clear all cached data used by a regex announce.
+ * Does not close DHT connection.
+ * 
+ * @param h Handle returned by a previous GNUNET_REGEX_announce call.
+ */
+void
+GNUNET_REGEX_announce_cancel (struct GNUNET_REGEX_announce_handle *h);
+
+
+/**
+ * Search callback function.
+ *
+ * @param cls Closure provided in GNUNET_REGEX_search.
+ * @param id Peer providing a regex that matches the string.
+ * @param get_path Path of the get request.
+ * @param get_path_length Lenght of get_path.
+ * @param put_path Path of the put request.
+ * @param put_path_length Length of the put_path.
+ */
+typedef void (*GNUNET_REGEX_Found)(void *cls,
+                                   const struct GNUNET_PeerIdentity *id,
+                                   const struct GNUNET_PeerIdentity *get_path,
+                                   unsigned int get_path_length,
+                                   const struct GNUNET_PeerIdentity *put_path,
+                                   unsigned int put_path_length);
+
+
+/**
+ * Search for a peer offering a regex matching certain string in the DHT.
+ * The search runs until GNUNET_REGEX_search_cancel is called, even if results
+ * are returned.
+ *
+ * @param dht An existing and valid DHT service handle.
+ * @param string String to match against the regexes in the DHT.
+ * @param callback Callback for found peers.
+ * @param callback_cls Closure for @c callback.
+ * @param stats Optional statistics handle to report usage. Can be NULL.
+ * 
+ * @return Handle to stop search and free resources.
+ *         Must be freed by calling GNUNET_REGEX_search_cancel.
+ */
+struct GNUNET_REGEX_search_handle *
+GNUNET_REGEX_search (struct GNUNET_DHT_Handle *dht,
+                     const char *string,
+                     GNUNET_REGEX_Found callback,
+                     void *callback_cls,
+                     struct GNUNET_STATISTICS_Handle *stats);
+
+/**
+ * Stop search and free all data used by a GNUNET_REGEX_search call.
+ * Does not close DHT connection.
+ * 
+ * @param h Handle returned by a previous GNUNET_REGEX_search call.
+ */
+void
+GNUNET_REGEX_search_cancel (struct GNUNET_REGEX_search_handle *h);
+
+
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
 #endif