aboutsummaryrefslogtreecommitdiff
path: root/src/arm/test_arm_api.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-07-09 19:04:19 +0000
committerChristian Grothoff <christian@grothoff.org>2012-07-09 19:04:19 +0000
commit8f9464256fc06a884bf589b4004262a0549d11b3 (patch)
treea088b8acbebdefe2acf0b41cfed4418830275b78 /src/arm/test_arm_api.c
parent817ee37a75fb8eb5887023d1a5152cb528ee2d5a (diff)
downloadgnunet-8f9464256fc06a884bf589b4004262a0549d11b3.tar.gz
gnunet-8f9464256fc06a884bf589b4004262a0549d11b3.zip
-LRN: Another take on std descriptor inheritance
Now descriptors are not inherited by default, you have to pass a set of flags to make it so. When pipes are given, flags have no effect. gnunet-arm now has two options to block stdout and stderr from being passed to gnunet-service-arm
Diffstat (limited to 'src/arm/test_arm_api.c')
-rw-r--r--src/arm/test_arm_api.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/arm/test_arm_api.c b/src/arm/test_arm_api.c
index e4e4510ad..e9bda410b 100644
--- a/src/arm/test_arm_api.c
+++ b/src/arm/test_arm_api.c
@@ -109,7 +109,7 @@ arm_notify (void *cls, enum GNUNET_ARM_ProcessStatus success)
109 GNUNET_ARM_stop_service (arm, "arm", TIMEOUT, &arm_stopped, NULL); 109 GNUNET_ARM_stop_service (arm, "arm", TIMEOUT, &arm_stopped, NULL);
110#endif 110#endif
111 } 111 }
112 GNUNET_ARM_start_service (arm, "resolver", START_TIMEOUT, &resolver_notify, 112 GNUNET_ARM_start_service (arm, "resolver", GNUNET_OS_INHERIT_STD_OUT_AND_ERR, START_TIMEOUT, &resolver_notify,
113 NULL); 113 NULL);
114} 114}
115 115
@@ -121,7 +121,7 @@ task (void *cls, char *const *args, const char *cfgfile,
121 cfg = c; 121 cfg = c;
122 arm = GNUNET_ARM_connect (cfg, NULL); 122 arm = GNUNET_ARM_connect (cfg, NULL);
123#if START_ARM 123#if START_ARM
124 GNUNET_ARM_start_service (arm, "arm", START_TIMEOUT, &arm_notify, NULL); 124 GNUNET_ARM_start_service (arm, "arm", GNUNET_OS_INHERIT_STD_OUT_AND_ERR, START_TIMEOUT, &arm_notify, NULL);
125#else 125#else
126 arm_notify (NULL, GNUNET_YES); 126 arm_notify (NULL, GNUNET_YES);
127#endif 127#endif