/*
This file is part of GNUnet
- (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
+ (C) 2009, 2010, 2011, 2012 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
Boston, MA 02111-1307, USA.
*/
/**
- * @file hostlist/test_gnunet_daemon_hostlist.c
+ * @file hostlist/test_gnunet_daemon_hostlist_learning.c
* @brief test for gnunet_daemon_hostslist.c
* @author Christian Grothoff
*/
#include "gnunet_resolver_service.h"
#include "gnunet_statistics_service.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
-
-#define START_ARM GNUNET_YES
-
#define MAX_URL_LEN 1000
/**
struct GNUNET_MessageHeader *hello;
struct GNUNET_CORE_Handle *core;
struct GNUNET_STATISTICS_Handle *stats;
-#if START_ARM
struct GNUNET_OS_Process *arm_proc;
-#endif
};
static int timeout;
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_CORE_disconnect (learn_peer.core);
learn_peer.core = NULL;
}
-#if START_ARM
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Killing hostlist server ARM process.\n");
- if (0 != GNUNET_OS_process_kill (adv_peer.arm_proc, SIGTERM))
+ if (0 != GNUNET_OS_process_kill (adv_peer.arm_proc, GNUNET_TERM_SIG))
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");
- if (0 != GNUNET_OS_process_kill (learn_peer.arm_proc, SIGTERM))
+ if (0 != GNUNET_OS_process_kill (learn_peer.arm_proc, GNUNET_TERM_SIG))
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)
"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;
}
"Peer has successfully saved advertised URI\n");
learned_hostlist_saved = GNUNET_YES;
if ((learned_hostlist_downloaded == GNUNET_YES) && (adv_sent == GNUNET_YES))
- shutdown_testcase ();
+ {
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ }
}
return GNUNET_OK;
}
adv_sent = GNUNET_YES;
if ((learned_hostlist_downloaded == GNUNET_YES) &&
(learned_hostlist_saved == GNUNET_YES))
- shutdown_testcase ();
+ {
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ }
}
return GNUNET_OK;
}
*/
static int
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_MessageHeader *message)
{
char *hostname;
char *expected_uri;
}
else
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Expected URI `%s' and recieved URI `%s' differ\n",
+ "Expected URI `%s' and received URI `%s' differ\n",
expected_uri, current_adv_uri);
GNUNET_free (expected_uri);
GNUNET_free_non_null (hostname);
{
char *filename;
unsigned int result;
+ char *binary;
+ binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
p->cfg = GNUNET_CONFIGURATION_create ();
-#if START_ARM
p->arm_proc =
- GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
+ GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, binary,
"gnunet-service-arm",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
"-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",
GNUNET_free (filename);
}
p->core =
- GNUNET_CORE_connect (p->cfg, 1, NULL, NULL, NULL, NULL, NULL,
- GNUNET_NO, NULL, GNUNET_NO, learn_handlers);
+ GNUNET_CORE_connect (p->cfg, 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);
+ GNUNET_free (binary);
}
static void
setup_adv_peer (struct PeerContext *p, const char *cfgname)
{
+ char *binary;
+
+ binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
p->cfg = GNUNET_CONFIGURATION_create ();
-#if START_ARM
p->arm_proc =
- GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
- "gnunet-service-arm",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
- "-c", cfgname, NULL);
-#endif
+ GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, binary,
+ "gnunet-service-arm",
+ "-c", cfgname, NULL);
GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
p->stats = GNUNET_STATISTICS_create ("hostlist", p->cfg);
GNUNET_assert (NULL != p->stats);
+ GNUNET_free (binary);
}
char *const argv[] = {
"test-gnunet-daemon-hostlist-learning",
"-c", "learning_data.conf",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
NULL
};
struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-1");
GNUNET_DISK_directory_remove ("/tmp/test-gnunet-hostlist-peer-2");
GNUNET_log_setup ("test-gnunet-daemon-hostlist",
-#if VERBOSE
- "DEBUG",
-#else
"WARNING",
-#endif
NULL);
#if !WINDOWS
system ("gnunet-peerinfo -s -c test_learning_adv_peer.conf > /dev/null");
return ret;
}
-/* end of test_gnunet_daemon_hostlist.c */
+/* end of test_gnunet_daemon_hostlist_learning.c */
projects / oweals / gnunet.git / blobdiff