From 7f4ddbcab8598e3d5e29c23ce883cdfa664408f1 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 18 Jul 2020 00:44:39 +0200 Subject: merge flags into enum for GNUNET_DISK_pipe() API, fixing #6188 --- src/transport/transport-testing2.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'src/transport/transport-testing2.c') diff --git a/src/transport/transport-testing2.c b/src/transport/transport-testing2.c index 2a7a1dfcb..772ad9f2d 100644 --- a/src/transport/transport-testing2.c +++ b/src/transport/transport-testing2.c @@ -671,8 +671,8 @@ handle_update_queue_message (void *cls, struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue *tc_queue; LOG (GNUNET_ERROR_TYPE_DEBUG, - "Received queue update message for %u with q_len %"PRIu64"\n", - msg->qid, GNUNET_ntohll(msg->q_len)); + "Received queue update message for %u with q_len %" PRIu64 "\n", + msg->qid, GNUNET_ntohll (msg->q_len)); tc_queue = tc_h->queue_head; if (NULL != tc_queue) { @@ -947,6 +947,7 @@ shutdown_nat (void *cls) shutdown_process (proc); } + /** * @brief Task run at shutdown to kill the resolver process * @@ -959,6 +960,7 @@ shutdown_resolver (void *cls) shutdown_process (proc); } + static void resolver_start (struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h) @@ -967,16 +969,17 @@ resolver_start (struct LOG (GNUNET_ERROR_TYPE_DEBUG, "resolver_start\n"); binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver"); - tc_h->resolver_proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR - | GNUNET_OS_USE_PIPE_CONTROL, - NULL, - NULL, - NULL, - binary, - "gnunet-service-resolver", - "-c", - tc_h->cfg_filename, - NULL); + tc_h->resolver_proc = GNUNET_OS_start_process ( + GNUNET_OS_INHERIT_STD_OUT_AND_ERR + | GNUNET_OS_USE_PIPE_CONTROL, + NULL, + NULL, + NULL, + binary, + "gnunet-service-resolver", + "-c", + tc_h->cfg_filename, + NULL); if (NULL == tc_h->resolver_proc) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to start resolver service!"); @@ -987,6 +990,7 @@ resolver_start (struct } + /** * @brief Start NAT * -- cgit v1.2.3