diff options
author | Markus Voggenreiter <Markus.Voggenreiter@tum.de> | 2019-12-03 16:46:48 +0100 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2020-01-13 13:31:06 +0100 |
commit | ed9b8362ebafeac17fb8ab56953d1abae1d94697 (patch) | |
tree | 0b885a6d1a23543e252dc3263021cb8b0be73443 /src/reclaim/gnunet-service-reclaim.c | |
parent | 76df96b59f803f9ba68849f452efbeed50d80086 (diff) | |
download | gnunet-ed9b8362ebafeac17fb8ab56953d1abae1d94697.tar.gz gnunet-ed9b8362ebafeac17fb8ab56953d1abae1d94697.zip |
Fixed Ticket Management
Diffstat (limited to 'src/reclaim/gnunet-service-reclaim.c')
-rw-r--r-- | src/reclaim/gnunet-service-reclaim.c | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/src/reclaim/gnunet-service-reclaim.c b/src/reclaim/gnunet-service-reclaim.c index 5727f1ccd..556006af0 100644 --- a/src/reclaim/gnunet-service-reclaim.c +++ b/src/reclaim/gnunet-service-reclaim.c | |||
@@ -1569,13 +1569,13 @@ ticket_iter (void *cls, | |||
1569 | { | 1569 | { |
1570 | if (GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF != rd[i].record_type) | 1570 | if (GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF != rd[i].record_type) |
1571 | continue; | 1571 | continue; |
1572 | if (&adh->claim != NULL) | 1572 | if (adh->claim != NULL) |
1573 | if (0 != memcmp (rd[i].data, &adh->claim->id, sizeof(uint64_t))) | 1573 | if (0 != memcmp (rd[i].data, &adh->claim->id, sizeof(uint64_t))) |
1574 | continue; | 1574 | continue; |
1575 | if (&adh->attest != NULL) | 1575 | if (adh->attest != NULL) |
1576 | if (0 != memcmp (rd[i].data, &adh->attest->id, sizeof(uint64_t))) | 1576 | if (0 != memcmp (rd[i].data, &adh->attest->id, sizeof(uint64_t))) |
1577 | continue; | 1577 | continue; |
1578 | if (&adh->reference != NULL) | 1578 | if (adh->reference != NULL) |
1579 | if (0 != memcmp (rd[i].data, &adh->reference->id, sizeof(uint64_t))) | 1579 | if (0 != memcmp (rd[i].data, &adh->reference->id, sizeof(uint64_t))) |
1580 | continue; | 1580 | continue; |
1581 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1581 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
@@ -1669,15 +1669,18 @@ update_tickets (void *cls) | |||
1669 | int j = 0; | 1669 | int j = 0; |
1670 | for (int i = 0; i < le->rd_count; i++) | 1670 | for (int i = 0; i < le->rd_count; i++) |
1671 | { | 1671 | { |
1672 | if ((GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF == rd[i].record_type) | 1672 | if (adh->claim != NULL) |
1673 | && (0 == memcmp (rd[i].data, &adh->claim->id, sizeof(uint64_t)))) | 1673 | if ((GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF == rd[i].record_type) |
1674 | continue; | 1674 | && (0 == memcmp (rd[i].data, &adh->claim->id, sizeof(uint64_t)))) |
1675 | if ((GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF == rd[i].record_type) | 1675 | continue; |
1676 | && (0 == memcmp (rd[i].data, &adh->attest->id, sizeof(uint64_t)))) | 1676 | if (adh->attest != NULL) |
1677 | continue; | 1677 | if ((GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF == rd[i].record_type) |
1678 | if ((GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF == rd[i].record_type) | 1678 | && (0 == memcmp (rd[i].data, &adh->attest->id, sizeof(uint64_t)))) |
1679 | && (0 == memcmp (rd[i].data, &adh->reference->id, sizeof(uint64_t)))) | 1679 | continue; |
1680 | continue; | 1680 | if (adh->reference != NULL) |
1681 | if ((GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF == rd[i].record_type) | ||
1682 | && (0 == memcmp (rd[i].data, &adh->reference->id, sizeof(uint64_t)))) | ||
1683 | continue; | ||
1681 | rd_new[j] = rd[i]; | 1684 | rd_new[j] = rd[i]; |
1682 | j++; | 1685 | j++; |
1683 | } | 1686 | } |
@@ -1703,7 +1706,6 @@ static void | |||
1703 | ticket_iter_fin (void *cls) | 1706 | ticket_iter_fin (void *cls) |
1704 | { | 1707 | { |
1705 | struct AttributeDeleteHandle *adh = cls; | 1708 | struct AttributeDeleteHandle *adh = cls; |
1706 | |||
1707 | adh->ns_it = NULL; | 1709 | adh->ns_it = NULL; |
1708 | GNUNET_SCHEDULER_add_now (&update_tickets, adh); | 1710 | GNUNET_SCHEDULER_add_now (&update_tickets, adh); |
1709 | } | 1711 | } |
@@ -1952,7 +1954,10 @@ reference_delete_cont (void *cls, int32_t success, const char *emsg) | |||
1952 | return; | 1954 | return; |
1953 | } | 1955 | } |
1954 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating tickets...\n"); | 1956 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating tickets...\n"); |
1955 | GNUNET_SCHEDULER_add_now (&start_ticket_update, adh); | 1957 | //GNUNET_SCHEDULER_add_now (&start_ticket_update, adh); |
1958 | send_delete_response (adh, GNUNET_OK); | ||
1959 | cleanup_adh (adh); | ||
1960 | return; | ||
1956 | } | 1961 | } |
1957 | 1962 | ||
1958 | static void | 1963 | static void |