diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-08-04 19:40:29 +0200 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-08-04 19:40:29 +0200 |
commit | 34b1431c1a10a47fa8304ef1f3b3d83f79dd098c (patch) | |
tree | 94430972e1b399e34e7f27c03cd55dce1a43496c /src | |
parent | 815ded19f106990a37bbacec83546b1b897491f6 (diff) | |
parent | 40c7f4763b97bbef4bd67584068d388395ff885b (diff) | |
download | gnunet-34b1431c1a10a47fa8304ef1f3b3d83f79dd098c.tar.gz gnunet-34b1431c1a10a47fa8304ef1f3b3d83f79dd098c.zip |
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'src')
-rw-r--r-- | src/transport/transport-testing2.c | 11 |
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) | |||
897 | GNUNET_OS_process_destroy (proc); | 897 | GNUNET_OS_process_destroy (proc); |
898 | } | 898 | } |
899 | 899 | ||
900 | |||
900 | static void | 901 | static void |
901 | shutdown_peerstore (void *cls) | 902 | shutdown_peerstore (void *cls) |
902 | { | 903 | { |
@@ -904,6 +905,7 @@ shutdown_peerstore (void *cls) | |||
904 | shutdown_process (proc); | 905 | shutdown_process (proc); |
905 | } | 906 | } |
906 | 907 | ||
908 | |||
907 | static void | 909 | static void |
908 | shutdown_communicator (void *cls) | 910 | shutdown_communicator (void *cls) |
909 | { | 911 | { |
@@ -939,8 +941,8 @@ communicator_start ( | |||
939 | 941 | ||
940 | 942 | ||
941 | binary = GNUNET_OS_get_libexec_binary_path (binary_name); | 943 | binary = GNUNET_OS_get_libexec_binary_path (binary_name); |
942 | tc_h->c_proc = GNUNET_OS_start_process_s (GNUNET_YES, | 944 | tc_h->c_proc = GNUNET_OS_start_process_s (GNUNET_OS_USE_PIPE_CONTROL |
943 | GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | 945 | | GNUNET_OS_INHERIT_STD_OUT_AND_ERR, |
944 | NULL, | 946 | NULL, |
945 | loprefix, | 947 | loprefix, |
946 | binary, | 948 | binary, |
@@ -1026,8 +1028,8 @@ peerstore_start ( | |||
1026 | 1028 | ||
1027 | LOG (GNUNET_ERROR_TYPE_DEBUG, "peerstore_start\n"); | 1029 | LOG (GNUNET_ERROR_TYPE_DEBUG, "peerstore_start\n"); |
1028 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-peerstore"); | 1030 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-peerstore"); |
1029 | tc_h->ps_proc = GNUNET_OS_start_process (GNUNET_YES, | 1031 | tc_h->ps_proc = GNUNET_OS_start_process (GNUNET_OS_USE_PIPE_CONTROL |
1030 | GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | 1032 | | GNUNET_OS_INHERIT_STD_OUT_AND_ERR, |
1031 | NULL, | 1033 | NULL, |
1032 | NULL, | 1034 | NULL, |
1033 | NULL, | 1035 | NULL, |
@@ -1045,6 +1047,7 @@ peerstore_start ( | |||
1045 | GNUNET_free (binary); | 1047 | GNUNET_free (binary); |
1046 | } | 1048 | } |
1047 | 1049 | ||
1050 | |||
1048 | /** | 1051 | /** |
1049 | * @brief Start NAT | 1052 | * @brief Start NAT |
1050 | * | 1053 | * |