projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-help seaspider some more
[oweals/gnunet.git]
/
src
/
hostlist
/
test_gnunet_daemon_hostlist_learning.c
diff --git
a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
index 2538e42fbe800057678a3f5490d827df3e5c1f04..5fcbd538b826391224581ba4b1450352a12217f3 100644
(file)
--- a/
src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/
src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@
-109,6
+109,16
@@
shutdown_testcase ()
GNUNET_STATISTICS_get_cancel (advsent_stat);
advsent_stat = NULL;
}
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);
if (check_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (check_task);
@@
-146,7
+156,7
@@
shutdown_testcase ()
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_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");
adv_peer.arm_proc = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Killing hostlist client ARM process.\n");
@@
-154,7
+164,7
@@
shutdown_testcase ()
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_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");
learn_peer.arm_proc = NULL;
#endif
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown complete....\n");
@@
-181,6
+191,14
@@
process_downloads_done (void *cls, int success)
}
}
+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)
static int
process_downloads (void *cls, const char *subsystem, const char *name,
uint64_t value, int is_persistent)
@@
-191,7
+209,9
@@
process_downloads (void *cls, const char *subsystem, const char *name,
"Peer has successfully downloaded advertised URI\n");
learned_hostlist_downloaded = GNUNET_YES;
if ((learned_hostlist_saved == GNUNET_YES) && (adv_sent == GNUNET_YES))
"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;
}
}
return GNUNET_OK;
}
@@
-298,7
+318,8
@@
check_statistics (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
static int
ad_arrive_handler (void *cls, const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_MessageHeader *message,
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_ATS_Information *atsi,
+ unsigned int atsi_count)
{
char *hostname;
char *expected_uri;
{
char *hostname;
char *expected_uri;
@@
-369,7
+390,7
@@
setup_learn_peer (struct PeerContext *p, const char *cfgname)
p->cfg = GNUNET_CONFIGURATION_create ();
#if START_ARM
p->arm_proc =
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,
NULL, NULL, "gnunet-service-arm",
"gnunet-service-arm",
#if VERBOSE
"-L", "DEBUG",
"gnunet-service-arm",
#if VERBOSE
"-L", "DEBUG",
@@
-391,8
+412,8
@@
setup_learn_peer (struct PeerContext *p, const char *cfgname)
GNUNET_free (filename);
}
p->core =
GNUNET_free (filename);
}
p->core =
- GNUNET_CORE_connect (p->cfg, 1, NULL, NULL, NULL, NULL, NULL,
NULL
,
-
GNUNET_NO,
NULL, GNUNET_NO, learn_handlers);
+ 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);
GNUNET_assert (NULL != p->core);
p->stats = GNUNET_STATISTICS_create ("hostlist", p->cfg);
GNUNET_assert (NULL != p->stats);
@@
-405,7
+426,7
@@
setup_adv_peer (struct PeerContext *p, const char *cfgname)
p->cfg = GNUNET_CONFIGURATION_create ();
#if START_ARM
p->arm_proc =
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,
NULL, NULL, "gnunet-service-arm",
"gnunet-service-arm",
#if VERBOSE
"-L", "DEBUG",
"gnunet-service-arm",
#if VERBOSE
"-L", "DEBUG",