/*
This file is part of GNUnet.
- (C) 2009, 2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009, 2011, 2016 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @file arm/test_arm_api.c
* @brief testcase for arm_api.c
*/
#include "platform.h"
-#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
#include "gnunet_arm_service.h"
-#include "gnunet_client_lib.h"
-#include "gnunet_configuration_lib.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_program_lib.h"
#include "gnunet_resolver_service.h"
-#define START_ARM GNUNET_YES
-
-#define START_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 1500)
+#define LOG(...) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
static struct GNUNET_ARM_Handle *arm;
+static struct GNUNET_ARM_Operation *op;
+
static int ok = 1;
static int phase = 0;
+
static void
-arm_stop_cb (void *cls, struct GNUNET_ARM_Handle *h, enum GNUNET_ARM_RequestStatus status, const char *servicename, enum GNUNET_ARM_Result result)
+arm_stop_cb (void *cls,
+ enum GNUNET_ARM_RequestStatus status,
+ enum GNUNET_ARM_Result result)
{
+ op = NULL;
/* (6), a stop request should be sent to ARM successfully */
/* ARM should report that it is stopping */
GNUNET_break (status == GNUNET_ARM_REQUEST_SENT_OK);
- GNUNET_break (result == GNUNET_ARM_RESULT_STOPPING);
+ GNUNET_break (result == GNUNET_ARM_RESULT_STOPPED);
GNUNET_break (phase == 6);
phase++;
- FPRINTF (stderr, "Sent 'STOP' request for arm to ARM %s\n", (status == GNUNET_ARM_REQUEST_SENT_OK) ? "successfully" : "unsuccessfully");
+ LOG ("Sent 'STOP' request for arm to ARM %s\n",
+ (status == GNUNET_ARM_REQUEST_SENT_OK) ? "successfully" : "unsuccessfully");
+ GNUNET_SCHEDULER_shutdown ();
}
+
static void
-resolver_stop_cb (void *cls, struct GNUNET_ARM_Handle *h, enum GNUNET_ARM_RequestStatus status, const char *servicename, enum GNUNET_ARM_Result result)
+resolver_stop_cb (void *cls,
+ enum GNUNET_ARM_RequestStatus status,
+ enum GNUNET_ARM_Result result)
{
+ op = NULL;
/* (5), a stop request should be sent to ARM successfully.
* ARM should report that resolver is stopped.
*/
GNUNET_break (status == GNUNET_ARM_REQUEST_SENT_OK);
GNUNET_break (result == GNUNET_ARM_RESULT_STOPPED);
GNUNET_break (phase == 5);
- FPRINTF (stderr, "Sent 'STOP' request for resolver to ARM %s\n", (status == GNUNET_ARM_REQUEST_SENT_OK) ? "successfully" : "unsuccessfully");
+ LOG ("Sent 'STOP' request for resolver to ARM %s\n",
+ (status == GNUNET_ARM_REQUEST_SENT_OK) ? "successfully" : "unsuccessfully");
phase++;
-#if START_ARM
- GNUNET_ARM_request_service_stop (arm, "arm", TIMEOUT, arm_stop_cb, NULL);
-#else
- arm_stop_cb (NULL, GNUNET_ARM_STATUS_SENT_OK, "arm", GNUNET_ARM_SERVICE_STOPPING);
- arm_conn (NULL, GNUNET_NO, GNUNET_NO);
-#endif
+ GNUNET_assert (NULL == op);
+ op = GNUNET_ARM_request_service_stop (arm,
+ "arm",
+ &arm_stop_cb,
+ NULL);
}
+
static void
-dns_notify (void *cls, const struct sockaddr *addr, socklen_t addrlen)
+dns_notify (void *cls,
+ const struct sockaddr *addr,
+ socklen_t addrlen)
{
if (addr == NULL)
{
/* (4), resolver should finish resolving localhost */
GNUNET_break (phase == 4);
phase++;
- FPRINTF (stderr, "%s", "Finished resolving localhost\n");
+ LOG ("Finished resolving localhost\n");
if (ok != 0)
ok = 2;
- GNUNET_ARM_request_service_stop (arm, "resolver", TIMEOUT, resolver_stop_cb, NULL);
+ GNUNET_assert (NULL == op);
+ op = GNUNET_ARM_request_service_stop (arm,
+ "resolver",
+ &resolver_stop_cb,
+ NULL);
return;
}
/* (3), resolver should resolve localhost */
GNUNET_break (phase == 3);
- FPRINTF (stderr, "%s", "Resolved localhost\n");
+ LOG ("Resolved localhost\n");
phase++;
GNUNET_break (addr != NULL);
ok = 0;
}
+
static void
-resolver_start_cb (void *cls, struct GNUNET_ARM_Handle *h, enum GNUNET_ARM_RequestStatus status, const char *servicename, enum GNUNET_ARM_Result result)
+resolver_start_cb (void *cls,
+ enum GNUNET_ARM_RequestStatus status,
+ enum GNUNET_ARM_Result result)
{
+ op = NULL;
/* (2), the start request for resolver should be sent successfully
* ARM should report that resolver service is starting.
*/
GNUNET_assert (status == GNUNET_ARM_REQUEST_SENT_OK);
GNUNET_break (phase == 2);
GNUNET_break (result == GNUNET_ARM_RESULT_STARTING);
- FPRINTF (stderr, "Sent 'START' request for resolver to ARM %s\n", (status == GNUNET_ARM_REQUEST_SENT_OK) ? "successfully" : "unsuccessfully");
+ LOG ("Sent 'START' request for resolver to ARM %s\n",
+ (status == GNUNET_ARM_REQUEST_SENT_OK) ? "successfully" : "unsuccessfully");
phase++;
- GNUNET_RESOLVER_ip_get ("localhost", AF_INET, TIMEOUT, &dns_notify, NULL);
-}
-
-static void
-trigger_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- GNUNET_ARM_disconnect ((struct GNUNET_ARM_Handle *) cls);
+ GNUNET_RESOLVER_ip_get ("localhost",
+ AF_INET,
+ TIMEOUT,
+ &dns_notify, NULL);
}
-void
-arm_conn (void *cls, struct GNUNET_ARM_Handle *arm, unsigned char connected, unsigned char error)
+static void
+arm_conn (void *cls,
+ int connected)
{
- if (GNUNET_YES == error)
+ if (GNUNET_SYSERR == connected)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Fatal error initializing ARM API.\n"));
GNUNET_assert (0);
return;
}
- if (connected)
+ if (GNUNET_YES == connected)
{
/* (1), arm connection should be established */
- FPRINTF (stderr, "%s", "Connected to ARM\n");
+ LOG ("Connected to ARM\n");
GNUNET_break (phase == 1);
phase++;
- GNUNET_ARM_request_service_start (arm, "resolver", GNUNET_OS_INHERIT_STD_OUT_AND_ERR, START_TIMEOUT, resolver_start_cb, NULL);
+ GNUNET_assert (NULL == op);
+ op = GNUNET_ARM_request_service_start (arm,
+ "resolver",
+ GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+ &resolver_start_cb,
+ NULL);
}
else
{
/* (7), ARM should stop (we disconnect from it) */
- FPRINTF (stderr, "%s", "Disconnected from ARM\n");
+ LOG ("Disconnected from ARM\n");
GNUNET_break (phase == 7);
if (phase != 7)
ok = 3;
else if (ok == 1)
ok = 0;
- GNUNET_SCHEDULER_add_now (trigger_disconnect, arm);
}
}
-void
-srv_status (void *cls, const char *service, enum GNUNET_ARM_ServiceStatus status)
-{
- FPRINTF (stderr, "Service %s is %u\n", service, status);
- switch (phase)
- {
- default:
- FPRINTF (stderr, "Unexpectedly got status %u for service %s\n", status,
- service);
- GNUNET_break (0);
- ok = 2;
-#if START_ARM
- GNUNET_ARM_request_service_stop (arm, "arm", TIMEOUT, NULL, NULL);
-#endif
- }
-}
static void
-arm_start_cb (void *cls, struct GNUNET_ARM_Handle *h, enum GNUNET_ARM_RequestStatus status, const char *servicename, enum GNUNET_ARM_Result result)
+arm_start_cb (void *cls,
+ enum GNUNET_ARM_RequestStatus status,
+ enum GNUNET_ARM_Result result)
{
+ op = NULL;
/* (0) The request should be "sent" successfully
* ("sent", because it isn't going anywhere, ARM API starts ARM service
* by itself).
*/
GNUNET_break (status == GNUNET_ARM_REQUEST_SENT_OK);
GNUNET_break (phase == 0);
- FPRINTF (stderr, "Sent 'START' request for arm to ARM %s\n", (status == GNUNET_ARM_REQUEST_SENT_OK) ? "successfully" : "unsuccessfully");
+ LOG ("Sent 'START' request for arm to ARM %s\n",
+ (status == GNUNET_ARM_REQUEST_SENT_OK) ? "successfully" : "unsuccessfully");
GNUNET_break (result == GNUNET_ARM_RESULT_STARTING);
phase++;
}
+
static void
-task (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *c)
+do_shutdown (void *cls)
{
- char *armconfig;
- cfg = c;
- if (NULL != cfgfile)
+ if (NULL != op)
{
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (cfg, "arm", "CONFIG",
- &armconfig))
- {
- GNUNET_CONFIGURATION_set_value_string ((struct GNUNET_CONFIGURATION_Handle
- *) cfg, "arm", "CONFIG",
- cfgfile);
- }
- else
- GNUNET_free (armconfig);
+ GNUNET_ARM_operation_cancel (op);
+ op = NULL;
+ }
+ if (NULL != arm)
+ {
+ GNUNET_ARM_disconnect (arm);
+ arm = NULL;
}
- arm = GNUNET_ARM_alloc (cfg);
- GNUNET_ARM_connect (arm, arm_conn, NULL);
-#if START_ARM
- GNUNET_ARM_request_service_start (arm, "arm", GNUNET_OS_INHERIT_STD_OUT_AND_ERR, START_TIMEOUT, arm_start_cb, NULL);
-#else
- arm_start_cb (NULL, arm, GNUNET_ARM_REQUEST_SENT_OK, "arm", GNUNET_ARM_RESULT_STARTING);
- arm_conn (NULL, GNUNET_YES, GNUNET_NO);
-#endif
}
+static void
+task (void *cls,
+ char *const *args,
+ const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *c)
+{
+ cfg = c;
+ arm = GNUNET_ARM_connect (cfg,
+ &arm_conn,
+ NULL);
+ if (NULL == arm)
+ return;
+ GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
+ NULL);
+ op = GNUNET_ARM_request_service_start (arm,
+ "arm",
+ GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+ &arm_start_cb,
+ NULL);
+}
+
-static int
-check ()
+int
+main (int argc, char *argvx[])
{
char *const argv[] = {
"test-arm-api",
struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_END
};
+ GNUNET_log_setup ("test-arm-api",
+ "WARNING",
+ NULL);
GNUNET_assert (GNUNET_OK ==
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
argv, "test-arm-api", "nohelp", options,
return ok;
}
-int
-main (int argc, char *argv[])
-{
- int ret;
-
-
- GNUNET_log_setup ("test-arm-api",
- "WARNING",
- NULL);
- ret = check ();
-
- return ret;
-}
-
/* end of test_arm_api.c */
projects / oweals / gnunet.git / blobdiff