X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcore%2Ftest_core_api_start_only.c;h=255de0319da72d695cd4d33c20a595730ae3fa80;hb=f57cbab24fb7a22fc982eb8b6c4a2d18402be460;hp=ca301f51e83f9545dcb7ca410ac2de24d41ce159;hpb=5746309cb4be2073d550ad7a6885e918631dbc38;p=oweals%2Fgnunet.git diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c index ca301f51e..255de0319 100644 --- a/src/core/test_core_api_start_only.c +++ b/src/core/test_core_api_start_only.c @@ -23,7 +23,6 @@ * connects to the core service and shuts down again */ #include "platform.h" -#include "gnunet_common.h" #include "gnunet_arm_service.h" #include "gnunet_core_service.h" #include "gnunet_getopt_lib.h" @@ -31,11 +30,7 @@ #include "gnunet_program_lib.h" #include "gnunet_scheduler_lib.h" -#define VERBOSE GNUNET_NO - -#define TIMEOUT 3 - -#define START_ARM GNUNET_YES +#define TIMEOUT 5 #define MTYPE 12345 @@ -44,9 +39,7 @@ struct PeerContext struct GNUNET_CONFIGURATION_Handle *cfg; struct GNUNET_CORE_Handle *ch; struct GNUNET_PeerIdentity id; -#if START_ARM struct GNUNET_OS_Process *arm_proc; -#endif }; static struct PeerContext p1; @@ -58,7 +51,7 @@ static GNUNET_SCHEDULER_TaskIdentifier timeout_task_id; static int ok; #if VERBOSE -#define OKPP do { ok++; fprintf (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0) +#define OKPP do { ok++; FPRINTF (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0) #else #define OKPP do { ok++; } while (0) #endif @@ -66,8 +59,7 @@ static int ok; static void -connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_TRANSPORT_ATS_Information *atsi) +connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer) { } @@ -80,8 +72,7 @@ disconnect_notify (void *cls, const struct GNUNET_PeerIdentity *peer) static int inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other, - const struct GNUNET_MessageHeader *message, - const struct GNUNET_TRANSPORT_ATS_Information *atsi) + const struct GNUNET_MessageHeader *message) { return GNUNET_OK; } @@ -89,8 +80,7 @@ inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other, static int outbound_notify (void *cls, const struct GNUNET_PeerIdentity *other, - const struct GNUNET_MessageHeader *message, - const struct GNUNET_TRANSPORT_ATS_Information *atsi) + const struct GNUNET_MessageHeader *message) { return GNUNET_OK; } @@ -112,29 +102,23 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } - - static void -init_notify (void *cls, struct GNUNET_CORE_Handle *server, - const struct GNUNET_PeerIdentity *my_identity, - const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey) +init_notify (void *cls, + const struct GNUNET_PeerIdentity *my_identity) { struct PeerContext *p = cls; - GNUNET_assert (server != NULL); - GNUNET_assert (p->ch == server); - if (cls == &p1) + if (p == &p1) { /* connect p2 */ p2.ch = - GNUNET_CORE_connect (p2.cfg, 1, &p2, &init_notify, &connect_notify, - &disconnect_notify, NULL, &inbound_notify, - GNUNET_YES, &outbound_notify, GNUNET_YES, - handlers); + GNUNET_CORE_connect (p2.cfg, &p2, &init_notify, &connect_notify, + &disconnect_notify, &inbound_notify, GNUNET_YES, + &outbound_notify, GNUNET_YES, handlers); } else { - GNUNET_assert (cls == &p2); + GNUNET_assert (p == &p2); GNUNET_SCHEDULER_cancel (timeout_task_id); GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); } @@ -144,24 +128,25 @@ init_notify (void *cls, struct GNUNET_CORE_Handle *server, static void setup_peer (struct PeerContext *p, const char *cfgname) { + char *binary; + + binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); p->cfg = GNUNET_CONFIGURATION_create (); -#if START_ARM p->arm_proc = - GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", - "gnunet-service-arm", -#if VERBOSE - "-L", "DEBUG", -#endif - "-c", cfgname, NULL); -#endif + GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, + NULL, NULL, + binary, + "gnunet-service-arm", + "-c", cfgname, NULL); GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); + GNUNET_free (binary); } static void timeout_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - fprintf (stderr, "Timeout.\n"); + FPRINTF (stderr, "%s", "Timeout.\n"); if (p1.ch != NULL) { GNUNET_CORE_disconnect (p1.ch); @@ -176,7 +161,6 @@ timeout_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } - static void run (void *cls, char *const *args, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) @@ -190,9 +174,9 @@ run (void *cls, char *const *args, const char *cfgfile, (GNUNET_TIME_UNIT_MINUTES, TIMEOUT), &timeout_task, NULL); p1.ch = - GNUNET_CORE_connect (p1.cfg, 1, &p1, &init_notify, &connect_notify, - &disconnect_notify, NULL, &inbound_notify, - GNUNET_YES, &outbound_notify, GNUNET_YES, handlers); + GNUNET_CORE_connect (p1.cfg, &p1, &init_notify, &connect_notify, + &disconnect_notify, &inbound_notify, GNUNET_YES, + &outbound_notify, GNUNET_YES, handlers); } @@ -200,16 +184,14 @@ static void stop_arm (struct PeerContext *p) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peer\n"); -#if START_ARM - if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) + if (0 != GNUNET_OS_process_kill (p->arm_proc, GNUNET_TERM_SIG)) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK) GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", GNUNET_OS_process_get_pid (p->arm_proc)); - GNUNET_OS_process_close (p->arm_proc); + GNUNET_OS_process_destroy (p->arm_proc); p->arm_proc = NULL; -#endif GNUNET_CONFIGURATION_destroy (p->cfg); } @@ -220,9 +202,6 @@ check () char *const argv[] = { "test-core-api-start-only", "-c", "test_core_api_data.conf", -#if VERBOSE - "-L", "DEBUG", -#endif NULL }; struct GNUNET_GETOPT_CommandLineOption options[] = { @@ -240,17 +219,14 @@ check () return ok; } + int main (int argc, char *argv[]) { int ret; GNUNET_log_setup ("test-core-api-start-only", -#if VERBOSE - "DEBUG", -#else "WARNING", -#endif NULL); ret = check (); GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1");