diff options
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 cbe1159f3..10b064241 100644 --- a/src/transport/transport-testing2.c +++ b/src/transport/transport-testing2.c | |||
@@ -970,6 +970,7 @@ shutdown_nat (void *cls) | |||
970 | shutdown_process (proc); | 970 | shutdown_process (proc); |
971 | } | 971 | } |
972 | 972 | ||
973 | |||
973 | /** | 974 | /** |
974 | * @brief Task run at shutdown to kill the resolver process | 975 | * @brief Task run at shutdown to kill the resolver process |
975 | * | 976 | * |
@@ -982,6 +983,7 @@ shutdown_resolver (void *cls) | |||
982 | shutdown_process (proc); | 983 | shutdown_process (proc); |
983 | } | 984 | } |
984 | 985 | ||
986 | |||
985 | static void | 987 | static void |
986 | resolver_start (struct | 988 | resolver_start (struct |
987 | GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h) | 989 | GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h) |
@@ -990,16 +992,17 @@ resolver_start (struct | |||
990 | 992 | ||
991 | LOG (GNUNET_ERROR_TYPE_DEBUG, "resolver_start\n"); | 993 | LOG (GNUNET_ERROR_TYPE_DEBUG, "resolver_start\n"); |
992 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver"); | 994 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver"); |
993 | tc_h->resolver_proc = GNUNET_OS_start_process (GNUNET_YES, | 995 | tc_h->resolver_proc = GNUNET_OS_start_process ( |
994 | GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | 996 | GNUNET_OS_INHERIT_STD_OUT_AND_ERR |
995 | NULL, | 997 | | GNUNET_OS_USE_PIPE_CONTROL, |
996 | NULL, | 998 | NULL, |
997 | NULL, | 999 | NULL, |
998 | binary, | 1000 | NULL, |
999 | "gnunet-service-resolver", | 1001 | binary, |
1000 | "-c", | 1002 | "gnunet-service-resolver", |
1001 | tc_h->cfg_filename, | 1003 | "-c", |
1002 | NULL); | 1004 | tc_h->cfg_filename, |
1005 | NULL); | ||
1003 | if (NULL == tc_h->resolver_proc) | 1006 | if (NULL == tc_h->resolver_proc) |
1004 | { | 1007 | { |
1005 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to start resolver service!"); | 1008 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to start resolver service!"); |
@@ -1054,8 +1057,8 @@ nat_start ( | |||
1054 | 1057 | ||
1055 | LOG (GNUNET_ERROR_TYPE_DEBUG, "nat_start\n"); | 1058 | LOG (GNUNET_ERROR_TYPE_DEBUG, "nat_start\n"); |
1056 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-nat"); | 1059 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-nat"); |
1057 | tc_h->nat_proc = GNUNET_OS_start_process (GNUNET_YES, | 1060 | tc_h->nat_proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR |
1058 | GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | 1061 | | GNUNET_OS_USE_PIPE_CONTROL, |
1059 | NULL, | 1062 | NULL, |
1060 | NULL, | 1063 | NULL, |
1061 | NULL, | 1064 | NULL, |
@@ -1073,6 +1076,7 @@ nat_start ( | |||
1073 | GNUNET_free (binary); | 1076 | GNUNET_free (binary); |
1074 | } | 1077 | } |
1075 | 1078 | ||
1079 | |||
1076 | /** | 1080 | /** |
1077 | * @brief Start communicator part of transport service and communicator | 1081 | * @brief Start communicator part of transport service and communicator |
1078 | * | 1082 | * |