aboutsummaryrefslogtreecommitdiff
path: root/src/namestore/test_namestore_api_zone_iteration.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/namestore/test_namestore_api_zone_iteration.c')
-rw-r--r--src/namestore/test_namestore_api_zone_iteration.c584
1 files changed, 292 insertions, 292 deletions
diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c
index 94331f89e..62686403a 100644
--- a/src/namestore/test_namestore_api_zone_iteration.c
+++ b/src/namestore/test_namestore_api_zone_iteration.c
@@ -11,12 +11,12 @@
11 WITHOUT ANY WARRANTY; without even the implied warranty of 11 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Affero General Public License for more details. 13 Affero General Public License for more details.
14 14
15 You should have received a copy of the GNU Affero General Public License 15 You should have received a copy of the GNU Affero General Public License
16 along with this program. If not, see <http://www.gnu.org/licenses/>. 16 along with this program. If not, see <http://www.gnu.org/licenses/>.
17 17
18 SPDX-License-Identifier: AGPL3.0-or-later 18 SPDX-License-Identifier: AGPL3.0-or-later
19*/ 19 */
20/** 20/**
21 * @file namestore/test_namestore_api_zone_iteration.c 21 * @file namestore/test_namestore_api_zone_iteration.c
22 * @brief testcase for zone iteration functionality: iterate all zones 22 * @brief testcase for zone iteration functionality: iterate all zones
@@ -30,7 +30,7 @@
30#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT 30#define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
31 31
32 32
33#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100) 33#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 100)
34 34
35 35
36static struct GNUNET_NAMESTORE_Handle * nsh; 36static struct GNUNET_NAMESTORE_Handle * nsh;
@@ -67,268 +67,268 @@ static struct GNUNET_GNSRECORD_Data *s_rd_3;
67 * @param tc scheduler context 67 * @param tc scheduler context
68 */ 68 */
69static void 69static void
70endbadly (void *cls) 70endbadly(void *cls)
71{ 71{
72 endbadly_task = NULL; 72 endbadly_task = NULL;
73 GNUNET_SCHEDULER_shutdown (); 73 GNUNET_SCHEDULER_shutdown();
74 res = 1; 74 res = 1;
75} 75}
76 76
77 77
78static void 78static void
79end (void *cls) 79end(void *cls)
80{ 80{
81 if (NULL != zi) 81 if (NULL != zi)
82 { 82 {
83 GNUNET_NAMESTORE_zone_iteration_stop (zi); 83 GNUNET_NAMESTORE_zone_iteration_stop(zi);
84 zi = NULL; 84 zi = NULL;
85 } 85 }
86 if (NULL != endbadly_task) 86 if (NULL != endbadly_task)
87 { 87 {
88 GNUNET_SCHEDULER_cancel (endbadly_task); 88 GNUNET_SCHEDULER_cancel(endbadly_task);
89 endbadly_task = NULL; 89 endbadly_task = NULL;
90 } 90 }
91 if (NULL != privkey) 91 if (NULL != privkey)
92 { 92 {
93 GNUNET_free (privkey); 93 GNUNET_free(privkey);
94 privkey = NULL; 94 privkey = NULL;
95 } 95 }
96 if (NULL != privkey2) 96 if (NULL != privkey2)
97 { 97 {
98 GNUNET_free (privkey2); 98 GNUNET_free(privkey2);
99 privkey2 = NULL; 99 privkey2 = NULL;
100 } 100 }
101 GNUNET_free_non_null (s_name_1); 101 GNUNET_free_non_null(s_name_1);
102 GNUNET_free_non_null (s_name_2); 102 GNUNET_free_non_null(s_name_2);
103 GNUNET_free_non_null (s_name_3); 103 GNUNET_free_non_null(s_name_3);
104 if (NULL != s_rd_1) 104 if (NULL != s_rd_1)
105 { 105 {
106 GNUNET_free ((void *)s_rd_1->data); 106 GNUNET_free((void *)s_rd_1->data);
107 GNUNET_free (s_rd_1); 107 GNUNET_free(s_rd_1);
108 } 108 }
109 if (NULL != s_rd_2) 109 if (NULL != s_rd_2)
110 { 110 {
111 GNUNET_free ((void *)s_rd_2->data); 111 GNUNET_free((void *)s_rd_2->data);
112 GNUNET_free (s_rd_2); 112 GNUNET_free(s_rd_2);
113 } 113 }
114 if (NULL != s_rd_3) 114 if (NULL != s_rd_3)
115 { 115 {
116 GNUNET_free ((void *)s_rd_3->data); 116 GNUNET_free((void *)s_rd_3->data);
117 GNUNET_free (s_rd_3); 117 GNUNET_free(s_rd_3);
118 } 118 }
119 if (NULL != nsh) 119 if (NULL != nsh)
120 { 120 {
121 GNUNET_NAMESTORE_disconnect (nsh); 121 GNUNET_NAMESTORE_disconnect(nsh);
122 nsh = NULL; 122 nsh = NULL;
123 } 123 }
124} 124}
125 125
126 126
127static void 127static void
128zone_end (void *cls) 128zone_end(void *cls)
129{ 129{
130 GNUNET_break (3 == returned_records); 130 GNUNET_break(3 == returned_records);
131 if (3 == returned_records) 131 if (3 == returned_records)
132 { 132 {
133 res = 0; /* Last iteraterator callback, we are done */ 133 res = 0; /* Last iteraterator callback, we are done */
134 zi = NULL; 134 zi = NULL;
135 } 135 }
136 else 136 else
137 res = 1; 137 res = 1;
138 138
139 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 139 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
140 "Received last result, iteration done after receing %u results\n", 140 "Received last result, iteration done after receing %u results\n",
141 returned_records); 141 returned_records);
142 GNUNET_SCHEDULER_shutdown (); 142 GNUNET_SCHEDULER_shutdown();
143} 143}
144 144
145 145
146static void 146static void
147fail_cb (void *cls) 147fail_cb(void *cls)
148{ 148{
149 GNUNET_assert (0); 149 GNUNET_assert(0);
150} 150}
151 151
152 152
153static void 153static void
154zone_proc (void *cls, 154zone_proc(void *cls,
155 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, 155 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
156 const char *label, 156 const char *label,
157 unsigned int rd_count, 157 unsigned int rd_count,
158 const struct GNUNET_GNSRECORD_Data *rd) 158 const struct GNUNET_GNSRECORD_Data *rd)
159{ 159{
160 int failed = GNUNET_NO; 160 int failed = GNUNET_NO;
161 161
162 GNUNET_assert (NULL != zone); 162 GNUNET_assert(NULL != zone);
163 if (0 == GNUNET_memcmp (zone, 163 if (0 == GNUNET_memcmp(zone,
164 privkey)) 164 privkey))
165 {
166 if (0 == strcmp (label, s_name_1))
167 { 165 {
168 if (rd_count == 1) 166 if (0 == strcmp(label, s_name_1))
169 {
170 if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_1))
171 { 167 {
172 failed = GNUNET_YES; 168 if (rd_count == 1)
173 GNUNET_break (0); 169 {
170 if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_1))
171 {
172 failed = GNUNET_YES;
173 GNUNET_break(0);
174 }
175 }
176 else
177 {
178 failed = GNUNET_YES;
179 GNUNET_break(0);
180 }
181 }
182 else if (0 == strcmp(label, s_name_2))
183 {
184 if (rd_count == 1)
185 {
186 if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_2))
187 {
188 failed = GNUNET_YES;
189 GNUNET_break(0);
190 }
191 }
192 else
193 {
194 GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
195 "Received invalid record count\n");
196 failed = GNUNET_YES;
197 GNUNET_break(0);
198 }
174 } 199 }
175 }
176 else 200 else
177 {
178 failed = GNUNET_YES;
179 GNUNET_break (0);
180 }
181 }
182 else if (0 == strcmp (label, s_name_2))
183 {
184 if (rd_count == 1)
185 {
186 if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_2))
187 { 201 {
202 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
203 "Comparing result failed: got name `%s' for first zone\n",
204 label);
188 failed = GNUNET_YES; 205 failed = GNUNET_YES;
189 GNUNET_break (0); 206 GNUNET_break(0);
190 } 207 }
191 }
192 else
193 {
194 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
195 "Received invalid record count\n");
196 failed = GNUNET_YES;
197 GNUNET_break (0);
198 }
199 } 208 }
200 else 209 else if (0 == GNUNET_memcmp(zone,
210 privkey2))
201 { 211 {
202 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 212 if (0 == strcmp(label, s_name_3))
203 "Comparing result failed: got name `%s' for first zone\n",
204 label);
205 failed = GNUNET_YES;
206 GNUNET_break (0);
207 }
208 }
209 else if (0 == GNUNET_memcmp (zone,
210 privkey2))
211 {
212 if (0 == strcmp (label, s_name_3))
213 {
214 if (rd_count == 1)
215 {
216 if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_3))
217 { 213 {
218 failed = GNUNET_YES; 214 if (rd_count == 1)
219 GNUNET_break (0); 215 {
216 if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_3))
217 {
218 failed = GNUNET_YES;
219 GNUNET_break(0);
220 }
221 }
222 else
223 {
224 GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
225 "Received invalid record count\n");
226 failed = GNUNET_YES;
227 GNUNET_break(0);
228 }
220 } 229 }
221 }
222 else 230 else
223 { 231 {
224 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 232 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
225 "Received invalid record count\n"); 233 "Comparing result failed: got name `%s' for first zone\n",
226 failed = GNUNET_YES; 234 label);
227 GNUNET_break (0); 235 failed = GNUNET_YES;
228 } 236 GNUNET_break(0);
237 }
229 } 238 }
230 else 239 else
231 { 240 {
232 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 241 GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
233 "Comparing result failed: got name `%s' for first zone\n", 242 "Received invalid zone\n");
234 label);
235 failed = GNUNET_YES; 243 failed = GNUNET_YES;
236 GNUNET_break (0); 244 GNUNET_break(0);
237 } 245 }
238 }
239 else
240 {
241 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
242 "Received invalid zone\n");
243 failed = GNUNET_YES;
244 GNUNET_break (0);
245 }
246 246
247 if (failed == GNUNET_NO) 247 if (failed == GNUNET_NO)
248 { 248 {
249 returned_records ++; 249 returned_records++;
250 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 250 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
251 "Telling namestore to send the next result\n"); 251 "Telling namestore to send the next result\n");
252 GNUNET_NAMESTORE_zone_iterator_next (zi, 252 GNUNET_NAMESTORE_zone_iterator_next(zi,
253 1); 253 1);
254 } 254 }
255 else 255 else
256 { 256 {
257 GNUNET_break (0); 257 GNUNET_break(0);
258 GNUNET_SCHEDULER_shutdown (); 258 GNUNET_SCHEDULER_shutdown();
259 res = 1; 259 res = 1;
260 } 260 }
261} 261}
262 262
263 263
264static void 264static void
265put_cont (void *cls, 265put_cont(void *cls,
266 int32_t success, 266 int32_t success,
267 const char *emsg) 267 const char *emsg)
268{ 268{
269 static int c = 0; 269 static int c = 0;
270 270
271 if (success == GNUNET_OK) 271 if (success == GNUNET_OK)
272 { 272 {
273 c++; 273 c++;
274 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 274 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
275 "Created record %u \n", 275 "Created record %u \n",
276 c); 276 c);
277 } 277 }
278 else 278 else
279 { 279 {
280 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 280 GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
281 "Failed to created records: `%s'\n", 281 "Failed to created records: `%s'\n",
282 emsg); 282 emsg);
283 GNUNET_break (0); 283 GNUNET_break(0);
284 GNUNET_SCHEDULER_shutdown (); 284 GNUNET_SCHEDULER_shutdown();
285 res = 1; 285 res = 1;
286 return; 286 return;
287 } 287 }
288 288
289 if (c == 3) 289 if (c == 3)
290 {
291 res = 1;
292 returned_records = 0;
293 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
294 "All records created, starting iteration over all zones \n");
295 zi = GNUNET_NAMESTORE_zone_iteration_start (nsh,
296 NULL,
297 &fail_cb,
298 NULL,
299 &zone_proc,
300 NULL,
301 &zone_end,
302 NULL);
303 if (zi == NULL)
304 { 290 {
305 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
306 "Failed to create zone iterator\n");
307 GNUNET_break (0);
308 GNUNET_SCHEDULER_shutdown ();
309 res = 1; 291 res = 1;
310 return; 292 returned_records = 0;
293 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
294 "All records created, starting iteration over all zones \n");
295 zi = GNUNET_NAMESTORE_zone_iteration_start(nsh,
296 NULL,
297 &fail_cb,
298 NULL,
299 &zone_proc,
300 NULL,
301 &zone_end,
302 NULL);
303 if (zi == NULL)
304 {
305 GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
306 "Failed to create zone iterator\n");
307 GNUNET_break(0);
308 GNUNET_SCHEDULER_shutdown();
309 res = 1;
310 return;
311 }
311 } 312 }
312 }
313} 313}
314 314
315 315
316static struct GNUNET_GNSRECORD_Data * 316static struct GNUNET_GNSRECORD_Data *
317create_record (unsigned int count) 317create_record(unsigned int count)
318{ 318{
319 struct GNUNET_GNSRECORD_Data * rd; 319 struct GNUNET_GNSRECORD_Data * rd;
320 320
321 rd = GNUNET_new_array (count, 321 rd = GNUNET_new_array(count,
322 struct GNUNET_GNSRECORD_Data); 322 struct GNUNET_GNSRECORD_Data);
323 for (unsigned int c = 0; c < count; c++) 323 for (unsigned int c = 0; c < count; c++)
324 { 324 {
325 rd[c].expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS).abs_value_us; 325 rd[c].expiration_time = GNUNET_TIME_relative_to_absolute(GNUNET_TIME_UNIT_HOURS).abs_value_us;
326 rd[c].record_type = TEST_RECORD_TYPE; 326 rd[c].record_type = TEST_RECORD_TYPE;
327 rd[c].data_size = 50; 327 rd[c].data_size = 50;
328 rd[c].data = GNUNET_malloc(50); 328 rd[c].data = GNUNET_malloc(50);
329 rd[c].flags = 0; 329 rd[c].flags = 0;
330 memset ((char *) rd[c].data, 'a', 50); 330 memset((char *)rd[c].data, 'a', 50);
331 } 331 }
332 return rd; 332 return rd;
333} 333}
334 334
@@ -339,128 +339,128 @@ create_record (unsigned int count)
339 * start the actual tests by filling the zone. 339 * start the actual tests by filling the zone.
340 */ 340 */
341static void 341static void
342empty_zone_proc (void *cls, 342empty_zone_proc(void *cls,
343 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, 343 const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
344 const char *label, 344 const char *label,
345 unsigned int rd_count, 345 unsigned int rd_count,
346 const struct GNUNET_GNSRECORD_Data *rd) 346 const struct GNUNET_GNSRECORD_Data *rd)
347{ 347{
348 GNUNET_assert (nsh == cls); 348 GNUNET_assert(nsh == cls);
349 if (NULL != zone) 349 if (NULL != zone)
350 { 350 {
351 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 351 GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
352 _("Expected empty zone but received zone private key\n")); 352 _("Expected empty zone but received zone private key\n"));
353 GNUNET_break (0); 353 GNUNET_break(0);
354 GNUNET_SCHEDULER_shutdown (); 354 GNUNET_SCHEDULER_shutdown();
355 res = 1; 355 res = 1;
356 return; 356 return;
357 } 357 }
358 if ((NULL != label) || (NULL != rd) || (0 != rd_count)) 358 if ((NULL != label) || (NULL != rd) || (0 != rd_count))
359 { 359 {
360 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 360 GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
361 _("Expected no zone content but received data\n")); 361 _("Expected no zone content but received data\n"));
362 GNUNET_break (0); 362 GNUNET_break(0);
363 GNUNET_SCHEDULER_shutdown (); 363 GNUNET_SCHEDULER_shutdown();
364 res = 1; 364 res = 1;
365 return; 365 return;
366 } 366 }
367 GNUNET_assert (0); 367 GNUNET_assert(0);
368} 368}
369 369
370 370
371static void 371static void
372empty_zone_end (void *cls) 372empty_zone_end(void *cls)
373{ 373{
374 char *hostkey_file; 374 char *hostkey_file;
375 375
376 zi = NULL; 376 zi = NULL;
377 GNUNET_asprintf (&hostkey_file, 377 GNUNET_asprintf(&hostkey_file,
378 "zonefiles%s%s", 378 "zonefiles%s%s",
379 DIR_SEPARATOR_STR, 379 DIR_SEPARATOR_STR,
380 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); 380 "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
381 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 381 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
382 "Using zonekey file `%s' \n", 382 "Using zonekey file `%s' \n",
383 hostkey_file); 383 hostkey_file);
384 privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file); 384 privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
385 GNUNET_free (hostkey_file); 385 GNUNET_free(hostkey_file);
386 GNUNET_assert (privkey != NULL); 386 GNUNET_assert(privkey != NULL);
387 387
388 GNUNET_asprintf (&hostkey_file, 388 GNUNET_asprintf(&hostkey_file,
389 "zonefiles%s%s", 389 "zonefiles%s%s",
390 DIR_SEPARATOR_STR, 390 DIR_SEPARATOR_STR,
391 "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"); 391 "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey");
392 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 392 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
393 "Using zonekey file `%s' \n", 393 "Using zonekey file `%s' \n",
394 hostkey_file); 394 hostkey_file);
395 privkey2 = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file); 395 privkey2 = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file);
396 GNUNET_free (hostkey_file); 396 GNUNET_free(hostkey_file);
397 GNUNET_assert (privkey2 != NULL); 397 GNUNET_assert(privkey2 != NULL);
398 398
399 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 1\n"); 399 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Created record 1\n");
400 400
401 GNUNET_asprintf(&s_name_1, "dummy1"); 401 GNUNET_asprintf(&s_name_1, "dummy1");
402 s_rd_1 = create_record(1); 402 s_rd_1 = create_record(1);
403 GNUNET_NAMESTORE_records_store (nsh, 403 GNUNET_NAMESTORE_records_store(nsh,
404 privkey, 404 privkey,
405 s_name_1, 405 s_name_1,
406 1, s_rd_1, 406 1, s_rd_1,
407 &put_cont, 407 &put_cont,
408 NULL); 408 NULL);
409 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 409 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
410 "Created record 2 \n"); 410 "Created record 2 \n");
411 GNUNET_asprintf(&s_name_2, "dummy2"); 411 GNUNET_asprintf(&s_name_2, "dummy2");
412 s_rd_2 = create_record(1); 412 s_rd_2 = create_record(1);
413 GNUNET_NAMESTORE_records_store (nsh, 413 GNUNET_NAMESTORE_records_store(nsh,
414 privkey, 414 privkey,
415 s_name_2, 415 s_name_2,
416 1, s_rd_2, 416 1, s_rd_2,
417 &put_cont, 417 &put_cont,
418 NULL); 418 NULL);
419 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 419 GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
420 "Created record 3\n"); 420 "Created record 3\n");
421 /* name in different zone */ 421 /* name in different zone */
422 GNUNET_asprintf(&s_name_3, "dummy3"); 422 GNUNET_asprintf(&s_name_3, "dummy3");
423 s_rd_3 = create_record(1); 423 s_rd_3 = create_record(1);
424 GNUNET_NAMESTORE_records_store (nsh, 424 GNUNET_NAMESTORE_records_store(nsh,
425 privkey2, 425 privkey2,
426 s_name_3, 426 s_name_3,
427 1, 427 1,
428 s_rd_3, 428 s_rd_3,
429 &put_cont, 429 &put_cont,
430 NULL); 430 NULL);
431} 431}
432 432
433 433
434static void 434static void
435run (void *cls, 435run(void *cls,
436 const struct GNUNET_CONFIGURATION_Handle *cfg, 436 const struct GNUNET_CONFIGURATION_Handle *cfg,
437 struct GNUNET_TESTING_Peer *peer) 437 struct GNUNET_TESTING_Peer *peer)
438{ 438{
439 endbadly_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, 439 endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,
440 &endbadly, 440 &endbadly,
441 NULL); 441 NULL);
442 GNUNET_SCHEDULER_add_shutdown (&end, 442 GNUNET_SCHEDULER_add_shutdown(&end,
443 NULL); 443 NULL);
444 444
445 nsh = GNUNET_NAMESTORE_connect (cfg); 445 nsh = GNUNET_NAMESTORE_connect(cfg);
446 GNUNET_break (NULL != nsh); 446 GNUNET_break(NULL != nsh);
447 /* first, iterate over empty namestore */ 447 /* first, iterate over empty namestore */
448 zi = GNUNET_NAMESTORE_zone_iteration_start (nsh, 448 zi = GNUNET_NAMESTORE_zone_iteration_start(nsh,
449 NULL, 449 NULL,
450 &fail_cb, 450 &fail_cb,
451 NULL, 451 NULL,
452 &empty_zone_proc, 452 &empty_zone_proc,
453 nsh, 453 nsh,
454 &empty_zone_end, 454 &empty_zone_end,
455 NULL); 455 NULL);
456 if (NULL == zi) 456 if (NULL == zi)
457 { 457 {
458 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 458 GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
459 "Failed to create zone iterator\n"); 459 "Failed to create zone iterator\n");
460 GNUNET_break (0); 460 GNUNET_break(0);
461 res = 1; 461 res = 1;
462 GNUNET_SCHEDULER_shutdown (); 462 GNUNET_SCHEDULER_shutdown();
463 } 463 }
464} 464}
465 465
466 466
@@ -468,24 +468,24 @@ run (void *cls,
468 468
469 469
470int 470int
471main (int argc, char *argv[]) 471main(int argc, char *argv[])
472{ 472{
473 const char *plugin_name; 473 const char *plugin_name;
474 char *cfg_name; 474 char *cfg_name;
475 475
476 SETUP_CFG (plugin_name, cfg_name); 476 SETUP_CFG(plugin_name, cfg_name);
477 res = 1; 477 res = 1;
478 if (0 != 478 if (0 !=
479 GNUNET_TESTING_peer_run ("test-namestore-api-zone-iteration", 479 GNUNET_TESTING_peer_run("test-namestore-api-zone-iteration",
480 cfg_name, 480 cfg_name,
481 &run, 481 &run,
482 NULL)) 482 NULL))
483 { 483 {
484 res = 1; 484 res = 1;
485 } 485 }
486 GNUNET_DISK_purge_cfg_dir (cfg_name, 486 GNUNET_DISK_purge_cfg_dir(cfg_name,
487 "GNUNET_TEST_HOME"); 487 "GNUNET_TEST_HOME");
488 GNUNET_free (cfg_name); 488 GNUNET_free(cfg_name);
489 return res; 489 return res;
490} 490}
491 491