towards better API

6 files changed, 53 insertions, 14 deletions

diff --git a/src/reclaim/gnunet-reclaim.c b/src/reclaim/gnunet-reclaim.c
index 3e31fef4c..0170ceff2 100644
--- a/src/reclaim/gnunet-reclaim.c
+++ b/src/reclaim/gnunet-reclaim.c
@@ -553,13 +553,27 @@ iter_cb (void *cls,
                                                          attr->data_size);
     attr_type = GNUNET_RECLAIM_attribute_number_to_typename (attr->type);
     id = GNUNET_STRINGS_data_to_string_alloc (&attr->id, sizeof(attr->id));
-    fprintf (stdout,
-             "Name: %s; Value: %s (%s); Flag %u; ID: %s\n",
-             attr->name,
-             attr_str,
-             attr_type,
-             attr->flag,
-             id);
+    if (GNUNET_YES == GNUNET_RECLAIM_id_is_zero (&attr->attestation))
+    {
+      fprintf (stdout,
+               "Name: %s; Value: %s (%s); Flag %u; ID: %s\n",
+               attr->name,
+               attr_str,
+               attr_type,
+               attr->flag,
+               id);
+    }
+    else
+    {
+      fprintf (stdout,
+               "Name: %s; Value: %s (%s); Flag %u; ID: %s\n",
+               attr->name,
+               attr_str,
+               attr_type,
+               attr->flag,
+               id);
+
+    }
     GNUNET_free (id);
   }
   GNUNET_RECLAIM_get_attributes_next (attr_iterator);
