/**
* @file regex/gnunet-daemon-regexprofiler.c
- * @brief daemon that uses mesh to announce a regular expression. Used in
+ * @brief daemon that uses cadet to announce a regular expression. Used in
* conjunction with gnunet-regex-profiler to announce regexes on serveral peers
- * without the need to explicitly connect to the mesh service running on the
+ * without the need to explicitly connect to the cadet service running on the
* peer from within the profiler.
* @author Maximilian Szengel
* @author Bartlomiej Polot
/**
* How many put rounds should we do.
*/
-static unsigned int rounds = 5;
+static unsigned int rounds = 3;
/**
* Private key for this peer.
*/
-static struct GNUNET_CRYPTO_EccPrivateKey *my_private_key;
+static struct GNUNET_CRYPTO_EddsaPrivateKey *my_private_key;
/**
* Announce a previously announced regex re-using cached data.
- *
+ *
* @param cls Closure (regex to announce if needed).
* @param tc TaskContext.
*/
* Announce the given regular expression using regex and the path compression
* length read from config.
*
- * @param regex regular expression to announce on this peer's mesh.
+ * @param regex regular expression to announce on this peer's cadet.
*/
static void
announce_regex (const char * regex)
cfg = cfg_;
- my_private_key = GNUNET_CRYPTO_ecc_key_create_from_configuration (cfg);
+ my_private_key = GNUNET_CRYPTO_eddsa_key_create_from_configuration (cfg);
GNUNET_assert (NULL != my_private_key);
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (cfg, "REGEXPROFILER",
GNUNET_CONFIGURATION_get_value_string (cfg, "REGEXPROFILER",
"POLICY_DIR", &policy_dir))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _
- ("%s service is lacking key configuration settings (%s). Exiting.\n"),
- "regexprofiler", "policy_dir");
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "REGEXPROFILER", "POLICY_DIR");
global_ret = GNUNET_SYSERR;
GNUNET_SCHEDULER_shutdown ();
return;
GNUNET_CONFIGURATION_get_value_number (cfg, "TESTBED",
"PEERID", &peer_id))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _
- ("%s service is lacking key configuration settings (%s). Exiting.\n"),
- "regexprofiler", "policy_file");
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "TESTBED", "PEERID");
global_ret = GNUNET_SYSERR;
+ GNUNET_free (policy_dir);
GNUNET_SCHEDULER_shutdown ();
return;
}
GNUNET_CONFIGURATION_get_value_string (cfg, "REGEXPROFILER",
"REGEX_PREFIX", ®ex_prefix))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _
- ("%s service is lacking key configuration settings (%s). Exiting.\n"),
- "regexprofiler", "regex_prefix");
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "REGEXPROFILER", "REGEX_PREFIX");
global_ret = GNUNET_SYSERR;
+ GNUNET_free (policy_dir);
GNUNET_SCHEDULER_shutdown ();
return;
}
"REANNOUNCE_PERIOD_MAX",
&reannounce_period_max))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"reannounce_period_max not given. Using 10 minutes.\n");
reannounce_period_max =
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 10);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Could not acquire dht handle. Exiting.\n");
global_ret = GNUNET_SYSERR;
+ GNUNET_free (policy_dir);
GNUNET_SCHEDULER_shutdown ();
return;
}
"Policy file %s contains no policies. Exiting.\n",
policy_filename);
global_ret = GNUNET_SYSERR;
+ GNUNET_free (policy_dir);
GNUNET_SCHEDULER_shutdown ();
return;
}
+ GNUNET_free (policy_dir);
regex = REGEX_TEST_combine (components);
REGEX_TEST_free_from_file (components);
/* Announcing regexes from policy_filename */
- GNUNET_asprintf (&rx_with_pfx, "%s(%s)(0|1)*", regex_prefix, regex);
+ GNUNET_asprintf (&rx_with_pfx, "%s(%s)(0|1|2|3|4|5|6|7|8|9|a|b|c|d|e|f)*", regex_prefix, regex);
announce_regex (rx_with_pfx);
GNUNET_free (regex);
GNUNET_free (rx_with_pfx);
return (GNUNET_OK ==
GNUNET_PROGRAM_run (argc, argv, "regexprofiler",
gettext_noop
- ("Daemon to announce regular expressions for the peer using mesh."),
+ ("Daemon to announce regular expressions for the peer using cadet."),
options, &run, NULL)) ? global_ret : 1;
}