diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-10-29 16:14:03 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-10-29 16:14:03 +0000 |
commit | bcbcf005b4864ac5557c31da10521126d8880849 (patch) | |
tree | 444cafefb16e1c5a4ba13ce2db07d6ec1f37675e /src/hostlist/test_gnunet_daemon_hostlist_reconnect.c | |
parent | 119193d6350bbbd8c6ecbd60ccc8301223d6f6d6 (diff) | |
download | gnunet-bcbcf005b4864ac5557c31da10521126d8880849.tar.gz gnunet-bcbcf005b4864ac5557c31da10521126d8880849.zip |
installing all service, daemon and helper binaries to lib/gnunet/libexec/; updating code to run binaries from new location, which is no longer in PATH
Diffstat (limited to 'src/hostlist/test_gnunet_daemon_hostlist_reconnect.c')
-rw-r--r-- | src/hostlist/test_gnunet_daemon_hostlist_reconnect.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c index 1b1df9a3a..63baced46 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c | |||
@@ -141,14 +141,14 @@ process_hello (void *cls, const struct GNUNET_MessageHeader *message) | |||
141 | static void | 141 | static void |
142 | setup_peer (struct PeerContext *p, const char *cfgname) | 142 | setup_peer (struct PeerContext *p, const char *cfgname) |
143 | { | 143 | { |
144 | char *binary; | ||
145 | |||
146 | binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm"); | ||
144 | p->cfg = GNUNET_CONFIGURATION_create (); | 147 | p->cfg = GNUNET_CONFIGURATION_create (); |
145 | #if START_ARM | 148 | #if START_ARM |
146 | p->arm_proc = | 149 | p->arm_proc = |
147 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "gnunet-service-arm", | 150 | GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, binary, |
148 | "gnunet-service-arm", | 151 | "gnunet-service-arm", |
149 | #if VERBOSE | ||
150 | "-L", "DEBUG", | ||
151 | #endif | ||
152 | "-c", cfgname, NULL); | 152 | "-c", cfgname, NULL); |
153 | #endif | 153 | #endif |
154 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); | 154 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); |
@@ -156,6 +156,7 @@ setup_peer (struct PeerContext *p, const char *cfgname) | |||
156 | GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, ¬ify_connect, NULL); | 156 | GNUNET_TRANSPORT_connect (p->cfg, NULL, p, NULL, ¬ify_connect, NULL); |
157 | GNUNET_assert (p->th != NULL); | 157 | GNUNET_assert (p->th != NULL); |
158 | p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p); | 158 | p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p); |
159 | GNUNET_free (binary); | ||
159 | } | 160 | } |
160 | 161 | ||
161 | 162 | ||