diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-06-30 19:21:05 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-06-30 19:21:05 +0000 |
commit | 17de5c9d798109f55059190c886609ba377e4eb6 (patch) | |
tree | 07f2b4241f433b18baf02d5bf189307ad2308166 /src/namestore/test_namestore_api_zone_iteration_specific_zone.c | |
parent | fd87b25438487e1215c68bdb9f1bcac2d7012bc2 (diff) | |
download | gnunet-17de5c9d798109f55059190c886609ba377e4eb6.tar.gz gnunet-17de5c9d798109f55059190c886609ba377e4eb6.zip |
-towards implementing improved namestore API
Diffstat (limited to 'src/namestore/test_namestore_api_zone_iteration_specific_zone.c')
-rw-r--r-- | src/namestore/test_namestore_api_zone_iteration_specific_zone.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c index 53457cdaa..86871120c 100644 --- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c +++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c | |||
@@ -182,7 +182,7 @@ zone_proc (void *cls, | |||
182 | const struct GNUNET_CRYPTO_EccSignature *signature) | 182 | const struct GNUNET_CRYPTO_EccSignature *signature) |
183 | { | 183 | { |
184 | int failed = GNUNET_NO; | 184 | int failed = GNUNET_NO; |
185 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for zone `%s'\n", GNUNET_short_h2s (&zone)); | 185 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for zone `%s'\n", GNUNET_NAMESTORE_short_h2s (&zone)); |
186 | if ((zone_key == NULL) && (name == NULL)) | 186 | if ((zone_key == NULL) && (name == NULL)) |
187 | { | 187 | { |
188 | GNUNET_break (2 == returned_records); | 188 | GNUNET_break (2 == returned_records); |
@@ -285,7 +285,7 @@ put_cont (void *cls, int32_t success, const char *emsg) | |||
285 | res = 1; | 285 | res = 1; |
286 | returned_records = 0; | 286 | returned_records = 0; |
287 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All records created, starting iteration over zone `%s'\n", | 287 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All records created, starting iteration over zone `%s'\n", |
288 | GNUNET_short_h2s(&zone)); | 288 | GNUNET_NAMESTORE_short_h2s(&zone)); |
289 | zi = GNUNET_NAMESTORE_zone_iteration_start(nsh, | 289 | zi = GNUNET_NAMESTORE_zone_iteration_start(nsh, |
290 | &zone, | 290 | &zone, |
291 | GNUNET_NAMESTORE_RF_NONE, | 291 | GNUNET_NAMESTORE_RF_NONE, |
@@ -356,14 +356,18 @@ run (void *cls, | |||
356 | s_rd_1 = create_record(1); | 356 | s_rd_1 = create_record(1); |
357 | et.abs_value = s_rd_1[0].expiration_time; | 357 | et.abs_value = s_rd_1[0].expiration_time; |
358 | sig_1 = GNUNET_NAMESTORE_create_signature(privkey, et, s_name_1, s_rd_1, 1); | 358 | sig_1 = GNUNET_NAMESTORE_create_signature(privkey, et, s_name_1, s_rd_1, 1); |
359 | GNUNET_NAMESTORE_record_create(nsh, privkey, s_name_1, s_rd_1, &put_cont, NULL); | 359 | GNUNET_NAMESTORE_record_put_by_authority (nsh, privkey, s_name_1, |
360 | 1, s_rd_1, | ||
361 | &put_cont, NULL); | ||
360 | 362 | ||
361 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 2 \n"); | 363 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 2 \n"); |
362 | GNUNET_asprintf(&s_name_2, "dummy2"); | 364 | GNUNET_asprintf(&s_name_2, "dummy2"); |
363 | s_rd_2 = create_record(1); | 365 | s_rd_2 = create_record(1); |
364 | et.abs_value = s_rd_2[0].expiration_time; | 366 | et.abs_value = s_rd_2[0].expiration_time; |
365 | sig_2 = GNUNET_NAMESTORE_create_signature(privkey, et, s_name_2, s_rd_2, 1); | 367 | sig_2 = GNUNET_NAMESTORE_create_signature(privkey, et, s_name_2, s_rd_2, 1); |
366 | GNUNET_NAMESTORE_record_create(nsh, privkey, s_name_2, s_rd_2, &put_cont, NULL); | 368 | GNUNET_NAMESTORE_record_put_by_authority (nsh, privkey, s_name_2, |
369 | 1, s_rd_2, | ||
370 | &put_cont, NULL); | ||
367 | 371 | ||
368 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 3\n"); | 372 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 3\n"); |
369 | /* name in different zone */ | 373 | /* name in different zone */ |
@@ -371,7 +375,8 @@ run (void *cls, | |||
371 | s_rd_3 = create_record(1); | 375 | s_rd_3 = create_record(1); |
372 | et.abs_value = s_rd_3[0].expiration_time; | 376 | et.abs_value = s_rd_3[0].expiration_time; |
373 | sig_3 = GNUNET_NAMESTORE_create_signature(privkey, et, s_name_3, s_rd_3, 1); | 377 | sig_3 = GNUNET_NAMESTORE_create_signature(privkey, et, s_name_3, s_rd_3, 1); |
374 | GNUNET_NAMESTORE_record_put (nsh, &pubkey2, s_name_3, GNUNET_TIME_UNIT_FOREVER_ABS, 1, s_rd_3, sig_3, &put_cont, NULL); | 378 | GNUNET_NAMESTORE_record_put (nsh, &pubkey2, s_name_3, |
379 | GNUNET_TIME_UNIT_FOREVER_ABS, 1, s_rd_3, sig_3, &put_cont, NULL); | ||
375 | } | 380 | } |
376 | 381 | ||
377 | 382 | ||