diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-06-19 22:17:25 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-06-19 22:17:25 +0000 |
commit | 808ef8ab410b486c5cca7515389f608e965d53b1 (patch) | |
tree | 2a9476225227e3e550d95294db1c1b676bd23264 /src/namestore/test_namestore_api_zone_iteration_specific_zone.c | |
parent | 50114769c42140782b3955e416d61837fe570d0b (diff) | |
download | gnunet-808ef8ab410b486c5cca7515389f608e965d53b1.tar.gz gnunet-808ef8ab410b486c5cca7515389f608e965d53b1.zip |
-fixing testcases with new expiration code
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 | 18 |
1 files changed, 11 insertions, 7 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 b76acb4dd..4a6bc571a 100644 --- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c +++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c | |||
@@ -304,15 +304,15 @@ put_cont (void *cls, int32_t success, const char *emsg) | |||
304 | 304 | ||
305 | 305 | ||
306 | static struct GNUNET_NAMESTORE_RecordData * | 306 | static struct GNUNET_NAMESTORE_RecordData * |
307 | create_record (int count) | 307 | create_record (unsigned int count) |
308 | { | 308 | { |
309 | int c; | 309 | unsigned int c; |
310 | struct GNUNET_NAMESTORE_RecordData * rd; | 310 | struct GNUNET_NAMESTORE_RecordData * rd; |
311 | rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData)); | ||
312 | 311 | ||
312 | rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData)); | ||
313 | for (c = 0; c < count; c++) | 313 | for (c = 0; c < count; c++) |
314 | { | 314 | { |
315 | rd[c].expiration = GNUNET_TIME_absolute_get(); | 315 | rd[c].expiration_time = GNUNET_TIME_absolute_get().abs_value; |
316 | rd[c].record_type = 1111; | 316 | rd[c].record_type = 1111; |
317 | rd[c].data_size = 50; | 317 | rd[c].data_size = 50; |
318 | rd[c].data = GNUNET_malloc(50); | 318 | rd[c].data = GNUNET_malloc(50); |
@@ -327,6 +327,7 @@ run (void *cls, | |||
327 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 327 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
328 | { | 328 | { |
329 | char *hostkey_file; | 329 | char *hostkey_file; |
330 | struct GNUNET_TIME_Absolute et; | ||
330 | 331 | ||
331 | endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,&endbadly, NULL); | 332 | endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,&endbadly, NULL); |
332 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, | 333 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, |
@@ -352,20 +353,23 @@ run (void *cls, | |||
352 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 1\n"); | 353 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 1\n"); |
353 | GNUNET_asprintf(&s_name_1, "dummy1"); | 354 | GNUNET_asprintf(&s_name_1, "dummy1"); |
354 | s_rd_1 = create_record(1); | 355 | s_rd_1 = create_record(1); |
355 | sig_1 = GNUNET_NAMESTORE_create_signature(privkey, s_rd_1[0].expiration ,s_name_1, s_rd_1, 1); | 356 | et.abs_value = s_rd_1[0].expiration_time; |
357 | sig_1 = GNUNET_NAMESTORE_create_signature(privkey, et, s_name_1, s_rd_1, 1); | ||
356 | GNUNET_NAMESTORE_record_create(nsh, privkey, s_name_1, s_rd_1, &put_cont, NULL); | 358 | GNUNET_NAMESTORE_record_create(nsh, privkey, s_name_1, s_rd_1, &put_cont, NULL); |
357 | 359 | ||
358 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 2 \n"); | 360 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 2 \n"); |
359 | GNUNET_asprintf(&s_name_2, "dummy2"); | 361 | GNUNET_asprintf(&s_name_2, "dummy2"); |
360 | s_rd_2 = create_record(1); | 362 | s_rd_2 = create_record(1); |
361 | sig_2 = GNUNET_NAMESTORE_create_signature(privkey, s_rd_2[0].expiration, s_name_2, s_rd_2, 1); | 363 | et.abs_value = s_rd_2[0].expiration_time; |
364 | sig_2 = GNUNET_NAMESTORE_create_signature(privkey, et, s_name_2, s_rd_2, 1); | ||
362 | GNUNET_NAMESTORE_record_create(nsh, privkey, s_name_2, s_rd_2, &put_cont, NULL); | 365 | GNUNET_NAMESTORE_record_create(nsh, privkey, s_name_2, s_rd_2, &put_cont, NULL); |
363 | 366 | ||
364 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 3\n"); | 367 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record 3\n"); |
365 | /* name in different zone */ | 368 | /* name in different zone */ |
366 | GNUNET_asprintf(&s_name_3, "dummy3"); | 369 | GNUNET_asprintf(&s_name_3, "dummy3"); |
367 | s_rd_3 = create_record(1); | 370 | s_rd_3 = create_record(1); |
368 | sig_3 = GNUNET_NAMESTORE_create_signature(privkey, s_rd_3[0].expiration, s_name_3, s_rd_3, 1); | 371 | et.abs_value = s_rd_3[0].expiration_time; |
372 | sig_3 = GNUNET_NAMESTORE_create_signature(privkey, et, s_name_3, s_rd_3, 1); | ||
369 | GNUNET_NAMESTORE_record_put (nsh, &pubkey2, s_name_3, GNUNET_TIME_UNIT_FOREVER_ABS, 1, s_rd_3, sig_3, &put_cont, NULL); | 373 | GNUNET_NAMESTORE_record_put (nsh, &pubkey2, s_name_3, GNUNET_TIME_UNIT_FOREVER_ABS, 1, s_rd_3, sig_3, &put_cont, NULL); |
370 | } | 374 | } |
371 | 375 | ||