/*
This file is part of GNUnet.
- (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009, 2010, 2015, 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
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- 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.
+ Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file core/test_core_api_reliability.c
* @brief testcase for core_api.c focusing on reliable transmission (with TCP)
+ * @author Christian Grothoff
*/
#include "platform.h"
#include "gnunet_arm_service.h"
#include "gnunet_core_service.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_scheduler_lib.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_ats_service.h"
#include "gnunet_transport_service.h"
+#include "gnunet_transport_hello_service.h"
#include <gauger.h>
/**
/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 6000)
-
-/**
- * What delay do we request from the core service for transmission?
- */
-#define FAST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 600)
#define MTYPE 12345
static struct GNUNET_TIME_Absolute start_time;
-static GNUNET_SCHEDULER_TaskIdentifier err_task;
-
-static GNUNET_SCHEDULER_TaskIdentifier connect_task;
+static struct GNUNET_SCHEDULER_Task *err_task;
struct PeerContext
{
struct GNUNET_CONFIGURATION_Handle *cfg;
struct GNUNET_CORE_Handle *ch;
+ struct GNUNET_MQ_Handle *mq;
struct GNUNET_PeerIdentity id;
- struct GNUNET_TRANSPORT_Handle *th;
+ struct GNUNET_TRANSPORT_OfferHelloHandle *oh;
struct GNUNET_MessageHeader *hello;
- struct GNUNET_TRANSPORT_GetHelloHandle *ghh;
+ struct GNUNET_TRANSPORT_HelloGetHandle *ghh;
+ struct GNUNET_ATS_ConnectivityHandle *ats;
+ struct GNUNET_ATS_ConnectivitySuggestHandle *ats_sh;
int connect_status;
struct GNUNET_OS_Process *arm_proc;
};
struct TestMessage
{
struct GNUNET_MessageHeader header;
- uint32_t num;
+ uint32_t num GNUNET_PACKED;
};
static void
-process_hello (void *cls, const struct GNUNET_MessageHeader *message);
-
-
-static void
-terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- unsigned long long delta;
-
- GNUNET_TRANSPORT_get_hello_cancel (p1.ghh);
- GNUNET_TRANSPORT_get_hello_cancel (p2.ghh);
- GNUNET_CORE_disconnect (p1.ch);
- p1.ch = NULL;
- GNUNET_free_non_null (p1.hello);
- GNUNET_CORE_disconnect (p2.ch);
- p2.ch = NULL;
- GNUNET_free_non_null (p2.hello);
- if (connect_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (connect_task);
- GNUNET_TRANSPORT_disconnect (p1.th);
- p1.th = NULL;
- GNUNET_TRANSPORT_disconnect (p2.th);
- p2.th = NULL;
- delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value_us;
- FPRINTF (stderr, "\nThroughput was %llu kb/s\n",
- total_bytes * 1000000LL / 1024 / delta);
- GAUGER ("CORE", "Core throughput/s", total_bytes * 1000000LL / 1024 / delta,
- "kb/s");
- ok = 0;
-}
-
-
-static void
-terminate_task_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+terminate_peer (struct PeerContext *p)
{
- GNUNET_break (0);
- if (p1.ch != NULL)
+ if (NULL != p->ch)
{
- GNUNET_CORE_disconnect (p1.ch);
- p1.ch = NULL;
+ GNUNET_CORE_disconnect (p->ch);
+ p->ch = NULL;
}
- if (p2.ch != NULL)
+ if (NULL != p->ghh)
{
- GNUNET_CORE_disconnect (p2.ch);
- p2.ch = NULL;
+ GNUNET_TRANSPORT_hello_get_cancel (p->ghh);
+ p->ghh = NULL;
}
- if (connect_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (connect_task);
- if (p1.th != NULL)
+ if (NULL != p->oh)
{
- GNUNET_TRANSPORT_get_hello_cancel (p1.ghh);
- GNUNET_TRANSPORT_disconnect (p1.th);
- p1.th = NULL;
+ GNUNET_TRANSPORT_offer_hello_cancel (p->oh);
+ p->oh = NULL;
}
- if (p2.th != NULL)
+ if (NULL != p->ats_sh)
{
- GNUNET_TRANSPORT_get_hello_cancel (p2.ghh);
- GNUNET_TRANSPORT_disconnect (p2.th);
- p2.th = NULL;
+ GNUNET_ATS_connectivity_suggest_cancel (p->ats_sh);
+ p->ats_sh = NULL;
+ }
+ if (NULL != p->ats)
+ {
+ GNUNET_ATS_connectivity_done (p->ats);
+ p->ats = NULL;
}
- ok = 42;
}
static void
-try_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+terminate_task_error (void *cls)
{
- connect_task =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &try_connect,
- NULL);
- GNUNET_TRANSPORT_try_connect (p1.th, &p2.id, NULL, NULL); /*FIXME TRY_CONNECT change */
+ err_task = NULL;
+ GNUNET_break (0);
+ GNUNET_SCHEDULER_shutdown ();
+ ok = 42;
}
-static size_t
-transmit_ready (void *cls, size_t size, void *buf)
+static void
+do_shutdown (void *cls)
{
- char *cbuf = buf;
- struct TestMessage hdr;
- unsigned int s;
- unsigned int ret;
+ unsigned long long delta;
- GNUNET_assert (size <= GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE);
- if (buf == NULL)
+ delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value_us;
+ FPRINTF (stderr,
+ "\nThroughput was %llu kb/s\n",
+ total_bytes * 1000000LL / 1024 / delta);
+ GAUGER ("CORE",
+ "Core throughput/s",
+ total_bytes * 1000000LL / 1024 / delta,
+ "kb/s");
+ if (NULL != err_task)
{
- if (p1.ch != NULL)
- GNUNET_break (NULL !=
- GNUNET_CORE_notify_transmit_ready (p1.ch, GNUNET_NO, 0,
- FAST_TIMEOUT, &p2.id,
- get_size (tr_n),
- &transmit_ready, &p1));
- return 0;
+ GNUNET_SCHEDULER_cancel (err_task);
+ err_task = NULL;
}
+ terminate_peer (&p1);
+ terminate_peer (&p2);
+
+}
+
+
+static void
+send_message (struct GNUNET_MQ_Handle *mq,
+ int32_t num)
+{
+ struct GNUNET_MQ_Envelope *env;
+ struct TestMessage *hdr;
+ unsigned int s;
+
+ GNUNET_assert (NULL != mq);
GNUNET_assert (tr_n < TOTAL_MSGS);
- ret = 0;
s = get_size (tr_n);
- GNUNET_assert (size >= s);
- GNUNET_assert (buf != NULL);
- cbuf = buf;
- do
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Sending message %u of size %u at offset %u\n", tr_n, s, ret);
- hdr.header.size = htons (s);
- hdr.header.type = htons (MTYPE);
- hdr.num = htonl (tr_n);
- memcpy (&cbuf[ret], &hdr, sizeof (struct TestMessage));
- ret += sizeof (struct TestMessage);
- memset (&cbuf[ret], tr_n, s - sizeof (struct TestMessage));
- ret += s - sizeof (struct TestMessage);
- tr_n++;
- s = get_size (tr_n);
- if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16))
- break; /* sometimes pack buffer full, sometimes not */
- }
- while (size - ret >= s);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending message %u of size %u\n",
+ tr_n,
+ s);
+ env = GNUNET_MQ_msg_extra (hdr,
+ s - sizeof (struct TestMessage),
+ MTYPE);
+ hdr->num = htonl (tr_n);
+ memset (&hdr[1],
+ tr_n,
+ s - sizeof (struct TestMessage));
+ tr_n++;
GNUNET_SCHEDULER_cancel (err_task);
err_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT, &terminate_task_error, NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Returning total message block of size %u\n", ret);
- total_bytes += ret;
- return ret;
+ GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+ &terminate_task_error,
+ NULL);
+ total_bytes += s;
+ GNUNET_MQ_send (mq,
+ env);
}
-static void
-connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer)
+static void *
+connect_notify (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ struct GNUNET_MQ_Handle *mq)
{
struct PeerContext *pc = cls;
- if (0 == memcmp (&pc->id, peer, sizeof (struct GNUNET_PeerIdentity)))
- return;
- GNUNET_assert (pc->connect_status == 0);
+ if (0 == memcmp (&pc->id,
+ peer,
+ sizeof (struct GNUNET_PeerIdentity)))
+ return (void *) peer;
+ pc->mq = mq;
+ GNUNET_assert (0 == pc->connect_status);
pc->connect_status = 1;
if (pc == &p1)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Encrypted connection established to peer `%4s'\n",
+ "Encrypted connection established to peer `%s'\n",
GNUNET_i2s (peer));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Asking core (1) for transmission to peer `%4s'\n",
+ "Asking core (1) for transmission to peer `%s'\n",
GNUNET_i2s (&p2.id));
GNUNET_SCHEDULER_cancel (err_task);
err_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT, &terminate_task_error, NULL);
+ GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+ &terminate_task_error,
+ NULL);
start_time = GNUNET_TIME_absolute_get ();
- GNUNET_break (NULL !=
- GNUNET_CORE_notify_transmit_ready (p1.ch, GNUNET_NO, 0,
- TIMEOUT, &p2.id,
- get_size (0),
- &transmit_ready, &p1));
+ send_message (mq,
+ 0);
}
+ return (void *) peer;
}
static void
-disconnect_notify (void *cls, const struct GNUNET_PeerIdentity *peer)
+disconnect_notify (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ void *internal_cls)
{
struct PeerContext *pc = cls;
- if (0 == memcmp (&pc->id, peer, sizeof (struct GNUNET_PeerIdentity)))
+ if (0 == memcmp (&pc->id,
+ peer,
+ sizeof (struct GNUNET_PeerIdentity)))
return;
+ pc->mq = NULL;
pc->connect_status = 0;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Encrypted connection to `%4s' cut\n",
- GNUNET_i2s (peer));
-}
-
-
-static int
-inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message)
-{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Core provides inbound data from `%4s'.\n", GNUNET_i2s (other));
- return GNUNET_OK;
+ "Encrypted connection to `%s' cut\n",
+ GNUNET_i2s (peer));
}
static int
-outbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message)
+check_test (void *cls,
+ const struct TestMessage *hdr)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Core notifies about outbound data for `%4s'.\n",
- GNUNET_i2s (other));
- return GNUNET_OK;
+ return GNUNET_OK; /* accept all */
}
-static size_t
-transmit_ready (void *cls, size_t size, void *buf);
-
-
-static int
-process_mtype (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message)
+static void
+handle_test (void *cls,
+ const struct TestMessage *hdr)
{
static int n;
unsigned int s;
- const struct TestMessage *hdr;
- hdr = (const struct TestMessage *) message;
s = get_size (n);
- if (MTYPE != ntohs (message->type))
- return GNUNET_SYSERR;
- if (ntohs (message->size) != s)
+ if (ntohs (hdr->header.size) != s)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Expected message %u of size %u, got %u bytes of message %u\n",
- n, s, ntohs (message->size), ntohl (hdr->num));
+ n,
+ s,
+ ntohs (hdr->header.size),
+ ntohl (hdr->num));
GNUNET_SCHEDULER_cancel (err_task);
- err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error, NULL);
- return GNUNET_SYSERR;
+ err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error,
+ NULL);
+ return;
}
if (ntohl (hdr->num) != n)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Expected message %u of size %u, got %u bytes of message %u\n",
- n, s, ntohs (message->size), ntohl (hdr->num));
+ n,
+ s,
+ (unsigned int) ntohs (hdr->header.size),
+ (unsigned int) ntohl (hdr->num));
GNUNET_SCHEDULER_cancel (err_task);
- err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error, NULL);
- return GNUNET_SYSERR;
+ err_task = GNUNET_SCHEDULER_add_now (&terminate_task_error,
+ NULL);
+ return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got message %u of size %u\n",
- ntohl (hdr->num), ntohs (message->size));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Got message %u of size %u\n",
+ (unsigned int) ntohl (hdr->num),
+ (unsigned int) ntohs (hdr->header.size));
n++;
if (0 == (n % (TOTAL_MSGS / 100)))
- FPRINTF (stderr, "%s", ".");
+ FPRINTF (stderr,
+ "%s",
+ ".");
if (n == TOTAL_MSGS)
{
- GNUNET_SCHEDULER_cancel (err_task);
- GNUNET_SCHEDULER_add_now (&terminate_task, NULL);
+ ok = 0;
+ GNUNET_SCHEDULER_shutdown ();
}
else
{
if (n == tr_n)
- GNUNET_break (NULL !=
- GNUNET_CORE_notify_transmit_ready (p1.ch, GNUNET_NO, 0,
- FAST_TIMEOUT, &p2.id,
- get_size (tr_n),
- &transmit_ready, &p1));
+ {
+ send_message (p1.mq,
+ tr_n);
+ }
}
- return GNUNET_OK;
}
-static struct GNUNET_CORE_MessageHandler handlers[] = {
- {&process_mtype, MTYPE, 0},
- {NULL, 0, 0}
-};
-
-
static void
-init_notify (void *cls,
+init_notify (void *cls,
const struct GNUNET_PeerIdentity *my_identity)
{
struct PeerContext *p = cls;
+ struct GNUNET_MQ_MessageHandler handlers[] = {
+ GNUNET_MQ_hd_var_size (test,
+ MTYPE,
+ struct TestMessage,
+ NULL),
+ GNUNET_MQ_handler_end ()
+ };
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Connection to CORE service of `%4s' established\n",
+ "Connection to CORE service of `%s' established\n",
GNUNET_i2s (my_identity));
p->id = *my_identity;
if (cls == &p1)
GNUNET_assert (ok == 2);
OKPP;
/* connect p2 */
- GNUNET_assert (NULL != (p2.ch = GNUNET_CORE_connect (p2.cfg, &p2, &init_notify, &connect_notify,
- &disconnect_notify, &inbound_notify, GNUNET_YES,
- &outbound_notify, GNUNET_YES, handlers)));
+ GNUNET_assert (NULL !=
+ (p2.ch = GNUNET_CORE_connect (p2.cfg,
+ &p2,
+ &init_notify,
+ &connect_notify,
+ &disconnect_notify,
+ handlers)));
}
else
{
OKPP;
GNUNET_assert (cls == &p2);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Asking transport (1) to connect to peer `%4s'\n",
+ "Asking transport (1) to connect to peer `%s'\n",
GNUNET_i2s (&p2.id));
- connect_task = GNUNET_SCHEDULER_add_now (&try_connect, NULL);
+ p1.ats_sh = GNUNET_ATS_connectivity_suggest (p1.ats,
+ &p2.id,
+ 1);
}
}
static void
-process_hello (void *cls, const struct GNUNET_MessageHeader *message)
+offer_hello_done (void *cls)
+{
+ struct PeerContext *p = cls;
+
+ p->oh = NULL;
+}
+
+
+static void
+process_hello (void *cls,
+ const struct GNUNET_MessageHeader *message)
{
struct PeerContext *p = cls;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received (my) `%s' from transport service\n", "HELLO");
GNUNET_assert (message != NULL);
+ GNUNET_free_non_null (p->hello);
p->hello = GNUNET_copy_message (message);
- if ((p == &p1) && (p2.th != NULL))
- GNUNET_TRANSPORT_offer_hello (p2.th, message, NULL, NULL);
- if ((p == &p2) && (p1.th != NULL))
- GNUNET_TRANSPORT_offer_hello (p1.th, message, NULL, NULL);
-
- if ((p == &p1) && (p2.hello != NULL))
- GNUNET_TRANSPORT_offer_hello (p1.th, p2.hello, NULL, NULL);
- if ((p == &p2) && (p1.hello != NULL))
- GNUNET_TRANSPORT_offer_hello (p2.th, p1.hello, NULL, NULL);
+ if ((p == &p1) && (NULL == p2.oh))
+ p2.oh = GNUNET_TRANSPORT_offer_hello (p2.cfg,
+ message,
+ &offer_hello_done,
+ &p2);
+ if ((p == &p2) && (NULL == p1.oh))
+ p1.oh = GNUNET_TRANSPORT_offer_hello (p1.cfg,
+ message,
+ &offer_hello_done,
+ &p1);
+
+ if ((p == &p1) && (p2.hello != NULL) && (NULL == p1.oh) )
+ p1.oh = GNUNET_TRANSPORT_offer_hello (p1.cfg,
+ p2.hello,
+ &offer_hello_done,
+ &p1);
+ if ((p == &p2) && (p1.hello != NULL) && (NULL == p2.oh) )
+ p2.oh = GNUNET_TRANSPORT_offer_hello (p2.cfg,
+ p1.hello,
+ &offer_hello_done,
+ &p2);
}
static void
-setup_peer (struct PeerContext *p, const char *cfgname)
+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 ();
- p->arm_proc =
- 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));
- p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, NULL, NULL);
- GNUNET_assert (p->th != NULL);
- p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p);
+ p->arm_proc
+ = GNUNET_OS_start_process (GNUNET_YES,
+ GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+ NULL, NULL, NULL,
+ binary,
+ "gnunet-service-arm",
+ "-c",
+ cfgname,
+ NULL);
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_load (p->cfg,
+ cfgname));
+ p->ats = GNUNET_ATS_connectivity_init (p->cfg);
+ GNUNET_assert (NULL != p->ats);
+ p->ghh = GNUNET_TRANSPORT_hello_get (p->cfg,
+ GNUNET_TRANSPORT_AC_ANY,
+ &process_hello,
+ p);
GNUNET_free (binary);
}
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)
{
+ struct GNUNET_MQ_MessageHandler handlers[] = {
+ GNUNET_MQ_hd_fixed_size (test,
+ MTYPE,
+ struct TestMessage,
+ NULL),
+ GNUNET_MQ_handler_end ()
+ };
+
GNUNET_assert (ok == 1);
OKPP;
- setup_peer (&p1, "test_core_api_peer1.conf");
- setup_peer (&p2, "test_core_api_peer2.conf");
+ setup_peer (&p1,
+ "test_core_api_peer1.conf");
+ setup_peer (&p2,
+ "test_core_api_peer2.conf");
err_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT, &terminate_task_error, NULL);
-
- GNUNET_assert (NULL != (p1.ch = GNUNET_CORE_connect (p1.cfg, &p1, &init_notify, &connect_notify,
- &disconnect_notify, &inbound_notify, GNUNET_YES,
- &outbound_notify, GNUNET_YES, handlers)));
+ GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+ &terminate_task_error,
+ NULL);
+ GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
+ NULL);
+
+ GNUNET_assert (NULL !=
+ (p1.ch = GNUNET_CORE_connect (p1.cfg,
+ &p1,
+ &init_notify,
+ &connect_notify,
+ &disconnect_notify,
+ handlers)));
}
static void
stop_arm (struct PeerContext *p)
{
- if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
- 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",
+ if (0 != GNUNET_OS_process_kill (p->arm_proc,
+ GNUNET_TERM_SIG))
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+ "kill");
+ if (GNUNET_OK != GNUNET_OS_process_wait (p->arm_proc))
+ 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_destroy (p->arm_proc);
p->arm_proc = NULL;
int
-main (int argc, char *argv1[])
+main (int argc,
+ char *argv1[])
{
- char *const argv[] = { "test-core-api-reliability",
+ char *const argv[] = {
+ "test-core-api-reliability",
"-c",
"test_core_api_data.conf",
NULL
GNUNET_GETOPT_OPTION_END
};
ok = 1;
- GNUNET_log_setup ("test-core-api",
+ GNUNET_log_setup ("test-core-api-reliability",
"WARNING",
NULL);
- GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
- "test-core-api-reliability", "nohelp", options, &run,
+ GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
+ argv,
+ "test-core-api-reliability",
+ "nohelp",
+ options,
+ &run,
&ok);
stop_arm (&p1);
stop_arm (&p2);
+ GNUNET_free_non_null (p1.hello);
+ GNUNET_free_non_null (p2.hello);
GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1");
GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-2");
projects / oweals / gnunet.git / blobdiff