/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+ (C) 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
static struct GNUNET_NSE_Handle *h;
-GNUNET_SCHEDULER_TaskIdentifier die_task;
+static GNUNET_SCHEDULER_TaskIdentifier die_task;
struct PeerContext
{
static struct PeerContext p1;
+
+static void
+stop_arm (struct PeerContext *p)
+{
+#if START_ARM
+ if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+ GNUNET_OS_process_wait (p->arm_proc);
+ GNUNET_OS_process_close (p->arm_proc);
+ p->arm_proc = NULL;
+#endif
+ GNUNET_CONFIGURATION_destroy (p->cfg);
+}
+
/**
* Signature of the main function of a task.
*
* @param cls closure
* @param tc context information (why was this task triggered now)
*/
-static void end_test (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext * tc)
+static void
+end_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
if (h != NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Disconnecting from NSE service.\n");
- GNUNET_NSE_disconnect (h);
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from NSE service.\n");
+ GNUNET_NSE_disconnect (h);
+ }
}
/**
* Callback to call when network size estimate is updated.
*
* @param cls unused
+ * @param timestamp time when the estimate was received from the server (or created by the server)
* @param estimate the value of the current network size estimate
* @param std_dev standard deviation (rounded down to nearest integer)
* of the size estimation values seen
- * @return GNUNET_OK to continue, GNUNET_SYSERR to abort iteration
+ *
*/
-static int
-check_nse_message (void *cls, double estimate, double std_dev)
+static void
+check_nse_message (void *cls, struct GNUNET_TIME_Absolute timestamp,
+ double estimate, double std_dev)
{
int *ok = cls;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received NSE message, estimate %f, standard deviation %f.\n");
+ FPRINTF (stderr,
+ "Received NSE message, estimate %f, standard deviation %f.\n",
+ estimate, std_dev);
/* Fantastic check below. Expect NaN, the only thing not equal to itself. */
- if ((estimate != estimate) && (std_dev != std_dev))
- (*ok) = 0;
-
+ (*ok) = 0;
if (die_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel(die_task);
- GNUNET_SCHEDULER_add_now(&end_test, NULL);
- return GNUNET_OK;
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_now (&end_test, NULL);
}
+
static void
setup_peer (struct PeerContext *p, const char *cfgname)
{
p->cfg = GNUNET_CONFIGURATION_create ();
#if START_ARM
- p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
- "gnunet-service-arm",
+ p->arm_proc =
+ GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
+ "gnunet-service-arm",
#if VERBOSE_ARM
- "-L", "DEBUG",
+ "-L", "DEBUG",
#endif
- "-c", cfgname, NULL);
+ "-c", cfgname, NULL);
#endif
GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
}
-static void
-stop_arm (struct PeerContext *p)
-{
-#if START_ARM
- if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
- GNUNET_OS_process_wait (p->arm_proc);
- GNUNET_OS_process_close (p->arm_proc);
- p->arm_proc = NULL;
-#endif
- GNUNET_CONFIGURATION_destroy (p->cfg);
-}
+
static void
-run (void *cls,
- char *const *args,
- const char *cfgfile,
+run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- die_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_MINUTES, 1),
- &end_test, NULL);
+ die_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_MINUTES, 1), &end_test,
+ NULL);
setup_peer (&p1, cfgfile);
h = GNUNET_NSE_connect (cfg, &check_nse_message, cls);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Connecting to NSE service.\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connecting to NSE service.\n");
GNUNET_assert (h != NULL);
}
+
static int
check ()
{
int ok = 1;
+
char *const argv[] = { "test-nse-api",
"-c",
"test_nse.conf",
#if DEBUG_NSE
- "-L", "DEBUG",
+ "-L", "DEBUG",
#else
- "-L", "WARNING",
+ "-L", "WARNING",
#endif
NULL
};
GNUNET_GETOPT_OPTION_END
};
- GNUNET_PROGRAM_run (5, argv, "test-nse-api", "nohelp",
- options, &run, &ok);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Stopping arm.\n");
+ GNUNET_PROGRAM_run (5, argv, "test-nse-api", "nohelp", options, &run, &ok);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping arm.\n");
stop_arm (&p1);
+ if (0 != ok)
+ FPRINTF (stderr, "%s", "No information received from NSE service!\n");
return ok;
}
+
int
main (int argc, char *argv[])
{