aboutsummaryrefslogtreecommitdiff
path: root/src/hostlist
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2014-02-20 10:35:33 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2014-02-20 10:35:33 +0000
commit2a35e345a204cb357361406f28e07bf9076cb092 (patch)
tree8c51b5dae07a1f3a3a6a13ac6c623e0b0df2a070 /src/hostlist
parenta06237deeec4aed38b09f633d7ebbeabb7da4c03 (diff)
downloadgnunet-2a35e345a204cb357361406f28e07bf9076cb092.tar.gz
gnunet-2a35e345a204cb357361406f28e07bf9076cb092.zip
Allow redirection of STDERR when starting processes.
Diffstat (limited to 'src/hostlist')
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist.c8
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist_learning.c12
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist_reconnect.c8
3 files changed, 18 insertions, 10 deletions
diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/hostlist/test_gnunet_daemon_hostlist.c
index 2e1e5acb5..951d1cd8b 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist.c
@@ -135,9 +135,11 @@ setup_peer (struct PeerContext *p, const char *cfgname)
135 binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); 135 binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
136 p->cfg = GNUNET_CONFIGURATION_create (); 136 p->cfg = GNUNET_CONFIGURATION_create ();
137 p->arm_proc = 137 p->arm_proc =
138 GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, binary, 138 GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
139 "gnunet-service-arm", 139 NULL, NULL, NULL,
140 "-c", cfgname, NULL); 140 binary,
141 "gnunet-service-arm",
142 "-c", cfgname, NULL);
141 GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); 143 GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
142 p->th = 144 p->th =
143 GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, &notify_connect, NULL); 145 GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, &notify_connect, NULL);
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
index f581b532a..8a5cdac7a 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -385,9 +385,11 @@ setup_learn_peer (struct PeerContext *p, const char *cfgname)
385 binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); 385 binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
386 p->cfg = GNUNET_CONFIGURATION_create (); 386 p->cfg = GNUNET_CONFIGURATION_create ();
387 p->arm_proc = 387 p->arm_proc =
388 GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, binary, 388 GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
389 "gnunet-service-arm", 389 NULL, NULL, NULL,
390 "-c", cfgname, NULL); 390 binary,
391 "gnunet-service-arm",
392 "-c", cfgname, NULL);
391 GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); 393 GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
392 if (GNUNET_OK == 394 if (GNUNET_OK ==
393 GNUNET_CONFIGURATION_get_value_string (p->cfg, "HOSTLIST", "HOSTLISTFILE", 395 GNUNET_CONFIGURATION_get_value_string (p->cfg, "HOSTLIST", "HOSTLISTFILE",
@@ -420,7 +422,9 @@ setup_adv_peer (struct PeerContext *p, const char *cfgname)
420 binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); 422 binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
421 p->cfg = GNUNET_CONFIGURATION_create (); 423 p->cfg = GNUNET_CONFIGURATION_create ();
422 p->arm_proc = 424 p->arm_proc =
423 GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, binary, 425 GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
426 NULL, NULL, NULL,
427 binary,
424 "gnunet-service-arm", 428 "gnunet-service-arm",
425 "-c", cfgname, NULL); 429 "-c", cfgname, NULL);
426 GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); 430 GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
index 6b38ffe19..1962bcd45 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
@@ -135,9 +135,11 @@ setup_peer (struct PeerContext *p, const char *cfgname)
135 binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); 135 binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
136 p->cfg = GNUNET_CONFIGURATION_create (); 136 p->cfg = GNUNET_CONFIGURATION_create ();
137 p->arm_proc = 137 p->arm_proc =
138 GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, binary, 138 GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
139 "gnunet-service-arm", 139 NULL, NULL, NULL,
140 "-c", cfgname, NULL); 140 binary,
141 "gnunet-service-arm",
142 "-c", cfgname, NULL);
141 GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); 143 GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
142 p->th = 144 p->th =
143 GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, &notify_connect, NULL); 145 GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, &notify_connect, NULL);
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 07:49:23 +0000