diff options
Diffstat (limited to 'src/service/reclaim/gnunet-service-reclaim_tickets.c')
-rw-r--r-- | src/service/reclaim/gnunet-service-reclaim_tickets.c | 77 |
1 files changed, 38 insertions, 39 deletions
diff --git a/src/service/reclaim/gnunet-service-reclaim_tickets.c b/src/service/reclaim/gnunet-service-reclaim_tickets.c index 689fbc429..acd2b6859 100644 --- a/src/service/reclaim/gnunet-service-reclaim_tickets.c +++ b/src/service/reclaim/gnunet-service-reclaim_tickets.c | |||
@@ -24,8 +24,6 @@ | |||
24 | * @brief reclaim tickets | 24 | * @brief reclaim tickets |
25 | * | 25 | * |
26 | */ | 26 | */ |
27 | #include "platform.h" | ||
28 | #include <inttypes.h> | ||
29 | #include "gnunet-service-reclaim_tickets.h" | 27 | #include "gnunet-service-reclaim_tickets.h" |
30 | 28 | ||
31 | 29 | ||
@@ -451,13 +449,13 @@ process_tickets (void *cls) | |||
451 | rd[i].data = &ae->new_id; | 449 | rd[i].data = &ae->new_id; |
452 | } | 450 | } |
453 | } | 451 | } |
454 | rvk->ns_qe = GNUNET_NAMESTORE_records_store (nsh, | 452 | rvk->ns_qe = GNUNET_NAMESTORE_record_set_store (nsh, |
455 | &rvk->identity, | 453 | &rvk->identity, |
456 | le->label, | 454 | le->label, |
457 | le->rd_count, | 455 | le->rd_count, |
458 | rd, | 456 | rd, |
459 | &ticket_processed, | 457 | &ticket_processed, |
460 | rvk); | 458 | rvk); |
461 | GNUNET_free (le->label); | 459 | GNUNET_free (le->label); |
462 | GNUNET_free (le->data); | 460 | GNUNET_free (le->data); |
463 | GNUNET_free (le); | 461 | GNUNET_free (le); |
@@ -645,13 +643,13 @@ move_attr_finished (void *cls, enum GNUNET_ErrorCode ec) | |||
645 | sizeof(rvk->move_attr->old_id)); | 643 | sizeof(rvk->move_attr->old_id)); |
646 | GNUNET_assert (NULL != label); | 644 | GNUNET_assert (NULL != label); |
647 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Removing attribute %s\n", label); | 645 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Removing attribute %s\n", label); |
648 | rvk->ns_qe = GNUNET_NAMESTORE_records_store (nsh, | 646 | rvk->ns_qe = GNUNET_NAMESTORE_record_set_store (nsh, |
649 | &rvk->identity, | 647 | &rvk->identity, |
650 | label, | 648 | label, |
651 | 0, | 649 | 0, |
652 | NULL, | 650 | NULL, |
653 | &del_attr_finished, | 651 | &del_attr_finished, |
654 | rvk); | 652 | rvk); |
655 | GNUNET_free (label); | 653 | GNUNET_free (label); |
656 | } | 654 | } |
657 | 655 | ||
@@ -744,17 +742,18 @@ rvk_move_attr_cb (void *cls, | |||
744 | new_label); | 742 | new_label); |
745 | GNUNET_free (credential); | 743 | GNUNET_free (credential); |
746 | } | 744 | } |
747 | else { | 745 | else |
746 | { | ||
748 | memcpy (&new_rd[i], &rd[i], sizeof (struct GNUNET_GNSRECORD_Data)); | 747 | memcpy (&new_rd[i], &rd[i], sizeof (struct GNUNET_GNSRECORD_Data)); |
749 | } | 748 | } |
750 | } | 749 | } |
751 | rvk->ns_qe = GNUNET_NAMESTORE_records_store (nsh, | 750 | rvk->ns_qe = GNUNET_NAMESTORE_record_set_store (nsh, |
752 | &rvk->identity, | 751 | &rvk->identity, |
753 | new_label, | 752 | new_label, |
754 | rd_count, | 753 | rd_count, |
755 | new_rd, | 754 | new_rd, |
756 | &move_attr_finished, | 755 | &move_attr_finished, |
757 | rvk); | 756 | rvk); |
758 | GNUNET_free (new_label); | 757 | GNUNET_free (new_label); |
759 | GNUNET_free (attr_data); | 758 | GNUNET_free (attr_data); |
760 | } | 759 | } |
@@ -870,13 +869,13 @@ revoke_attrs_cb (void *cls, | |||
870 | } | 869 | } |
871 | 870 | ||
872 | /** Remove attribute references **/ | 871 | /** Remove attribute references **/ |
873 | rvk->ns_qe = GNUNET_NAMESTORE_records_store (nsh, | 872 | rvk->ns_qe = GNUNET_NAMESTORE_record_set_store (nsh, |
874 | &rvk->identity, | 873 | &rvk->identity, |
875 | label, | 874 | label, |
876 | 0, | 875 | 0, |
877 | NULL, | 876 | NULL, |
878 | &remove_ticket_cont, | 877 | &remove_ticket_cont, |
879 | rvk); | 878 | rvk); |
880 | } | 879 | } |
881 | 880 | ||
882 | 881 | ||
@@ -1399,19 +1398,19 @@ issue_ticket (struct TicketIssueHandle *ih) | |||
1399 | sizeof(ih->ticket.rnd)); | 1398 | sizeof(ih->ticket.rnd)); |
1400 | struct GNUNET_CRYPTO_PublicKey pub; | 1399 | struct GNUNET_CRYPTO_PublicKey pub; |
1401 | GNUNET_CRYPTO_key_get_public (&ih->identity, | 1400 | GNUNET_CRYPTO_key_get_public (&ih->identity, |
1402 | &pub); | 1401 | &pub); |
1403 | char *str = GNUNET_CRYPTO_public_key_to_string (&pub); | 1402 | char *str = GNUNET_CRYPTO_public_key_to_string (&pub); |
1404 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1403 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1405 | "Storing AuthZ information under %s in %s\n", label, str); | 1404 | "Storing AuthZ information under %s in %s\n", label, str); |
1406 | GNUNET_free (str); | 1405 | GNUNET_free (str); |
1407 | // Publish record | 1406 | // Publish record |
1408 | ih->ns_qe = GNUNET_NAMESTORE_records_store (nsh, | 1407 | ih->ns_qe = GNUNET_NAMESTORE_record_set_store (nsh, |
1409 | &ih->identity, | 1408 | &ih->identity, |
1410 | label, | 1409 | label, |
1411 | i, | 1410 | i, |
1412 | attrs_record, | 1411 | attrs_record, |
1413 | &store_ticket_issue_cont, | 1412 | &store_ticket_issue_cont, |
1414 | ih); | 1413 | ih); |
1415 | for (j = 0; j < i; j++) | 1414 | for (j = 0; j < i; j++) |
1416 | { | 1415 | { |
1417 | if (attrs_record[j].record_type | 1416 | if (attrs_record[j].record_type |