diff options
Diffstat (limited to 'src/fs/test_fs_namespace_list_updateable.c')
-rw-r--r-- | src/fs/test_fs_namespace_list_updateable.c | 45 |
1 files changed, 16 insertions, 29 deletions
diff --git a/src/fs/test_fs_namespace_list_updateable.c b/src/fs/test_fs_namespace_list_updateable.c index dc8673e21..1ad2fb5ac 100644 --- a/src/fs/test_fs_namespace_list_updateable.c +++ b/src/fs/test_fs_namespace_list_updateable.c | |||
@@ -70,12 +70,13 @@ setup_peer (struct PeerContext *p, const char *cfgname) | |||
70 | { | 70 | { |
71 | p->cfg = GNUNET_CONFIGURATION_create (); | 71 | p->cfg = GNUNET_CONFIGURATION_create (); |
72 | #if START_ARM | 72 | #if START_ARM |
73 | p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", | 73 | p->arm_proc = |
74 | "gnunet-service-arm", | 74 | GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", |
75 | "gnunet-service-arm", | ||
75 | #if VERBOSE | 76 | #if VERBOSE |
76 | "-L", "DEBUG", | 77 | "-L", "DEBUG", |
77 | #endif | 78 | #endif |
78 | "-c", cfgname, NULL); | 79 | "-c", cfgname, NULL); |
79 | #endif | 80 | #endif |
80 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); | 81 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); |
81 | } | 82 | } |
@@ -91,8 +92,7 @@ stop_arm (struct PeerContext *p) | |||
91 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 92 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
92 | if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK) | 93 | if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK) |
93 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 94 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
94 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 95 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
95 | "ARM process %u stopped\n", | ||
96 | GNUNET_OS_process_get_pid (p->arm_proc)); | 96 | GNUNET_OS_process_get_pid (p->arm_proc)); |
97 | GNUNET_OS_process_close (p->arm_proc); | 97 | GNUNET_OS_process_close (p->arm_proc); |
98 | p->arm_proc = NULL; | 98 | p->arm_proc = NULL; |
@@ -112,8 +112,7 @@ stop_arm (struct PeerContext *p) | |||
112 | 112 | ||
113 | 113 | ||
114 | static void | 114 | static void |
115 | check_next (void *cls, | 115 | check_next (void *cls, const char *last_id, |
116 | const char *last_id, | ||
117 | const struct GNUNET_FS_Uri *last_uri, | 116 | const struct GNUNET_FS_Uri *last_uri, |
118 | const struct GNUNET_CONTAINER_MetaData *last_meta, | 117 | const struct GNUNET_CONTAINER_MetaData *last_meta, |
119 | const char *next_id) | 118 | const char *next_id) |
@@ -125,8 +124,7 @@ check_next (void *cls, | |||
125 | 124 | ||
126 | 125 | ||
127 | static void | 126 | static void |
128 | check_this_next (void *cls, | 127 | check_this_next (void *cls, const char *last_id, |
129 | const char *last_id, | ||
130 | const struct GNUNET_FS_Uri *last_uri, | 128 | const struct GNUNET_FS_Uri *last_uri, |
131 | const struct GNUNET_CONTAINER_MetaData *last_meta, | 129 | const struct GNUNET_CONTAINER_MetaData *last_meta, |
132 | const char *next_id) | 130 | const char *next_id) |
@@ -150,8 +148,7 @@ sks_cont_next (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg) | |||
150 | 148 | ||
151 | 149 | ||
152 | static void | 150 | static void |
153 | check_this (void *cls, | 151 | check_this (void *cls, const char *last_id, |
154 | const char *last_id, | ||
155 | const struct GNUNET_FS_Uri *last_uri, | 152 | const struct GNUNET_FS_Uri *last_uri, |
156 | const struct GNUNET_CONTAINER_MetaData *last_meta, | 153 | const struct GNUNET_CONTAINER_MetaData *last_meta, |
157 | const char *next_id) | 154 | const char *next_id) |
@@ -169,13 +166,7 @@ sks_cont_this (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg) | |||
169 | GNUNET_assert (NULL == emsg); | 166 | GNUNET_assert (NULL == emsg); |
170 | err = 1; | 167 | err = 1; |
171 | GNUNET_FS_namespace_list_updateable (ns, NULL, &check_this, NULL); | 168 | GNUNET_FS_namespace_list_updateable (ns, NULL, &check_this, NULL); |
172 | GNUNET_FS_publish_sks (fs, | 169 | GNUNET_FS_publish_sks (fs, ns, "next", "future", meta, uri_next, &bo, |
173 | ns, | ||
174 | "next", | ||
175 | "future", | ||
176 | meta, | ||
177 | uri_next, | ||
178 | &bo, | ||
179 | GNUNET_FS_PUBLISH_OPTION_NONE, &sks_cont_next, NULL); | 170 | GNUNET_FS_PUBLISH_OPTION_NONE, &sks_cont_next, NULL); |
180 | 171 | ||
181 | } | 172 | } |
@@ -209,15 +200,12 @@ testNamespace () | |||
209 | 200 | ||
210 | 201 | ||
211 | static void | 202 | static void |
212 | run (void *cls, | 203 | run (void *cls, char *const *args, const char *cfgfile, |
213 | char *const *args, | 204 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
214 | const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) | ||
215 | { | 205 | { |
216 | setup_peer (&p1, "test_fs_namespace_data.conf"); | 206 | setup_peer (&p1, "test_fs_namespace_data.conf"); |
217 | fs = GNUNET_FS_start (cfg, | 207 | fs = GNUNET_FS_start (cfg, "test-fs-namespace", &progress_cb, NULL, |
218 | "test-fs-namespace", | 208 | GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END); |
219 | &progress_cb, | ||
220 | NULL, GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END); | ||
221 | testNamespace (); | 209 | testNamespace (); |
222 | } | 210 | } |
223 | 211 | ||
@@ -245,9 +233,8 @@ main (int argc, char *argv[]) | |||
245 | "WARNING", | 233 | "WARNING", |
246 | #endif | 234 | #endif |
247 | NULL); | 235 | NULL); |
248 | GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, | 236 | GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, argvx, |
249 | argvx, "test-fs-namespace", | 237 | "test-fs-namespace", "nohelp", options, &run, NULL); |
250 | "nohelp", options, &run, NULL); | ||
251 | stop_arm (&p1); | 238 | stop_arm (&p1); |
252 | GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-namespace/"); | 239 | GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-namespace/"); |
253 | return err; | 240 | return err; |