From 94d238dfdc117e210afffde1c326b5b776b6ac9a Mon Sep 17 00:00:00 2001 From: LRN Date: Wed, 13 Mar 2013 21:01:29 +0000 Subject: [PATCH] Modify one of the tests to check service list --- src/arm/test_gnunet_service_arm.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/src/arm/test_gnunet_service_arm.c b/src/arm/test_gnunet_service_arm.c index bd7fe5fa9..a641f10c5 100644 --- a/src/arm/test_gnunet_service_arm.c +++ b/src/arm/test_gnunet_service_arm.c @@ -40,6 +40,10 @@ static int ret = 1; +static int resolved_ok = 0; + +static int asked_for_a_list = 0; + static struct GNUNET_ARM_Handle *arm; static void @@ -59,23 +63,38 @@ arm_stop_cb (void *cls, struct GNUNET_ARM_Handle *h, enum GNUNET_ARM_RequestStat GNUNET_SCHEDULER_add_now (trigger_disconnect, NULL); } +static void +service_list (void *cls, struct GNUNET_ARM_Handle *arm, + enum GNUNET_ARM_RequestStatus rs, + unsigned int count, const char *const*list) +{ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%u services are are currently running\n", count); + GNUNET_assert (count == 1); + GNUNET_break (0 == strcasecmp (list[0], "resolver (gnunet-service-resolver)")); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got service list, now stopping arm\n"); + ret = 0; + GNUNET_ARM_request_service_stop (arm, "arm", TIMEOUT, arm_stop_cb, NULL); +} + static void hostNameResolveCB (void *cls, const struct sockaddr *addr, socklen_t addrlen) { - if ((ret == 0) || (ret == 4)) + if ((ret == 0) || (ret == 4) || (resolved_ok == 1)) return; if (NULL == addr) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Name not resolved!\n"); ret = 3; + GNUNET_ARM_request_service_stop (arm, "arm", TIMEOUT, arm_stop_cb, NULL); } - else + else if (asked_for_a_list == 0) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Resolved hostname, now stopping ARM\n"); - ret = 0; + "Resolved hostname, now checking the service list\n"); + GNUNET_ARM_request_service_list (arm, TIMEOUT, service_list, NULL); + asked_for_a_list = 1; + resolved_ok = 1; } - GNUNET_ARM_request_service_stop (arm, "arm", TIMEOUT, arm_stop_cb, NULL); } static void -- 2.25.1