5 files changed, 65 insertions, 67 deletions

diff --git a/src/regex/gnunet-regex-profiler.c b/src/regex/gnunet-regex-profiler.c
index bd223ae8e..75a1d2f99 100644
--- a/src/regex/gnunet-regex-profiler.c
+++ b/src/regex/gnunet-regex-profiler.c
@@ -23,11 +23,7 @@
  * @brief Regex profiler for testing distributed regex use.
  * @author Bartlomiej Polot
  * @author Maximilian Szengel
- *
  */
-
-#include <string.h>
-
 #include "platform.h"
 #include "gnunet_applications.h"
 #include "gnunet_util_lib.h"
@@ -727,9 +723,9 @@ find_string (void *cls);
 static void
 regex_found_handler (void *cls,
                      const struct GNUNET_PeerIdentity *id,
-                     const struct GNUNET_PeerIdentity *get_path,
+                     const struct GNUNET_DHT_PathElement *get_path,
                      unsigned int get_path_length,
-                     const struct GNUNET_PeerIdentity *put_path,
+                     const struct GNUNET_DHT_PathElement *put_path,
                      unsigned int put_path_length)
 {
   struct RegexPeer *peer = cls;
@@ -1558,53 +1554,56 @@ int
 main (int argc, char *const *argv)
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_option_filename ('o',
-                                   "output-file",
-                                   "FILENAME",
-                                   gettext_noop (
-                                     "name of the file for writing statistics"),
-                                   &data_filename),
-
-    GNUNET_GETOPT_option_relative_time ('t',
-                                        "matching-timeout",
-                                        "TIMEOUT",
-                                        gettext_noop (
-                                          "wait TIMEOUT before ending the experiment"),
-                                        &search_timeout_time),
-
-    GNUNET_GETOPT_option_filename ('p',
-                                   "policy-dir",
-                                   "DIRECTORY",
-                                   gettext_noop ("directory with policy files"),
-                                   &policy_dir),
-
-
-    GNUNET_GETOPT_option_filename ('s',
-                                   "strings-file",
-                                   "FILENAME",
-                                   gettext_noop (
-                                     "name of file with input strings"),
-                                   &strings_file),
-
-    GNUNET_GETOPT_option_filename ('H',
-                                   "hosts-file",
-                                   "FILENAME",
-                                   gettext_noop (
-                                     "name of file with hosts' names"),
-                                   &hosts_file),
+    GNUNET_GETOPT_option_filename (
+      'o',
+      "output-file",
+      "FILENAME",
+      gettext_noop (
+        "name of the file for writing statistics"),
+      &data_filename),
+    GNUNET_GETOPT_option_relative_time (
+      't',
+      "matching-timeout",
+      "TIMEOUT",
+      gettext_noop (
+        "wait TIMEOUT before ending the experiment"),
+      &search_timeout_time),
+    GNUNET_GETOPT_option_filename (
+      'p',
+      "policy-dir",
+      "DIRECTORY",
+      gettext_noop ("directory with policy files"),
+      &policy_dir),
+    GNUNET_GETOPT_option_filename (
+      's',
+      "strings-file",
+      "FILENAME",
+      gettext_noop (
+        "name of file with input strings"),
+      &strings_file),
+    GNUNET_GETOPT_option_filename (
+      'H',
+      "hosts-file",
+      "FILENAME",
+      gettext_noop (
+        "name of file with hosts' names"),
+      &hosts_file),
 
     GNUNET_GETOPT_OPTION_END
   };
   int ret;
 
-  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+  if (GNUNET_OK !=
+      GNUNET_STRINGS_get_utf8_args (argc, argv,
+                                    &argc, &argv))
     return 2;
   result = GNUNET_SYSERR;
   ret =
     GNUNET_PROGRAM_run (argc, argv,
                         "gnunet-regex-profiler",
                         _ ("Profiler for regex"),
-                        options, &run, NULL);
+                        options,
+                        &run, NULL);
   if (GNUNET_OK != ret)
     return ret;
   if (GNUNET_OK != result)
