diff options
author | t3sserakt <t3ss@posteo.de> | 2020-08-06 16:25:51 +0200 |
---|---|---|
committer | t3sserakt <t3ss@posteo.de> | 2020-08-06 16:25:51 +0200 |
commit | 38193fe48a572e475b4f84717ff5b3edbcaf2d2a (patch) | |
tree | d6deeb56d81f75ab411d88a03b865f7da7eaaed4 /src/transport | |
parent | 33954ae13d4d26cefa45ac86f5e2184b6abd724f (diff) | |
parent | 6ab14a20690a499ad32e3f2ad448d64d4e6b65fc (diff) | |
download | gnunet-38193fe48a572e475b4f84717ff5b3edbcaf2d2a.tar.gz gnunet-38193fe48a572e475b4f84717ff5b3edbcaf2d2a.zip |
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/transport-testing2.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/transport/transport-testing2.c b/src/transport/transport-testing2.c index 0c85660dd..e194b0159 100644 --- a/src/transport/transport-testing2.c +++ b/src/transport/transport-testing2.c | |||
@@ -1023,11 +1023,7 @@ peerstore_start ( | |||
1023 | { | 1023 | { |
1024 | char *binary; | 1024 | char *binary; |
1025 | 1025 | ||
1026 | LOG (GNUNET_ERROR_TYPE_DEBUG, "peerstore_start\n"); | ||
1027 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-peerstore"); | 1026 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-peerstore"); |
1028 | LOG (GNUNET_ERROR_TYPE_DEBUG, "peerstore_start binary %s\n", | ||
1029 | binary); | ||
1030 | LOG (GNUNET_ERROR_TYPE_DEBUG, "peerstore_start 2\n"); | ||
1031 | tc_h->ps_proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR, | 1027 | tc_h->ps_proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR, |
1032 | NULL, | 1028 | NULL, |
1033 | NULL, | 1029 | NULL, |
@@ -1037,7 +1033,6 @@ peerstore_start ( | |||
1037 | "-c", | 1033 | "-c", |
1038 | tc_h->cfg_filename, | 1034 | tc_h->cfg_filename, |
1039 | NULL); | 1035 | NULL); |
1040 | LOG (GNUNET_ERROR_TYPE_DEBUG, "peerstore_start 3\n"); | ||
1041 | if (NULL == tc_h->ps_proc) | 1036 | if (NULL == tc_h->ps_proc) |
1042 | { | 1037 | { |
1043 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to start Peerstore!"); | 1038 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to start Peerstore!"); |
@@ -1059,8 +1054,6 @@ nat_start ( | |||
1059 | 1054 | ||
1060 | LOG (GNUNET_ERROR_TYPE_DEBUG, "nat_start\n"); | 1055 | LOG (GNUNET_ERROR_TYPE_DEBUG, "nat_start\n"); |
1061 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-nat"); | 1056 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-nat"); |
1062 | LOG (GNUNET_ERROR_TYPE_DEBUG, "nat_start binary %s\n", | ||
1063 | binary); | ||
1064 | tc_h->nat_proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR | 1057 | tc_h->nat_proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR |
1065 | | GNUNET_OS_USE_PIPE_CONTROL, | 1058 | | GNUNET_OS_USE_PIPE_CONTROL, |
1066 | NULL, | 1059 | NULL, |
@@ -1158,8 +1151,6 @@ void | |||
1158 | GNUNET_TRANSPORT_TESTING_transport_communicator_service_stop ( | 1151 | GNUNET_TRANSPORT_TESTING_transport_communicator_service_stop ( |
1159 | struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h) | 1152 | struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h) |
1160 | { | 1153 | { |
1161 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1162 | "transport communicator service stop\n"); | ||
1163 | shutdown_communicator (tc_h->c_proc); | 1154 | shutdown_communicator (tc_h->c_proc); |
1164 | shutdown_service (tc_h->sh); | 1155 | shutdown_service (tc_h->sh); |
1165 | shutdown_nat (tc_h->nat_proc); | 1156 | shutdown_nat (tc_h->nat_proc); |