[GNUnet-SVN] r25893 - gnunet/src/regex

[gnunet]

Author: bartpolot
Date: 2013-01-25 12:54:56 +0100 (Fri, 25 Jan 2013)
New Revision: 25893

Modified:
   gnunet/src/regex/gnunet-daemon-regexprofiler.c
   gnunet/src/regex/gnunet-regex-profiler.c
Log:
- pass local ID to announce

Modified: gnunet/src/regex/gnunet-daemon-regexprofiler.c
===================================================================
--- gnunet/src/regex/gnunet-daemon-regexprofiler.c      2013-01-25 10:55:49 UTC 
(rev 25892)
+++ gnunet/src/regex/gnunet-daemon-regexprofiler.c      2013-01-25 11:54:56 UTC 
(rev 25893)
@@ -168,7 +168,7 @@
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Announcing regex: %s\n", regex);
   GNUNET_STATISTICS_update (stats_handle, "# regexes announced", 1, GNUNET_NO);
   announce_handle = GNUNET_REGEX_announce (dht_handle,
-                                           NULL,
+                                           &my_full_id,
                                            regex,
                                            (unsigned int) max_path_compression,
                                            stats_handle);
@@ -411,7 +411,7 @@
 
   if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
     return 2;
-  sleep (60);
+  sleep (30);
   return (GNUNET_OK ==
           GNUNET_PROGRAM_run (argc, argv, "regexprofiler",
                               gettext_noop

Modified: gnunet/src/regex/gnunet-regex-profiler.c
===================================================================
--- gnunet/src/regex/gnunet-regex-profiler.c    2013-01-25 10:55:49 UTC (rev 
25892)
+++ gnunet/src/regex/gnunet-regex-profiler.c    2013-01-25 11:54:56 UTC (rev 
25893)
@@ -401,7 +401,7 @@
 
 
 /**
- * Mesh connect callback.
+ * DHT connect callback.
  *
  * @param cls internal peer id.
  * @param op operation handle.
@@ -410,7 +410,7 @@
  */
 static void
 dht_connect_cb (void *cls, struct GNUNET_TESTBED_Operation *op,
-                 void *ca_result, const char *emsg);
+                void *ca_result, const char *emsg);
 
 /**
  * DHT connect adapter.
@@ -509,16 +509,12 @@
         GNUNET_snprintf (output_buffer,
                          sizeof (output_buffer),
                          "%p Search string not found: %s (%d)\n%p On peer: %u 
(%p)\n%p With policy file: %s\n%p After: %s\n",
-                        peer,
-                         peer->search_str,
-                         peer->search_str_matched,
-                        peer,
-                         peer->id,
+                         peer, peer->search_str, peer->search_str_matched,
+                         peer, peer->id, peer,
+                         peer, peer->policy_file,
                          peer,
-                        peer,
-                         peer->policy_file,
-                        peer,
-                         GNUNET_STRINGS_relative_time_to_string (prof_time, 
GNUNET_NO));
+                         GNUNET_STRINGS_relative_time_to_string (prof_time,
+                                                                 GNUNET_NO));
       if (size != GNUNET_DISK_file_write (data_file, output_buffer, size))
         GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Unable to write to file!\n");
     }