GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
#define START_ARM GNUNET_YES
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
+#define START_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 1500)
-static struct GNUNET_SCHEDULER_Handle *sched;
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
-static struct GNUNET_CONFIGURATION_Handle *cfg;
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+static struct GNUNET_ARM_Handle *arm;
static int ok = 1;
+static void
+arm_stopped (void *cls, int success)
+{
+ if (success != GNUNET_NO)
+ ok = 3;
+ else if (ok == 1)
+ ok = 0;
+}
+
+static void
+arm_notify_stop (void *cls, int success)
+{
+ GNUNET_assert (success == GNUNET_NO);
+#if START_ARM
+ GNUNET_ARM_stop_service (arm, "arm", TIMEOUT, &arm_stopped, NULL);
+#endif
+}
+
+
static void
dns_notify (void *cls, const struct sockaddr *addr, socklen_t addrlen)
{
if (addr == NULL)
+ {
+ if (ok != 0)
{
- GNUNET_assert (ok == 0);
-#if START_ARM
- GNUNET_ARM_stop_service ("arm", cfg, sched, TIMEOUT, NULL, NULL);
-#endif
- return;
+ GNUNET_break (0);
+ ok = 2;
}
+ GNUNET_ARM_stop_service (arm, "resolver", TIMEOUT, &arm_notify_stop, NULL);
+ return;
+ }
GNUNET_assert (addr != NULL);
ok = 0;
}
static void
resolver_notify (void *cls, int success)
{
- GNUNET_assert (success == GNUNET_YES);
- sleep (1); /* FIXME: that we need to do this is a problem... */
- GNUNET_RESOLVER_ip_get (sched,
- cfg,
- "localhost", AF_INET, TIMEOUT, &dns_notify, NULL);
+ if (success != GNUNET_YES)
+ {
+ GNUNET_break (0);
+ ok = 2;
+#if START_ARM
+ GNUNET_ARM_stop_service (arm, "arm", TIMEOUT, &arm_stopped, NULL);
+#endif
+ return;
+ }
+ GNUNET_RESOLVER_ip_get ("localhost", AF_INET, TIMEOUT, &dns_notify, NULL);
}
+
static void
arm_notify (void *cls, int success)
{
- GNUNET_assert (success == GNUNET_YES);
+ if (success != GNUNET_YES)
+ {
+ GNUNET_break (0);
+ ok = 2;
#if START_ARM
- sleep (1); /* FIXME: that we need to do this is a problem... */
+ GNUNET_ARM_stop_service (arm, "arm", TIMEOUT, &arm_stopped, NULL);
#endif
- GNUNET_ARM_start_service ("resolver",
- cfg, sched, TIMEOUT, &resolver_notify, NULL);
+ }
+ GNUNET_ARM_start_service (arm, "resolver", START_TIMEOUT, &resolver_notify,
+ NULL);
}
static void
-task (void *cls,
- struct GNUNET_SCHEDULER_Handle *s,
- char *const *args,
- const char *cfgfile, struct GNUNET_CONFIGURATION_Handle *c)
+task (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *c)
{
cfg = c;
- sched = s;
+ arm = GNUNET_ARM_connect (cfg, NULL);
#if START_ARM
- GNUNET_ARM_start_service ("arm", cfg, sched, TIMEOUT, &arm_notify, NULL);
+ GNUNET_ARM_start_service (arm, "arm", START_TIMEOUT, &arm_notify, NULL);
#else
arm_notify (NULL, GNUNET_YES);
#endif
};
GNUNET_assert (GNUNET_OK ==
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
- argv,
- "test-arm-api",
- "nohelp", options, &task, NULL));
+ argv, "test-arm-api", "nohelp", options,
+ &task, NULL));
return ok;
}