summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Schanzenbach <mschanzenbach@posteo.de>2020-08-04 19:40:29 +0200
committerMartin Schanzenbach <mschanzenbach@posteo.de>2020-08-04 19:40:29 +0200
commit34b1431c1a10a47fa8304ef1f3b3d83f79dd098c (patch)
tree94430972e1b399e34e7f27c03cd55dce1a43496c /src
parent815ded19f106990a37bbacec83546b1b897491f6 (diff)
parent40c7f4763b97bbef4bd67584068d388395ff885b (diff)
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'src')
-rw-r--r--src/transport/transport-testing2.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/transport/transport-testing2.c b/src/transport/transport-testing2.c
index 10b064241..13944e9f0 100644
--- a/src/transport/transport-testing2.c
+++ b/src/transport/transport-testing2.c
@@ -897,6 +897,7 @@ shutdown_process (struct GNUNET_OS_Process *proc)
GNUNET_OS_process_destroy (proc);
}
+
static void
shutdown_peerstore (void *cls)
{
@@ -904,6 +905,7 @@ shutdown_peerstore (void *cls)
shutdown_process (proc);
}
+
static void
shutdown_communicator (void *cls)
{
@@ -939,8 +941,8 @@ communicator_start (
binary = GNUNET_OS_get_libexec_binary_path (binary_name);
- tc_h->c_proc = GNUNET_OS_start_process_s (GNUNET_YES,
- GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+ tc_h->c_proc = GNUNET_OS_start_process_s (GNUNET_OS_USE_PIPE_CONTROL
+ | GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
NULL,
loprefix,
binary,
@@ -1026,8 +1028,8 @@ peerstore_start (
LOG (GNUNET_ERROR_TYPE_DEBUG, "peerstore_start\n");
binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-peerstore");
- tc_h->ps_proc = GNUNET_OS_start_process (GNUNET_YES,
- GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+ tc_h->ps_proc = GNUNET_OS_start_process (GNUNET_OS_USE_PIPE_CONTROL
+ | GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
NULL,
NULL,
NULL,
@@ -1045,6 +1047,7 @@ peerstore_start (
GNUNET_free (binary);
}
+
/**
* @brief Start NAT
*