GNUNET_STATISTICS_get_cancel (advsent_stat);
advsent_stat = NULL;
}
+ if (NULL != adv_peer.stats)
+ {
+ GNUNET_STATISTICS_destroy (adv_peer.stats, GNUNET_NO);
+ adv_peer.stats = NULL;
+ }
+ if (NULL != learn_peer.stats)
+ {
+ GNUNET_STATISTICS_destroy (learn_peer.stats, GNUNET_NO);
+ learn_peer.stats = NULL;
+ }
if (check_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (check_task);
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
if (GNUNET_OS_process_wait (adv_peer.arm_proc) != GNUNET_OK)
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
- GNUNET_OS_process_close (adv_peer.arm_proc);
+ GNUNET_OS_process_destroy (adv_peer.arm_proc);
adv_peer.arm_proc = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Killing hostlist client ARM process.\n");
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
if (GNUNET_OS_process_wait (learn_peer.arm_proc) != GNUNET_OK)
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
- GNUNET_OS_process_close (learn_peer.arm_proc);
+ GNUNET_OS_process_destroy (learn_peer.arm_proc);
learn_peer.arm_proc = NULL;
#endif
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown complete....\n");
}
+static void
+do_shutdown (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ shutdown_testcase ();
+}
+
+
static int
-process_downloads (void *cls,
- const char *subsystem,
- const char *name, uint64_t value, int is_persistent)
+process_downloads (void *cls, const char *subsystem, const char *name,
+ uint64_t value, int is_persistent)
{
if ((value >= 2) && (learned_hostlist_downloaded == GNUNET_NO))
{
"Peer has successfully downloaded advertised URI\n");
learned_hostlist_downloaded = GNUNET_YES;
if ((learned_hostlist_saved == GNUNET_YES) && (adv_sent == GNUNET_YES))
- shutdown_testcase ();
+ {
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ }
}
return GNUNET_OK;
}
static int
-process_uris_recv (void *cls,
- const char *subsystem,
- const char *name, uint64_t value, int is_persistent)
+process_uris_recv (void *cls, const char *subsystem, const char *name,
+ uint64_t value, int is_persistent)
{
- if (((struct PeerContext *) cls == &learn_peer) &&
- (value == 1) && (learned_hostlist_saved == GNUNET_NO))
+ if (((struct PeerContext *) cls == &learn_peer) && (value == 1) &&
+ (learned_hostlist_saved == GNUNET_NO))
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Peer has successfully saved advertised URI\n");
static int
-process_adv_sent (void *cls,
- const char *subsystem,
- const char *name, uint64_t value, int is_persistent)
+process_adv_sent (void *cls, const char *subsystem, const char *name,
+ uint64_t value, int is_persistent)
{
if ((value >= 1) && (adv_sent == GNUNET_NO))
{
check_task = GNUNET_SCHEDULER_NO_TASK;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
- GNUNET_asprintf (&stat,
- gettext_noop ("# advertised URI `%s' downloaded"),
+ GNUNET_asprintf (&stat, gettext_noop ("# advertised URI `%s' downloaded"),
current_adv_uri);
if (NULL != learn_peer.stats)
{
if (NULL != download_stats)
GNUNET_STATISTICS_get_cancel (download_stats);
- download_stats = GNUNET_STATISTICS_get (learn_peer.stats,
- "hostlist",
- stat,
- GNUNET_TIME_UNIT_MINUTES,
- &process_downloads_done,
- &process_downloads, &learn_peer);
+ download_stats =
+ GNUNET_STATISTICS_get (learn_peer.stats, "hostlist", stat,
+ GNUNET_TIME_UNIT_MINUTES,
+ &process_downloads_done, &process_downloads,
+ &learn_peer);
if (NULL != urisrecv_stat)
GNUNET_STATISTICS_get_cancel (urisrecv_stat);
- urisrecv_stat = GNUNET_STATISTICS_get (learn_peer.stats,
- "hostlist",
- gettext_noop
- ("# advertised hostlist URIs"),
- GNUNET_TIME_UNIT_MINUTES,
- &process_uris_recv_done,
- &process_uris_recv, &learn_peer);
+ urisrecv_stat =
+ GNUNET_STATISTICS_get (learn_peer.stats, "hostlist",
+ gettext_noop ("# advertised hostlist URIs"),
+ GNUNET_TIME_UNIT_MINUTES,
+ &process_uris_recv_done, &process_uris_recv,
+ &learn_peer);
}
GNUNET_free (stat);
if (NULL != adv_peer.stats)
{
if (NULL != advsent_stat)
GNUNET_STATISTICS_get_cancel (advsent_stat);
- advsent_stat = GNUNET_STATISTICS_get (adv_peer.stats,
- "hostlist",
- gettext_noop
- ("# hostlist advertisements send"),
- GNUNET_TIME_UNIT_MINUTES,
- &process_adv_sent_done,
- &process_adv_sent, NULL);
+ advsent_stat =
+ GNUNET_STATISTICS_get (adv_peer.stats, "hostlist",
+ gettext_noop ("# hostlist advertisements send"),
+ GNUNET_TIME_UNIT_MINUTES, &process_adv_sent_done,
+ &process_adv_sent, NULL);
}
- check_task = GNUNET_SCHEDULER_add_delayed (CHECK_INTERVALL,
- &check_statistics, NULL);
+ check_task =
+ GNUNET_SCHEDULER_add_delayed (CHECK_INTERVALL, &check_statistics, NULL);
}
* Core handler for p2p hostlist advertisements
*/
static int
-ad_arrive_handler (void *cls,
- const struct GNUNET_PeerIdentity *peer,
+ad_arrive_handler (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
char *hostname;
char *expected_uri;
const struct GNUNET_MessageHeader *incoming;
const char *end;
- if (-1 == GNUNET_CONFIGURATION_get_value_number (adv_peer.cfg,
- "HOSTLIST",
- "HTTPPORT", &port))
+ if (-1 ==
+ GNUNET_CONFIGURATION_get_value_number (adv_peer.cfg, "HOSTLIST",
+ "HTTPPORT", &port))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Could not read advertising server's configuration\n");
return GNUNET_SYSERR;
}
- if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (adv_peer.cfg,
- "HOSTLIST",
- "EXTERNAL_DNS_NAME",
- &hostname))
+ if (GNUNET_SYSERR ==
+ GNUNET_CONFIGURATION_get_value_string (adv_peer.cfg, "HOSTLIST",
+ "EXTERNAL_DNS_NAME", &hostname))
hostname = GNUNET_RESOLVER_local_fqdn_get ();
- GNUNET_asprintf (&expected_uri,
- "http://%s:%u/",
+ GNUNET_asprintf (&expected_uri, "http://%s:%u/",
hostname != NULL ? hostname : "localhost",
(unsigned int) port);
incoming = (const struct GNUNET_MessageHeader *) message;
p->cfg = GNUNET_CONFIGURATION_create ();
#if START_ARM
- p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
- "gnunet-service-arm",
+ p->arm_proc =
+ GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
+ "gnunet-service-arm",
#if VERBOSE
- "-L", "DEBUG",
+ "-L", "DEBUG",
#endif
- "-c", cfgname, NULL);
+ "-c", cfgname, NULL);
#endif
GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
- if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (p->cfg,
- "HOSTLIST",
- "HOSTLISTFILE",
- &filename))
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (p->cfg, "HOSTLIST", "HOSTLISTFILE",
+ &filename))
{
if (GNUNET_YES == GNUNET_DISK_file_test (filename))
{
}
GNUNET_free (filename);
}
- p->core = GNUNET_CORE_connect (p->cfg,
- 1,
- NULL,
- NULL,
- NULL, NULL, NULL,
- NULL, GNUNET_NO,
- NULL, GNUNET_NO, learn_handlers);
+ p->core =
+ GNUNET_CORE_connect (p->cfg, 1, NULL, NULL, NULL, NULL, NULL, GNUNET_NO,
+ NULL, GNUNET_NO, learn_handlers);
GNUNET_assert (NULL != p->core);
p->stats = GNUNET_STATISTICS_create ("hostlist", p->cfg);
GNUNET_assert (NULL != p->stats);
{
p->cfg = GNUNET_CONFIGURATION_create ();
#if START_ARM
- p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
- "gnunet-service-arm",
+ p->arm_proc =
+ GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
+ "gnunet-service-arm",
#if VERBOSE
- "-L", "DEBUG",
+ "-L", "DEBUG",
#endif
- "-c", cfgname, NULL);
+ "-c", cfgname, NULL);
#endif
GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
p->stats = GNUNET_STATISTICS_create ("hostlist", p->cfg);
static void
-run (void *cls,
- char *const *args,
- const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c)
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *c)
{
timeout = GNUNET_NO;
adv_sent = GNUNET_NO;
setup_learn_peer (&learn_peer, "test_learning_learn_peer.conf");
timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &timeout_error, NULL);
- check_task = GNUNET_SCHEDULER_add_delayed (CHECK_INTERVALL,
- &check_statistics, NULL);
+ check_task =
+ GNUNET_SCHEDULER_add_delayed (CHECK_INTERVALL, &check_statistics, NULL);
}
GNUNET_GETOPT_OPTION_END
};
- GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
- argv, "test-gnunet-daemon-hostlist-learning",
- "nohelp", options, &run, NULL);
+ GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
+ "test-gnunet-daemon-hostlist-learning", "nohelp", options,
+ &run, NULL);
failed = GNUNET_NO;
if (timeout == GNUNET_YES)
{
projects / oweals / gnunet.git / blobdiff