aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/reclaim/gnunet-service-reclaim_tickets.c39
1 files changed, 23 insertions, 16 deletions
diff --git a/src/reclaim/gnunet-service-reclaim_tickets.c b/src/reclaim/gnunet-service-reclaim_tickets.c
index 4a307e635..549ea8c34 100644
--- a/src/reclaim/gnunet-service-reclaim_tickets.c
+++ b/src/reclaim/gnunet-service-reclaim_tickets.c
@@ -30,7 +30,8 @@
30 30
31struct ParallelLookup; 31struct ParallelLookup;
32 32
33struct RECLAIM_TICKETS_ConsumeHandle { 33struct RECLAIM_TICKETS_ConsumeHandle
34{
34 /** 35 /**
35 * Ticket 36 * Ticket
36 */ 37 */
@@ -90,7 +91,8 @@ struct RECLAIM_TICKETS_ConsumeHandle {
90/** 91/**
91 * Handle for a parallel GNS lookup job 92 * Handle for a parallel GNS lookup job
92 */ 93 */
93struct ParallelLookup { 94struct ParallelLookup
95{
94 /* DLL */ 96 /* DLL */
95 struct ParallelLookup *next; 97 struct ParallelLookup *next;
96 98
@@ -116,7 +118,8 @@ struct ParallelLookup {
116/** 118/**
117 * A reference to a ticket stored in GNS 119 * A reference to a ticket stored in GNS
118 */ 120 */
119struct TicketReference { 121struct TicketReference
122{
120 /** 123 /**
121 * DLL 124 * DLL
122 */ 125 */
@@ -142,7 +145,8 @@ struct TicketReference {
142/** 145/**
143 * Ticket issue request handle 146 * Ticket issue request handle
144 */ 147 */
145struct TicketIssueHandle { 148struct TicketIssueHandle
149{
146 /** 150 /**
147 * Attributes to issue 151 * Attributes to issue
148 */ 152 */
@@ -177,7 +181,8 @@ struct TicketIssueHandle {
177/** 181/**
178 * Ticket iterator 182 * Ticket iterator
179 */ 183 */
180struct RECLAIM_TICKETS_Iterator { 184struct RECLAIM_TICKETS_Iterator
185{
181 /** 186 /**
182 * Namestore queue entry 187 * Namestore queue entry
183 */ 188 */
@@ -195,7 +200,8 @@ struct RECLAIM_TICKETS_Iterator {
195}; 200};
196 201
197 202
198struct RevokedAttributeEntry { 203struct RevokedAttributeEntry
204{
199 /** 205 /**
200 * DLL 206 * DLL
201 */ 207 */
@@ -218,7 +224,8 @@ struct RevokedAttributeEntry {
218}; 224};
219 225
220 226
221struct TicketRecordsEntry { 227struct TicketRecordsEntry
228{
222 /** 229 /**
223 * DLL 230 * DLL
224 */ 231 */
@@ -253,7 +260,8 @@ struct TicketRecordsEntry {
253/** 260/**
254 * Ticket revocation request handle 261 * Ticket revocation request handle
255 */ 262 */
256struct RECLAIM_TICKETS_RevokeHandle { 263struct RECLAIM_TICKETS_RevokeHandle
264{
257 /** 265 /**
258 * Issuer Key 266 * Issuer Key
259 */ 267 */
@@ -376,7 +384,6 @@ del_attr_finished (void *cls, int32_t success, const char *emsg)
376 cleanup_rvk (rvk); 384 cleanup_rvk (rvk);
377 return; 385 return;
378 } 386 }
379 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Continuing\n");
380 rvk->move_attr = rvk->move_attr->next; 387 rvk->move_attr = rvk->move_attr->next;
381 GNUNET_SCHEDULER_add_now (&move_attrs_cont, rvk); 388 GNUNET_SCHEDULER_add_now (&move_attrs_cont, rvk);
382} 389}
@@ -395,7 +402,7 @@ move_attr_finished (void *cls, int32_t success, const char *emsg)
395 } 402 }
396 label = GNUNET_STRINGS_data_to_string_alloc (&rvk->move_attr->old_id, 403 label = GNUNET_STRINGS_data_to_string_alloc (&rvk->move_attr->old_id,
397 sizeof (uint64_t)); 404 sizeof (uint64_t));
398 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Removing attribute %s\n", label); 405 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Removing attribute %s\n", label);
399 rvk->ns_qe = GNUNET_NAMESTORE_records_store (nsh, &rvk->identity, label, 0, 406 rvk->ns_qe = GNUNET_NAMESTORE_records_store (nsh, &rvk->identity, label, 0,
400 NULL, &del_attr_finished, rvk); 407 NULL, &del_attr_finished, rvk);
401} 408}
@@ -425,7 +432,7 @@ rvk_move_attr_cb (void *cls, const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
425 GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG, UINT64_MAX); 432 GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG, UINT64_MAX);
426 new_label = GNUNET_STRINGS_data_to_string_alloc (&rvk->move_attr->new_id, 433 new_label = GNUNET_STRINGS_data_to_string_alloc (&rvk->move_attr->new_id,
427 sizeof (uint64_t)); 434 sizeof (uint64_t));
428 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Adding attribute %s\n", new_label); 435 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding attribute %s\n", new_label);
429 rvk->ns_qe = GNUNET_NAMESTORE_records_store (nsh, &rvk->identity, new_label, 436 rvk->ns_qe = GNUNET_NAMESTORE_records_store (nsh, &rvk->identity, new_label,
430 1, rd, &move_attr_finished, rvk); 437 1, rd, &move_attr_finished, rvk);
431 GNUNET_free (new_label); 438 GNUNET_free (new_label);
@@ -488,7 +495,7 @@ process_tickets (void *cls)
488 struct TicketRecordsEntry *le; 495 struct TicketRecordsEntry *le;
489 struct RevokedAttributeEntry *ae; 496 struct RevokedAttributeEntry *ae;
490 if (NULL == rvk->tickets_to_update_head) { 497 if (NULL == rvk->tickets_to_update_head) {
491 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 498 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
492 "Finished updatding tickets, success\n"); 499 "Finished updatding tickets, success\n");
493 rvk->cb (rvk->cb_cls, GNUNET_OK); 500 rvk->cb (rvk->cb_cls, GNUNET_OK);
494 cleanup_rvk (rvk); 501 cleanup_rvk (rvk);
@@ -557,7 +564,7 @@ move_attrs (struct RECLAIM_TICKETS_RevokeHandle *rvk)
557 char *label; 564 char *label;
558 565
559 if (NULL == rvk->move_attr) { 566 if (NULL == rvk->move_attr) {
560 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Finished moving attributes\n"); 567 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished moving attributes\n");
561 rvk->ns_it = GNUNET_NAMESTORE_zone_iteration_start ( 568 rvk->ns_it = GNUNET_NAMESTORE_zone_iteration_start (
562 nsh, &rvk->identity, &rvk_ns_iter_err, rvk, &rvk_ticket_update, rvk, 569 nsh, &rvk->identity, &rvk_ns_iter_err, rvk, &rvk_ticket_update, rvk,
563 &rvk_ticket_update_finished, rvk); 570 &rvk_ticket_update_finished, rvk);
@@ -565,7 +572,7 @@ move_attrs (struct RECLAIM_TICKETS_RevokeHandle *rvk)
565 } 572 }
566 label = GNUNET_STRINGS_data_to_string_alloc (&rvk->move_attr->old_id, 573 label = GNUNET_STRINGS_data_to_string_alloc (&rvk->move_attr->old_id,
567 sizeof (uint64_t)); 574 sizeof (uint64_t));
568 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Moving attribute %s\n", label); 575 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Moving attribute %s\n", label);
569 576
570 rvk->ns_qe = GNUNET_NAMESTORE_records_lookup ( 577 rvk->ns_qe = GNUNET_NAMESTORE_records_lookup (
571 nsh, &rvk->identity, label, &rvk_ns_err, rvk, &rvk_move_attr_cb, rvk); 578 nsh, &rvk->identity, label, &rvk_ns_err, rvk, &rvk_move_attr_cb, rvk);
@@ -771,7 +778,7 @@ lookup_authz_cb (void *cls, uint32_t rd_count,
771 778
772 for (int i = 0; i < rd_count; i++) { 779 for (int i = 0; i < rd_count; i++) {
773 lbl = GNUNET_STRINGS_data_to_string_alloc (rd[i].data, rd[i].data_size); 780 lbl = GNUNET_STRINGS_data_to_string_alloc (rd[i].data, rd[i].data_size);
774 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Attribute ref found %s\n", lbl); 781 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Attribute ref found %s\n", lbl);
775 parallel_lookup = GNUNET_new (struct ParallelLookup); 782 parallel_lookup = GNUNET_new (struct ParallelLookup);
776 parallel_lookup->handle = cth; 783 parallel_lookup->handle = cth;
777 parallel_lookup->label = lbl; 784 parallel_lookup->label = lbl;
@@ -806,7 +813,7 @@ RECLAIM_TICKETS_consume (const struct GNUNET_CRYPTO_EcdsaPrivateKey *id,
806 cth->cb_cls = cb_cls; 813 cth->cb_cls = cb_cls;
807 label = 814 label =
808 GNUNET_STRINGS_data_to_string_alloc (&cth->ticket.rnd, sizeof (uint64_t)); 815 GNUNET_STRINGS_data_to_string_alloc (&cth->ticket.rnd, sizeof (uint64_t));
809 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Looking for AuthZ info under %s\n", 816 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Looking for AuthZ info under %s\n",
810 label); 817 label);
811 cth->lookup_start_time = GNUNET_TIME_absolute_get (); 818 cth->lookup_start_time = GNUNET_TIME_absolute_get ();
812 cth->lookup_request = GNUNET_GNS_lookup ( 819 cth->lookup_request = GNUNET_GNS_lookup (