X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Farm%2Ftest_arm_api.c;h=086cfc25850da8376167d5111b7d2c0293d3a1f0;hb=07120d4c0d2ca7d54d20c85e936763675b832c98;hp=cce5867f17962a7786a3bc7123768e04755dc216;hpb=42ccd4cf8fa748b8a7c760066e7a9e271e30fbb7;p=oweals%2Fgnunet.git diff --git a/src/arm/test_arm_api.c b/src/arm/test_arm_api.c index cce5867f1..086cfc258 100644 --- a/src/arm/test_arm_api.c +++ b/src/arm/test_arm_api.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2009 Christian Grothoff (and other contributing authors) + (C) 2009, 2011 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 @@ -45,18 +45,20 @@ static struct GNUNET_ARM_Handle *arm; static int ok = 1; static void -arm_stopped (void *cls, int success) +arm_stopped (void *cls, enum GNUNET_ARM_ProcessStatus success) { - if (success != GNUNET_NO) + GNUNET_break (success == GNUNET_ARM_PROCESS_DOWN); + if (success != GNUNET_ARM_PROCESS_DOWN) ok = 3; else if (ok == 1) ok = 0; } + static void -arm_notify_stop (void *cls, int success) +arm_notify_stop (void *cls, enum GNUNET_ARM_ProcessStatus success) { - GNUNET_assert (success == GNUNET_NO); + GNUNET_break (success == GNUNET_ARM_PROCESS_DOWN); #if START_ARM GNUNET_ARM_stop_service (arm, "arm", TIMEOUT, &arm_stopped, NULL); #endif @@ -73,18 +75,19 @@ dns_notify (void *cls, const struct sockaddr *addr, socklen_t addrlen) GNUNET_break (0); ok = 2; } - GNUNET_ARM_stop_service (arm, "resolver", TIMEOUT, &arm_notify_stop, NULL); + GNUNET_ARM_stop_service (arm, "resolver", TIMEOUT, &arm_notify_stop, + NULL); return; } - GNUNET_assert (addr != NULL); + GNUNET_break (addr != NULL); ok = 0; } static void -resolver_notify (void *cls, int success) +resolver_notify (void *cls, enum GNUNET_ARM_ProcessStatus success) { - if (success != GNUNET_YES) + if (success != GNUNET_ARM_PROCESS_STARTING) { GNUNET_break (0); ok = 2; @@ -98,9 +101,9 @@ resolver_notify (void *cls, int success) static void -arm_notify (void *cls, int success) +arm_notify (void *cls, enum GNUNET_ARM_ProcessStatus success) { - if (success != GNUNET_YES) + if (success != GNUNET_ARM_PROCESS_STARTING) { GNUNET_break (0); ok = 2; @@ -108,14 +111,13 @@ arm_notify (void *cls, int success) GNUNET_ARM_stop_service (arm, "arm", TIMEOUT, &arm_stopped, NULL); #endif } - GNUNET_ARM_start_service (arm, "resolver", START_TIMEOUT, &resolver_notify, NULL); + GNUNET_ARM_start_service (arm, "resolver", START_TIMEOUT, &resolver_notify, + NULL); } static void -task (void *cls, - char *const *args, - const char *cfgfile, +task (void *cls, char *const *args, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c) { cfg = c; @@ -144,10 +146,9 @@ check () GNUNET_GETOPT_OPTION_END }; GNUNET_assert (GNUNET_OK == - GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, - argv, - "test-arm-api", - "nohelp", options, &task, NULL)); + GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, + argv, "test-arm-api", "nohelp", options, + &task, NULL)); return ok; } @@ -159,11 +160,11 @@ main (int argc, char *argv[]) GNUNET_log_setup ("test-arm-api", #if VERBOSE - "DEBUG", + "DEBUG", #else - "WARNING", + "WARNING", #endif - NULL); + NULL); ret = check (); return ret;