@@ -609,7 +623,8 @@ attest_iter_finished (void *cls)
 static void
 attest_iter_cb (void *cls,
                 const struct GNUNET_CRYPTO_EcdsaPublicKey *identity,
-                const struct GNUNET_RECLAIM_Attestation *attest)
+                const struct GNUNET_RECLAIM_Attestation *attest,
+                const struct GNUNET_RECLAIM_AttributeList *attrs)
 {
   char *attest_str;
   char *id;
diff --git a/src/reclaim/gnunet-service-reclaim.c b/src/reclaim/gnunet-service-reclaim.c
index 61d029665..99831172b 100644
--- a/src/reclaim/gnunet-service-reclaim.c
+++ b/src/reclaim/gnunet-service-reclaim.c
@@ -1900,7 +1900,10 @@ attest_iter_cb (void *cls,
 {
   struct Iterator *ai = cls;
   struct GNUNET_MQ_Envelope *env;
+  struct GNUNET_RECLAIM_AttributeList *attrs;
+  struct GNUNET_RECLAIM_Attestation *att;
   char *data_tmp;
+  char *attrs_size;
 
   if ((rd_count != 1) ||
       (GNUNET_GNSRECORD_TYPE_RECLAIM_ATTESTATION != rd->record_type))
@@ -1908,6 +1911,10 @@ attest_iter_cb (void *cls,
     GNUNET_NAMESTORE_zone_iterator_next (ai->ns_it, 1);
     return;
   }
+  att = GNUNET_RECLAIM_attestation_deserialize (rd->data,
+                                                rd->data_size);
+  attrs = GNUNET_RECLAIM_attestation_get_attributes (att);
+  attrs_size = GNUNET_RECLAIM_attribute_list_serialize_get_size (attrs);
 
   struct AttestationResultMessage *arm;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found attestation under: %s\n",
@@ -1915,13 +1922,17 @@ attest_iter_cb (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Sending ATTESTATION_RESULT message\n");
   env = GNUNET_MQ_msg_extra (arm,
-                             rd->data_size,
+                             rd->data_size + attrs_size,
                              GNUNET_MESSAGE_TYPE_RECLAIM_ATTESTATION_RESULT);
   arm->id = htonl (ai->request_id);
   arm->attestation_len = htons (rd->data_size);
   GNUNET_CRYPTO_ecdsa_key_get_public (zone, &arm->identity);
   data_tmp = (char *) &arm[1];
   GNUNET_memcpy (data_tmp, rd->data, rd->data_size);
+  data_tmp += rd->data_size;
+  GNUNET_RECLAIM_attribute_list_serialize (attrs,
+                                           data_tmp);
+
   GNUNET_MQ_send (ai->client->mq, env);
 }
 
diff --git a/src/reclaim/plugin_rest_openid_connect.c b/src/reclaim/plugin_rest_openid_connect.c
index 345dbeed6..b296f6d15 100644
--- a/src/reclaim/plugin_rest_openid_connect.c
+++ b/src/reclaim/plugin_rest_openid_connect.c
@@ -988,7 +988,8 @@ oidc_attest_collect_finished_cb (void *cls)
 static void
 oidc_attest_collect (void *cls,
                      const struct GNUNET_CRYPTO_EcdsaPublicKey *identity,
-                     const struct GNUNET_RECLAIM_Attestation *attest)
+                     const struct GNUNET_RECLAIM_Attestation *attest,
+                     const struct GNUNET_RECLAIM_AttributeList *attrs)
 {
   struct RequestHandle *handle = cls;
   struct GNUNET_RECLAIM_AttributeListEntry *le;
diff --git a/src/reclaim/plugin_rest_reclaim.c b/src/reclaim/plugin_rest_reclaim.c
index 6f7a5987b..cddee9b54 100644
--- a/src/reclaim/plugin_rest_reclaim.c
+++ b/src/reclaim/plugin_rest_reclaim.c
@@ -619,7 +619,8 @@ add_attestation_cont (struct GNUNET_REST_RequestHandle *con_handle,
 static void
 attest_collect (void *cls,
                 const struct GNUNET_CRYPTO_EcdsaPublicKey *identity,
-                const struct GNUNET_RECLAIM_Attestation *attest)
+                const struct GNUNET_RECLAIM_Attestation *attest,
+                const struct GNUNET_RECLAIM_AttributeList *attrs)
 {
   struct RequestHandle *handle = cls;
   json_t *attr_obj;
diff --git a/src/reclaim/reclaim.h b/src/reclaim/reclaim.h
index 7b5d7ab19..2cd07e861 100644
--- a/src/reclaim/reclaim.h
+++ b/src/reclaim/reclaim.h
@@ -179,6 +179,11 @@ struct AttestationResultMessage
   uint16_t attestation_len GNUNET_PACKED;
 
   /**
+   * Length of serialized attribute data
+   */
+  uint16_t attributes_len GNUNET_PACKED;
+
+  /**
    * always zero (for alignment)
    */
   uint16_t reserved GNUNET_PACKED;
diff --git a/src/reclaim/reclaim_api.c b/src/reclaim/reclaim_api.c
index 3820550c9..afab33320 100644
--- a/src/reclaim/reclaim_api.c
+++ b/src/reclaim/reclaim_api.c
@@ -801,11 +801,14 @@ handle_attestation_result (void *cls, const struct
   static struct GNUNET_CRYPTO_EcdsaPrivateKey identity_dummy;
   struct GNUNET_RECLAIM_Handle *h = cls;
   struct GNUNET_RECLAIM_AttestationIterator *it;
+  struct GNUNET_RECLAIM_AttributeList *attrs;
   struct GNUNET_RECLAIM_Operation *op;
   size_t att_len;
+  size_t attrs_len;
   uint32_t r_id = ntohl (msg->id);
 
   att_len = ntohs (msg->attestation_len);
+  attrs_len = ntohs (msg->attributes_len);
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Processing attestation result.\n");
 
 
@@ -836,7 +839,7 @@ handle_attestation_result (void *cls, const struct
     if (NULL != op)
     {
       if (NULL != op->at_cb)
-        op->at_cb (op->cls, NULL, NULL);
+        op->at_cb (op->cls, NULL, NULL, NULL);
       GNUNET_CONTAINER_DLL_remove (h->op_head, h->op_tail, op);
       free_op (op);
     }
@@ -846,17 +849,20 @@ handle_attestation_result (void *cls, const struct
   {
     struct GNUNET_RECLAIM_Attestation *att;
     att = GNUNET_RECLAIM_attestation_deserialize ((char *) &msg[1], att_len);
+    char *read_ptr = ((char *) &msg[1]) + att_len;
+    attrs = GNUNET_RECLAIM_attribute_list_deserialize (read_ptr, attrs_len);
     if (NULL != it)
     {
       if (NULL != it->proc)
-        it->proc (it->proc_cls, &msg->identity, att);
+        it->proc (it->proc_cls, &msg->identity, att, attrs);
     }
     else if (NULL != op)
     {
       if (NULL != op->at_cb)
-        op->at_cb (op->cls, &msg->identity, att);
+        op->at_cb (op->cls, &msg->identity, att, attrs);
     }
     GNUNET_free (att);
+    GNUNET_RECLAIM_attribute_list_destroy (attrs);
     return;
   }
   GNUNET_assert (0);