From 0d128388d4c4da4afc6b65913d1d2e25e039cd8c Mon Sep 17 00:00:00 2001 From: "Schanzenbach, Martin" Date: Wed, 4 Jul 2018 07:41:14 +0200 Subject: [PATCH] acutally delete ticket --- .../gnunet-service-identity-provider.c | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/identity-provider/gnunet-service-identity-provider.c b/src/identity-provider/gnunet-service-identity-provider.c index 7f71988f8..4563fdfa1 100644 --- a/src/identity-provider/gnunet-service-identity-provider.c +++ b/src/identity-provider/gnunet-service-identity-provider.c @@ -1157,6 +1157,9 @@ send_revocation_finished (struct TicketRevocationHandle *rh, { struct GNUNET_MQ_Envelope *env; struct RevokeTicketResultMessage *trm; + + GNUNET_break(TKT_database->delete_ticket (TKT_database->cls, + &rh->ticket)); env = GNUNET_MQ_msg (trm, GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_REVOKE_TICKET_RESULT); @@ -1255,9 +1258,18 @@ ticket_reissue_proc (void *cls, { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Do not reissue for this identity.!\n"); - - rh->offset++; - GNUNET_SCHEDULER_add_now (&reissue_next, rh); + label = GNUNET_STRINGS_data_to_string_alloc (&rh->ticket.rnd, + sizeof (uint64_t)); + //Delete record + rh->ns_qe = GNUNET_NAMESTORE_records_store (ns_handle, + &rh->identity, + label, + 0, + NULL, + &reissue_ticket_cont, + rh); + + GNUNET_free (label); return; } @@ -1955,7 +1967,7 @@ attr_store_cont (void *cls, struct AttributeStoreHandle *as_handle = cls; struct GNUNET_MQ_Envelope *env; struct AttributeStoreResultMessage *acr_msg; - + as_handle->ns_qe = NULL; GNUNET_CONTAINER_DLL_remove (as_handle->client->store_op_head, as_handle->client->store_op_tail, @@ -2177,14 +2189,14 @@ attr_iter_cb (void *cls, if (rd_count != 1) { GNUNET_NAMESTORE_zone_iterator_next (ai->ns_it, - 1); + 1); return; } if (GNUNET_GNSRECORD_TYPE_ID_ATTR != rd->record_type) { GNUNET_NAMESTORE_zone_iterator_next (ai->ns_it, - 1); + 1); return; } attr_ver = ntohl(*((uint32_t*)rd->data)); @@ -2201,7 +2213,7 @@ attr_iter_cb (void *cls, if (GNUNET_SYSERR == msg_extra_len) { GNUNET_NAMESTORE_zone_iterator_next (ai->ns_it, - 1); + 1); return; } @@ -2252,7 +2264,7 @@ iterate_next_after_abe_bootstrap (void *cls, struct AttributeIterator *ai = cls; ai->abe_key = abe_key; GNUNET_NAMESTORE_zone_iterator_next (ai->ns_it, - 1); + 1); } -- 2.25.1