diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-07-18 00:44:39 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-07-18 00:44:39 +0200 |
commit | 7f4ddbcab8598e3d5e29c23ce883cdfa664408f1 (patch) | |
tree | 5f1b18463f641f24fad519e0aefb60b97d707b52 /src/transport/transport-testing2.c | |
parent | 28ab2c446fba4980a8295d59fdf203a028a35dd6 (diff) | |
download | gnunet-7f4ddbcab8598e3d5e29c23ce883cdfa664408f1.tar.gz gnunet-7f4ddbcab8598e3d5e29c23ce883cdfa664408f1.zip |
merge flags into enum for GNUNET_DISK_pipe() API, fixing #6188
Diffstat (limited to 'src/transport/transport-testing2.c')
-rw-r--r-- | src/transport/transport-testing2.c | 28 |
1 files changed, 16 insertions, 12 deletions
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, | |||
671 | struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue *tc_queue; | 671 | struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue *tc_queue; |
672 | 672 | ||
673 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 673 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
674 | "Received queue update message for %u with q_len %"PRIu64"\n", | 674 | "Received queue update message for %u with q_len %" PRIu64 "\n", |
675 | msg->qid, GNUNET_ntohll(msg->q_len)); | 675 | msg->qid, GNUNET_ntohll (msg->q_len)); |
676 | tc_queue = tc_h->queue_head; | 676 | tc_queue = tc_h->queue_head; |
677 | if (NULL != tc_queue) | 677 | if (NULL != tc_queue) |
678 | { | 678 | { |
@@ -947,6 +947,7 @@ shutdown_nat (void *cls) | |||
947 | shutdown_process (proc); | 947 | shutdown_process (proc); |
948 | } | 948 | } |
949 | 949 | ||
950 | |||
950 | /** | 951 | /** |
951 | * @brief Task run at shutdown to kill the resolver process | 952 | * @brief Task run at shutdown to kill the resolver process |
952 | * | 953 | * |
@@ -959,6 +960,7 @@ shutdown_resolver (void *cls) | |||
959 | shutdown_process (proc); | 960 | shutdown_process (proc); |
960 | } | 961 | } |
961 | 962 | ||
963 | |||
962 | static void | 964 | static void |
963 | resolver_start (struct | 965 | resolver_start (struct |
964 | GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h) | 966 | GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h) |
@@ -967,16 +969,17 @@ resolver_start (struct | |||
967 | 969 | ||
968 | LOG (GNUNET_ERROR_TYPE_DEBUG, "resolver_start\n"); | 970 | LOG (GNUNET_ERROR_TYPE_DEBUG, "resolver_start\n"); |
969 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver"); | 971 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver"); |
970 | tc_h->resolver_proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR | 972 | tc_h->resolver_proc = GNUNET_OS_start_process ( |
971 | | GNUNET_OS_USE_PIPE_CONTROL, | 973 | GNUNET_OS_INHERIT_STD_OUT_AND_ERR |
972 | NULL, | 974 | | GNUNET_OS_USE_PIPE_CONTROL, |
973 | NULL, | 975 | NULL, |
974 | NULL, | 976 | NULL, |
975 | binary, | 977 | NULL, |
976 | "gnunet-service-resolver", | 978 | binary, |
977 | "-c", | 979 | "gnunet-service-resolver", |
978 | tc_h->cfg_filename, | 980 | "-c", |
979 | NULL); | 981 | tc_h->cfg_filename, |
982 | NULL); | ||
980 | if (NULL == tc_h->resolver_proc) | 983 | if (NULL == tc_h->resolver_proc) |
981 | { | 984 | { |
982 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to start resolver service!"); | 985 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to start resolver service!"); |
@@ -987,6 +990,7 @@ resolver_start (struct | |||
987 | 990 | ||
988 | } | 991 | } |
989 | 992 | ||
993 | |||
990 | /** | 994 | /** |
991 | * @brief Start NAT | 995 | * @brief Start NAT |
992 | * | 996 | * |