diff --git a/src/regex/gnunet-service-regex.c b/src/regex/gnunet-service-regex.c
index 7a5cc1f05..deaa6112e 100644
--- a/src/regex/gnunet-service-regex.c
+++ b/src/regex/gnunet-service-regex.c
@@ -196,9 +196,9 @@ handle_announce (void *cls,
 static void
 handle_search_result (void *cls,
                       const struct GNUNET_PeerIdentity *id,
-                      const struct GNUNET_PeerIdentity *get_path,
+                      const struct GNUNET_DHT_PathElement *get_path,
                       unsigned int get_path_length,
-                      const struct GNUNET_PeerIdentity *put_path,
+                      const struct GNUNET_DHT_PathElement *put_path,
                       unsigned int put_path_length)
 {
   struct ClientEntry *ce = cls;
@@ -209,15 +209,15 @@ handle_search_result (void *cls,
 
   if ((get_path_length >= 65536) ||
       (put_path_length >= 65536) ||
-      ( ((get_path_length + put_path_length) * sizeof(struct
-                                                      GNUNET_PeerIdentity))
+      ( ((get_path_length + put_path_length)
+         * sizeof(struct GNUNET_PeerIdentity))
         + sizeof(struct ResultMessage) >= GNUNET_MAX_MESSAGE_SIZE) )
   {
     GNUNET_break (0);
     return;
   }
-  size = (get_path_length + put_path_length) * sizeof(struct
-                                                      GNUNET_PeerIdentity);
+  size = (get_path_length + put_path_length)
+         * sizeof(struct GNUNET_PeerIdentity);
   env = GNUNET_MQ_msg_extra (result,
                              size,
                              GNUNET_MESSAGE_TYPE_REGEX_RESULT);
@@ -225,12 +225,10 @@ handle_search_result (void *cls,
   result->put_path_length = htons ((uint16_t) put_path_length);
   result->id = *id;
   gp = &result->id;
-  GNUNET_memcpy (&gp[1],
-                 get_path,
-                 get_path_length * sizeof(struct GNUNET_PeerIdentity));
-  GNUNET_memcpy (&gp[1 + get_path_length],
-                 put_path,
-                 put_path_length * sizeof(struct GNUNET_PeerIdentity));
+  for (unsigned int i = 0; i<get_path_length; i++)
+    gp[i + 1] = get_path[i].pred;
+  for (unsigned int i = 0; i<put_path_length; i++)
+    gp[i + get_path_length + 1] = put_path[i].pred;
   GNUNET_MQ_send (ce->mq,
                   env);
 }
diff --git a/src/regex/regex_internal.h b/src/regex/regex_internal.h
index 8f29cff33..5b434b30c 100644
--- a/src/regex/regex_internal.h
+++ b/src/regex/regex_internal.h
@@ -340,10 +340,10 @@ REGEX_INTERNAL_construct_nfa (const char *regex, const size_t len);
  *
  * @return GNUNET_YES to proceed traversal, GNUNET_NO to stop.
  */
-typedef int (*REGEX_INTERNAL_traverse_check) (void *cls,
-                                              struct REGEX_INTERNAL_State *s,
-                                              struct REGEX_INTERNAL_Transition *
-                                              t);
+typedef int
+(*REGEX_INTERNAL_traverse_check) (void *cls,
+                                  struct REGEX_INTERNAL_State *s,
+                                  struct REGEX_INTERNAL_Transition *t);
 
 
 /**
@@ -353,9 +353,10 @@ typedef int (*REGEX_INTERNAL_traverse_check) (void *cls,
  * @param count current count of the state, from 0 to a->state_count -1.
  * @param s state.
  */
-typedef void (*REGEX_INTERNAL_traverse_action) (void *cls,
-                                                const unsigned int count,
-                                                struct REGEX_INTERNAL_State *s);
+typedef void
+(*REGEX_INTERNAL_traverse_action) (void *cls,
+                                   const unsigned int count,
+                                   struct REGEX_INTERNAL_State *s);
 
 
 /**
diff --git a/src/regex/regex_internal_dht.c b/src/regex/regex_internal_dht.c
index 3fb74c319..2248de1f1 100644
--- a/src/regex/regex_internal_dht.c
+++ b/src/regex/regex_internal_dht.c
@@ -384,9 +384,9 @@ regex_next_edge (const struct RegexBlock *block,
 static void
 dht_get_string_accept_handler (void *cls, struct GNUNET_TIME_Absolute exp,
                                const struct GNUNET_HashCode *key,
-                               const struct GNUNET_PeerIdentity *get_path,
+                               const struct GNUNET_DHT_PathElement *get_path,
                                unsigned int get_path_length,
-                               const struct GNUNET_PeerIdentity *put_path,
+                               const struct GNUNET_DHT_PathElement *put_path,
                                unsigned int put_path_length,
                                enum GNUNET_BLOCK_Type type,
                                size_t size, const void *data)
@@ -464,9 +464,9 @@ regex_find_path (const struct GNUNET_HashCode *key,
 static void
 dht_get_string_handler (void *cls, struct GNUNET_TIME_Absolute exp,
                         const struct GNUNET_HashCode *key,
-                        const struct GNUNET_PeerIdentity *get_path,
+                        const struct GNUNET_DHT_PathElement *get_path,
                         unsigned int get_path_length,
-                        const struct GNUNET_PeerIdentity *put_path,
+                        const struct GNUNET_DHT_PathElement *put_path,
                         unsigned int put_path_length,
                         enum GNUNET_BLOCK_Type type,
                         size_t size, const void *data)
diff --git a/src/regex/regex_internal_lib.h b/src/regex/regex_internal_lib.h
index 94fac19f9..9baf84995 100644
--- a/src/regex/regex_internal_lib.h
+++ b/src/regex/regex_internal_lib.h
@@ -221,9 +221,9 @@ REGEX_INTERNAL_announce_cancel (struct REGEX_INTERNAL_Announcement *h);
 typedef void
 (*REGEX_INTERNAL_Found)(void *cls,
                         const struct GNUNET_PeerIdentity *id,
-                        const struct GNUNET_PeerIdentity *get_path,
+                        const struct GNUNET_DHT_PathElement *get_path,
                         unsigned int get_path_length,
-                        const struct GNUNET_PeerIdentity *put_path,
+                        const struct GNUNET_DHT_PathElement *put_path,
                         unsigned int put_path_length);