[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 20/30: more bugfixes and REST API change
From: |
gnunet |
Subject: |
[gnunet] 20/30: more bugfixes and REST API change |
Date: |
Thu, 13 Feb 2020 22:31:20 +0100 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit a80090ffcc10a2a2c188313e997d16802f2777f1
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Thu Feb 6 20:08:58 2020 +0100
more bugfixes and REST API change
---
src/reclaim/plugin_rest_reclaim.c | 58 +++++++++++++++++++++++----------------
1 file changed, 34 insertions(+), 24 deletions(-)
diff --git a/src/reclaim/plugin_rest_reclaim.c
b/src/reclaim/plugin_rest_reclaim.c
index cd163e8a4..417e594fe 100644
--- a/src/reclaim/plugin_rest_reclaim.c
+++ b/src/reclaim/plugin_rest_reclaim.c
@@ -407,6 +407,7 @@ collect_finished_cb (void *cls)
// Done
handle->attr_it = NULL;
+ handle->attest_it = NULL;
handle->ticket_it = NULL;
GNUNET_SCHEDULER_add_now (&return_response, handle);
}
@@ -624,46 +625,55 @@ attest_collect (void *cls,
const struct GNUNET_RECLAIM_AttributeList *attrs)
{
struct RequestHandle *handle = cls;
+ struct GNUNET_RECLAIM_AttributeListEntry *ale;
json_t *attr_obj;
+ json_t *attest_obj;
const char *type;
char *tmp_value;
char *id_str;
- if (NULL == attest)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Attestation Collection with empty Attestation\n");
- GNUNET_RECLAIM_get_attributes_next (handle->attr_it);
- return;
- }
-
- if ((NULL == attest->name) || (NULL == attest->data))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Attestation Collection with empty Name/Value\n");
- GNUNET_RECLAIM_get_attributes_next (handle->attr_it);
- return;
- }
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding attestation: %s\n",
attest->name);
tmp_value = GNUNET_RECLAIM_attestation_value_to_string (attest->type,
attest->data,
attest->data_size);
- attr_obj = json_object ();
- json_object_set_new (attr_obj, "value", json_string (tmp_value));
- json_object_set_new (attr_obj, "name", json_string (attest->name));
+ attest_obj = json_object ();
+ json_object_set_new (attest_obj, "value", json_string (tmp_value));
+ json_object_set_new (attest_obj, "name", json_string (attest->name));
type = GNUNET_RECLAIM_attestation_number_to_typename (attest->type);
- json_object_set_new (attr_obj, "type", json_string (type));
+ json_object_set_new (attest_obj, "type", json_string (type));
id_str = GNUNET_STRINGS_data_to_string_alloc (&attest->id,
sizeof(attest->id));
- json_object_set_new (attr_obj, "id", json_string (id_str));
- json_array_append (handle->resp_object, attr_obj);
- json_decref (attr_obj);
+ json_object_set_new (attest_obj, "id", json_string (id_str));
GNUNET_free (tmp_value);
- GNUNET_RECLAIM_get_attributes_next (handle->attr_it);
+ if (NULL != attrs)
+ {
+ json_t *attr_arr = json_array ();
+ for (ale = attrs->list_head; NULL != ale; ale = ale->next)
+ {
+ tmp_value =
+ GNUNET_RECLAIM_attribute_value_to_string (ale->attribute->type,
+ ale->attribute->data,
+ ale->attribute->data_size);
+ attr_obj = json_object ();
+ json_object_set_new (attr_obj, "value", json_string (tmp_value));
+ json_object_set_new (attr_obj, "name", json_string (
+ ale->attribute->name));
+
+ json_object_set_new (attr_obj, "flag", json_string ("1")); //FIXME
+ type = GNUNET_RECLAIM_attribute_number_to_typename
(ale->attribute->type);
+ json_object_set_new (attr_obj, "type", json_string (type));
+ json_object_set_new (attr_obj, "id", json_string (""));
+ json_object_set_new (attr_obj, "attestation", json_string (""));
+ json_array_append_new (attr_arr, attr_obj);
+ GNUNET_free (tmp_value);
+ }
+ json_object_set_new (attest_obj, "attributes", attr_arr);
+ }
+ json_array_append_new (handle->resp_object, attest_obj);
+ GNUNET_RECLAIM_get_attestations_next (handle->attest_it);
}
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnunet] 27/30: Merge branch 'master' into schanzen/reclaim_256bit, (continued)
- [gnunet] 27/30: Merge branch 'master' into schanzen/reclaim_256bit, gnunet, 2020/02/13
- [gnunet] 21/30: add base64url encoding to util (RFC7515), gnunet, 2020/02/13
- [gnunet] 12/30: add expiration, gnunet, 2020/02/13
- [gnunet] 29/30: Merge branch 'master' into schanzen/reclaim_256bit, gnunet, 2020/02/13
- [gnunet] 19/30: bugfixes, gnunet, 2020/02/13
- [gnunet] 17/30: bugfixes, gnunet, 2020/02/13
- [gnunet] 15/30: add attestation API, gnunet, 2020/02/13
- [gnunet] 13/30: move to 256-bit identifier; some cleanups, gnunet, 2020/02/13
- [gnunet] 18/30: towards better API, gnunet, 2020/02/13
- [gnunet] 25/30: Merge branch 'schanzen/reclaim_256bit' of ssh://gnunet.org/gnunet into schanzen/reclaim_256bit, gnunet, 2020/02/13
- [gnunet] 20/30: more bugfixes and REST API change,
gnunet <=
- [gnunet] 26/30: Merge branch 'master' into schanzen/reclaim_256bit, gnunet, 2020/02/13
- [gnunet] 02/30: Refactoring reclaim attestations, gnunet, 2020/02/13
- [gnunet] 28/30: Merge branch 'master' into schanzen/reclaim_256bit, gnunet, 2020/02/13
- [gnunet] 30/30: Merge branch 'master' into schanzen/reclaim_256bit, gnunet, 2020/02/13
- [gnunet] 22/30: bugfixes; CLI improvements, gnunet, 2020/02/13
- [gnunet] 24/30: add expiration, gnunet, 2020/02/13
- [gnunet] 23/30: consolidate reclaim attribute lib, gnunet, 2020/02/13
- [gnunet] 14/30: Refactoring reclaim attestations, gnunet, 2020/02/13