continuing refactoring of regex library structure, disambiguating symbol names between old regex library which is now internal and the public API; moving IP-to-regex conversion functions to tun library, as only vpn is using those to begin with

1 files changed, 8 insertions, 8 deletions

diff --git a/src/regex/gnunet-daemon-regexprofiler.c b/src/regex/gnunet-daemon-regexprofiler.c
index 88621d882..6a61aa6f0 100644
--- a/src/regex/gnunet-daemon-regexprofiler.c
+++ b/src/regex/gnunet-daemon-regexprofiler.c
@@ -29,7 +29,7 @@
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_regex_lib.h"
+#include "regex_internal_lib.h"
 #include "regex_test_lib.h"
 #include "gnunet_dht_service.h"
 #include "gnunet_statistics_service.h"
@@ -57,7 +57,7 @@ static struct GNUNET_DHT_Handle *dht_handle;
 /**
  * Peer's regex announce handle.
  */
-static struct GNUNET_REGEX_announce_handle *announce_handle;
+static struct REGEX_ITERNAL_Announcement *announce_handle;
 
 /**
  * Periodically reannounce regex.
@@ -109,7 +109,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   if (NULL != announce_handle)
   {
-    GNUNET_REGEX_announce_cancel (announce_handle);
+    REGEX_ITERNAL_announce_cancel (announce_handle);
     announce_handle = NULL;
   }
 
@@ -160,7 +160,7 @@ reannounce_regex (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                 "First time, creating regex: %s\n",
                 regex);
     memset (&id, 0, sizeof (struct GNUNET_PeerIdentity));
-    announce_handle = GNUNET_REGEX_announce (dht_handle,
+    announce_handle = REGEX_ITERNAL_announce (dht_handle,
                                             &id,
                                             regex,
                                             (unsigned int) max_path_compression,
@@ -169,7 +169,7 @@ reannounce_regex (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   else
   {
     GNUNET_assert (NULL != announce_handle);
-    GNUNET_REGEX_reannounce (announce_handle);
+    REGEX_ITERNAL_reannounce (announce_handle);
   }
 
   random_delay =
@@ -330,7 +330,7 @@ run (void *cls, char *const *args GNUNET_UNUSED,
   /* Read regexes from policy files */
   GNUNET_assert (-1 != GNUNET_DISK_directory_scan (policy_dir, &scan,
                                                    (void *) (long) peer_id));
-  if (NULL == (components = GNUNET_REGEX_read_from_file (policy_filename)))
+  if (NULL == (components = REGEX_ITERNAL_read_from_file (policy_filename)))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Policy file %s contains no policies. Exiting.\n",
@@ -339,8 +339,8 @@ run (void *cls, char *const *args GNUNET_UNUSED,
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
-  regex = GNUNET_REGEX_combine (components);
-  GNUNET_REGEX_free_from_file (components);
+  regex = REGEX_ITERNAL_combine (components);
+  REGEX_ITERNAL_free_from_file (components);
 
   /* Announcing regexes from policy_filename */
   GNUNET_asprintf (&rx_with_pfx, "%s(%s)(0|1)*", regex_prefix, regex);