1 files changed, 183 insertions, 175 deletions

diff --git a/src/credential/credential_api.c b/src/credential/credential_api.c
index dc1052484..3cbaf6c21 100644
--- a/src/credential/credential_api.c
+++ b/src/credential/credential_api.c
@@ -35,12 +35,13 @@
 #include "gnunet_identity_service.h"
 
 
-#define LOG(kind, ...) GNUNET_log_from(kind, "credential-api", __VA_ARGS__)
+#define LOG(kind, ...) GNUNET_log_from (kind, "credential-api", __VA_ARGS__)
 
 /**
  * Handle to a verify request
  */
-struct GNUNET_CREDENTIAL_Request {
+struct GNUNET_CREDENTIAL_Request
+{
   /**
    * DLL
    */
@@ -81,7 +82,8 @@ struct GNUNET_CREDENTIAL_Request {
 /**
  * Connection to the CREDENTIAL service.
  */
-struct GNUNET_CREDENTIAL_Handle {
+struct GNUNET_CREDENTIAL_Handle
+{
   /**
    * Configuration to use.
    */
@@ -125,7 +127,7 @@ struct GNUNET_CREDENTIAL_Handle {
  * @param handle the handle to the CREDENTIAL service
  */
 static void
-reconnect(struct GNUNET_CREDENTIAL_Handle *handle);
+reconnect (struct GNUNET_CREDENTIAL_Handle *handle);
 
 
 /**
@@ -134,12 +136,12 @@ reconnect(struct GNUNET_CREDENTIAL_Handle *handle);
  * @param cls the handle
  */
 static void
-reconnect_task(void *cls)
+reconnect_task (void *cls)
 {
   struct GNUNET_CREDENTIAL_Handle *handle = cls;
 
   handle->reconnect_task = NULL;
-  reconnect(handle);
+  reconnect (handle);
 }
 
 
@@ -149,16 +151,16 @@ reconnect_task(void *cls)
  * @param handle our handle
  */
 static void
-force_reconnect(struct GNUNET_CREDENTIAL_Handle *handle)
+force_reconnect (struct GNUNET_CREDENTIAL_Handle *handle)
 {
-  GNUNET_MQ_destroy(handle->mq);
+  GNUNET_MQ_destroy (handle->mq);
   handle->mq = NULL;
   handle->reconnect_backoff
-    = GNUNET_TIME_STD_BACKOFF(handle->reconnect_backoff);
+    = GNUNET_TIME_STD_BACKOFF (handle->reconnect_backoff);
   handle->reconnect_task
-    = GNUNET_SCHEDULER_add_delayed(handle->reconnect_backoff,
-                                   &reconnect_task,
-                                   handle);
+    = GNUNET_SCHEDULER_add_delayed (handle->reconnect_backoff,
+                                    &reconnect_task,
+                                    handle);
 }
 
 
@@ -171,12 +173,12 @@ force_reconnect(struct GNUNET_CREDENTIAL_Handle *handle)
  * @param error error code
  */
 static void
-mq_error_handler(void *cls,
-                 enum GNUNET_MQ_Error error)
+mq_error_handler (void *cls,
+                  enum GNUNET_MQ_Error error)
 {
   struct GNUNET_CREDENTIAL_Handle *handle = cls;
 
-  force_reconnect(handle);
+  force_reconnect (handle);
 }
 
 /**
@@ -186,10 +188,10 @@ mq_error_handler(void *cls,
  * @param vr_msg the incoming message
  */
 static int
-check_result(void *cls,
-             const struct DelegationChainResultMessage *vr_msg)
+check_result (void *cls,
+              const struct DelegationChainResultMessage *vr_msg)
 {
-  //TODO
+  // TODO
   return GNUNET_OK;
 }
 
@@ -201,22 +203,22 @@ check_result(void *cls,
  * @param vr_msg the incoming message
  */
 static void
-handle_result(void *cls,
-              const struct DelegationChainResultMessage *vr_msg)
+handle_result (void *cls,
+               const struct DelegationChainResultMessage *vr_msg)
 {
   struct GNUNET_CREDENTIAL_Handle *handle = cls;
-  uint32_t r_id = ntohl(vr_msg->id);
+  uint32_t r_id = ntohl (vr_msg->id);
   struct GNUNET_CREDENTIAL_Request *vr;
-  size_t mlen = ntohs(vr_msg->header.size) - sizeof(*vr_msg);
-  uint32_t d_count = ntohl(vr_msg->d_count);
-  uint32_t c_count = ntohl(vr_msg->c_count);
+  size_t mlen = ntohs (vr_msg->header.size) - sizeof(*vr_msg);
+  uint32_t d_count = ntohl (vr_msg->d_count);
+  uint32_t c_count = ntohl (vr_msg->c_count);
   struct GNUNET_CREDENTIAL_Delegation d_chain[d_count];
   struct GNUNET_CREDENTIAL_Credential creds[c_count];
   GNUNET_CREDENTIAL_CredentialResultProcessor proc;
   void *proc_cls;
 
-  LOG(GNUNET_ERROR_TYPE_DEBUG,
-      "Received verify reply from CREDENTIAL service\n");
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Received verify reply from CREDENTIAL service\n");
   for (vr = handle->request_head; NULL != vr; vr = vr->next)
     if (vr->r_id == r_id)
       break;
@@ -224,34 +226,36 @@ handle_result(void *cls,
     return;
   proc = vr->verify_proc;
   proc_cls = vr->proc_cls;
-  GNUNET_CONTAINER_DLL_remove(handle->request_head,
-                              handle->request_tail,
-                              vr);
-  GNUNET_MQ_discard(vr->env);
-  GNUNET_free(vr);
-  GNUNET_assert(GNUNET_OK ==
-                GNUNET_CREDENTIAL_delegation_chain_deserialize(mlen,
-                                                               (const char*)&vr_msg[1],
-                                                               d_count,
-                                                               d_chain,
-                                                               c_count,
-                                                               creds));
-  if (GNUNET_NO == ntohl(vr_msg->cred_found))
-    {
-      proc(proc_cls,
-           0,
-           NULL,
-           0,
-           NULL); // TODO
-    }
+  GNUNET_CONTAINER_DLL_remove (handle->request_head,
+                               handle->request_tail,
+                               vr);
+  GNUNET_MQ_discard (vr->env);
+  GNUNET_free (vr);
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_CREDENTIAL_delegation_chain_deserialize (mlen,
+                                                                 (const
+                                                                  char*) &vr_msg
+                                                                 [1],
+                                                                 d_count,
+                                                                 d_chain,
+                                                                 c_count,
+                                                                 creds));
+  if (GNUNET_NO == ntohl (vr_msg->cred_found))
+  {
+    proc (proc_cls,
+          0,
+          NULL,
+          0,
+          NULL);  // TODO
+  }
   else
-    {
-      proc(proc_cls,
-           d_count,
-           d_chain,
-           c_count,
-           creds);
-    }
+  {
+    proc (proc_cls,
+          d_count,
+          d_chain,
+          c_count,
+          creds);
+  }
 }
 
 
@@ -261,34 +265,34 @@ handle_result(void *cls,
  * @param handle the handle to the CREDENTIAL service
  */
 static void
-reconnect(struct GNUNET_CREDENTIAL_Handle *handle)
+reconnect (struct GNUNET_CREDENTIAL_Handle *handle)
 {
   struct GNUNET_MQ_MessageHandler handlers[] = {
-    GNUNET_MQ_hd_var_size(result,
-                          GNUNET_MESSAGE_TYPE_CREDENTIAL_VERIFY_RESULT,
-                          struct DelegationChainResultMessage,
-                          handle),
-    GNUNET_MQ_hd_var_size(result,
-                          GNUNET_MESSAGE_TYPE_CREDENTIAL_COLLECT_RESULT,
-                          struct DelegationChainResultMessage,
-                          handle),
-    GNUNET_MQ_handler_end()
+    GNUNET_MQ_hd_var_size (result,
+                           GNUNET_MESSAGE_TYPE_CREDENTIAL_VERIFY_RESULT,
+                           struct DelegationChainResultMessage,
+                           handle),
+    GNUNET_MQ_hd_var_size (result,
+                           GNUNET_MESSAGE_TYPE_CREDENTIAL_COLLECT_RESULT,
+                           struct DelegationChainResultMessage,
+                           handle),
+    GNUNET_MQ_handler_end ()
   };
   struct GNUNET_CREDENTIAL_Request *vr;
 
-  GNUNET_assert(NULL == handle->mq);
-  LOG(GNUNET_ERROR_TYPE_DEBUG,
-      "Trying to connect to CREDENTIAL\n");
-  handle->mq = GNUNET_CLIENT_connect(handle->cfg,
-                                     "credential",
-                                     handlers,
-                                     &mq_error_handler,
-                                     handle);
+  GNUNET_assert (NULL == handle->mq);
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Trying to connect to CREDENTIAL\n");
+  handle->mq = GNUNET_CLIENT_connect (handle->cfg,
+                                      "credential",
+                                      handlers,
+                                      &mq_error_handler,
+                                      handle);
   if (NULL == handle->mq)
     return;
   for (vr = handle->request_head; NULL != vr; vr = vr->next)
-    GNUNET_MQ_send_copy(handle->mq,
-                        vr->env);
+    GNUNET_MQ_send_copy (handle->mq,
+                         vr->env);
 }
 
 
@@ -299,18 +303,18 @@ reconnect(struct GNUNET_CREDENTIAL_Handle *handle)
  * @return handle to the CREDENTIAL service, or NULL on error
  */
 struct GNUNET_CREDENTIAL_Handle *
-GNUNET_CREDENTIAL_connect(const struct GNUNET_CONFIGURATION_Handle *cfg)
+GNUNET_CREDENTIAL_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct GNUNET_CREDENTIAL_Handle *handle;
 
-  handle = GNUNET_new(struct GNUNET_CREDENTIAL_Handle);
+  handle = GNUNET_new (struct GNUNET_CREDENTIAL_Handle);
   handle->cfg = cfg;
-  reconnect(handle);
+  reconnect (handle);
   if (NULL == handle->mq)
-    {
-      GNUNET_free(handle);
-      return NULL;
-    }
+  {
+    GNUNET_free (handle);
+    return NULL;
+  }
   return handle;
 }
 
@@ -321,20 +325,20 @@ GNUNET_CREDENTIAL_connect(const struct GNUNET_CONFIGURATION_Handle *cfg)
  * @param handle handle of the CREDENTIAL connection to stop
  */
 void
-GNUNET_CREDENTIAL_disconnect(struct GNUNET_CREDENTIAL_Handle *handle)
+GNUNET_CREDENTIAL_disconnect (struct GNUNET_CREDENTIAL_Handle *handle)
 {
   if (NULL != handle->mq)
-    {
-      GNUNET_MQ_destroy(handle->mq);
-      handle->mq = NULL;
-    }
+  {
+    GNUNET_MQ_destroy (handle->mq);
+    handle->mq = NULL;
+  }
   if (NULL != handle->reconnect_task)
-    {
-      GNUNET_SCHEDULER_cancel(handle->reconnect_task);
-      handle->reconnect_task = NULL;
-    }
-  GNUNET_assert(NULL == handle->request_head);
-  GNUNET_free(handle);
+  {
+    GNUNET_SCHEDULER_cancel (handle->reconnect_task);
+    handle->reconnect_task = NULL;
+  }
+  GNUNET_assert (NULL == handle->request_head);
+  GNUNET_free (handle);
 }
 
 
@@ -344,15 +348,15 @@ GNUNET_CREDENTIAL_disconnect(struct GNUNET_CREDENTIAL_Handle *handle)
  * @param lr the verify request to cancel
  */
 void
-GNUNET_CREDENTIAL_request_cancel(struct GNUNET_CREDENTIAL_Request *lr)
+GNUNET_CREDENTIAL_request_cancel (struct GNUNET_CREDENTIAL_Request *lr)
 {
   struct GNUNET_CREDENTIAL_Handle *handle = lr->credential_handle;
 
-  GNUNET_CONTAINER_DLL_remove(handle->request_head,
-                              handle->request_tail,
-                              lr);
-  GNUNET_MQ_discard(lr->env);
-  GNUNET_free(lr);
+  GNUNET_CONTAINER_DLL_remove (handle->request_head,
+                               handle->request_tail,
+                               lr);
+  GNUNET_MQ_discard (lr->env);
+  GNUNET_free (lr);
 }
 
 
@@ -370,12 +374,14 @@ GNUNET_CREDENTIAL_request_cancel(struct GNUNET_CREDENTIAL_Request *lr)
  * @return handle to the queued request
  */
 struct GNUNET_CREDENTIAL_Request*
-GNUNET_CREDENTIAL_collect(struct GNUNET_CREDENTIAL_Handle *handle,
-                          const struct GNUNET_CRYPTO_EcdsaPublicKey *issuer_key,
-                          const char *issuer_attribute,
-                          const struct GNUNET_CRYPTO_EcdsaPrivateKey *subject_key,
-                          GNUNET_CREDENTIAL_CredentialResultProcessor proc,
-                          void *proc_cls)
+GNUNET_CREDENTIAL_collect (struct GNUNET_CREDENTIAL_Handle *handle,
+                           const struct
+                           GNUNET_CRYPTO_EcdsaPublicKey *issuer_key,
+                           const char *issuer_attribute,
+                           const struct
+                           GNUNET_CRYPTO_EcdsaPrivateKey *subject_key,
+                           GNUNET_CREDENTIAL_CredentialResultProcessor proc,
+                           void *proc_cls)
 {
   /* IPC to shorten credential names, return shorten_handle */
   struct CollectMessage *c_msg;
@@ -383,42 +389,42 @@ GNUNET_CREDENTIAL_collect(struct GNUNET_CREDENTIAL_Handle *handle,
   size_t nlen;
 
   if (NULL == issuer_attribute)
-    {
-      GNUNET_break(0);
-      return NULL;
-    }
-
-  //DEBUG LOG
-  LOG(GNUNET_ERROR_TYPE_DEBUG,
-      "Trying to collect `%s' in CREDENTIAL\n",
-      issuer_attribute);
-  nlen = strlen(issuer_attribute) + 1;
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+
+  // DEBUG LOG
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Trying to collect `%s' in CREDENTIAL\n",
+       issuer_attribute);
+  nlen = strlen (issuer_attribute) + 1;
   if (nlen >= GNUNET_MAX_MESSAGE_SIZE - sizeof(*vr))
-    {
-      GNUNET_break(0);
-      return NULL;
-    }
-  vr = GNUNET_new(struct GNUNET_CREDENTIAL_Request);
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+  vr = GNUNET_new (struct GNUNET_CREDENTIAL_Request);
   vr->credential_handle = handle;
   vr->verify_proc = proc;
   vr->proc_cls = proc_cls;
   vr->r_id = handle->r_id_gen++;
-  vr->env = GNUNET_MQ_msg_extra(c_msg,
-                                nlen,
-                                GNUNET_MESSAGE_TYPE_CREDENTIAL_COLLECT);
-  c_msg->id = htonl(vr->r_id);
+  vr->env = GNUNET_MQ_msg_extra (c_msg,
+                                 nlen,
+                                 GNUNET_MESSAGE_TYPE_CREDENTIAL_COLLECT);
+  c_msg->id = htonl (vr->r_id);
   c_msg->subject_key = *subject_key;
   c_msg->issuer_key = *issuer_key;
-  c_msg->issuer_attribute_len = htons(strlen(issuer_attribute));
-  GNUNET_memcpy(&c_msg[1],
-                issuer_attribute,
-                strlen(issuer_attribute));
-  GNUNET_CONTAINER_DLL_insert(handle->request_head,
-                              handle->request_tail,
-                              vr);
+  c_msg->issuer_attribute_len = htons (strlen (issuer_attribute));
+  GNUNET_memcpy (&c_msg[1],
+                 issuer_attribute,
+                 strlen (issuer_attribute));
+  GNUNET_CONTAINER_DLL_insert (handle->request_head,
+                               handle->request_tail,
+                               vr);
   if (NULL != handle->mq)
-    GNUNET_MQ_send_copy(handle->mq,
-                        vr->env);
+    GNUNET_MQ_send_copy (handle->mq,
+                         vr->env);
   return vr;
 }
 /**
@@ -440,14 +446,16 @@ GNUNET_CREDENTIAL_collect(struct GNUNET_CREDENTIAL_Handle *handle,
  * @return handle to the queued request
  */
 struct GNUNET_CREDENTIAL_Request*
-GNUNET_CREDENTIAL_verify(struct GNUNET_CREDENTIAL_Handle *handle,
-                         const struct GNUNET_CRYPTO_EcdsaPublicKey *issuer_key,
-                         const char *issuer_attribute,
-                         const struct GNUNET_CRYPTO_EcdsaPublicKey *subject_key,
-                         uint32_t credential_count,
-                         const struct GNUNET_CREDENTIAL_Credential *credentials,
-                         GNUNET_CREDENTIAL_CredentialResultProcessor proc,
-                         void *proc_cls)
+GNUNET_CREDENTIAL_verify (struct GNUNET_CREDENTIAL_Handle *handle,
+                          const struct GNUNET_CRYPTO_EcdsaPublicKey *issuer_key,
+                          const char *issuer_attribute,
+                          const struct
+                          GNUNET_CRYPTO_EcdsaPublicKey *subject_key,
+                          uint32_t credential_count,
+                          const struct
+                          GNUNET_CREDENTIAL_Credential *credentials,
+                          GNUNET_CREDENTIAL_CredentialResultProcessor proc,
+                          void *proc_cls)
 {
   /* IPC to shorten credential names, return shorten_handle */
   struct VerifyMessage *v_msg;
@@ -455,52 +463,52 @@ GNUNET_CREDENTIAL_verify(struct GNUNET_CREDENTIAL_Handle *handle,
   size_t nlen;
   size_t clen;
 
-  if (NULL == issuer_attribute || NULL == credentials)
-    {
-      GNUNET_break(0);
-      return NULL;
-    }
+  if ((NULL == issuer_attribute)||(NULL == credentials))
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
 
-  clen = GNUNET_CREDENTIAL_credentials_get_size(credential_count,
-                                                credentials);
+  clen = GNUNET_CREDENTIAL_credentials_get_size (credential_count,
+                                                 credentials);
 
-  //DEBUG LOG
-  LOG(GNUNET_ERROR_TYPE_DEBUG,
-      "Trying to verify `%s' in CREDENTIAL\n",
-      issuer_attribute);
-  nlen = strlen(issuer_attribute) + 1 + clen;
+  // DEBUG LOG
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Trying to verify `%s' in CREDENTIAL\n",
+       issuer_attribute);
+  nlen = strlen (issuer_attribute) + 1 + clen;
   if (nlen >= GNUNET_MAX_MESSAGE_SIZE - sizeof(*vr))
-    {
-      GNUNET_break(0);
-      return NULL;
-    }
-  vr = GNUNET_new(struct GNUNET_CREDENTIAL_Request);
+  {
+    GNUNET_break (0);
+    return NULL;
+  }
+  vr = GNUNET_new (struct GNUNET_CREDENTIAL_Request);
   vr->credential_handle = handle;
   vr->verify_proc = proc;
   vr->proc_cls = proc_cls;
   vr->r_id = handle->r_id_gen++;
-  vr->env = GNUNET_MQ_msg_extra(v_msg,
-                                nlen,
-                                GNUNET_MESSAGE_TYPE_CREDENTIAL_VERIFY);
-  v_msg->id = htonl(vr->r_id);
+  vr->env = GNUNET_MQ_msg_extra (v_msg,
+                                 nlen,
+                                 GNUNET_MESSAGE_TYPE_CREDENTIAL_VERIFY);
+  v_msg->id = htonl (vr->r_id);
   v_msg->subject_key = *subject_key;
-  v_msg->c_count = htonl(credential_count);
+  v_msg->c_count = htonl (credential_count);
   v_msg->issuer_key = *issuer_key;
-  v_msg->issuer_attribute_len = htons(strlen(issuer_attribute));
-  GNUNET_memcpy(&v_msg[1],
-                issuer_attribute,
-                strlen(issuer_attribute));
-  GNUNET_CREDENTIAL_credentials_serialize(credential_count,
-                                          credentials,
-                                          clen,
-                                          ((char*)&v_msg[1])
-                                          + strlen(issuer_attribute) + 1);
-  GNUNET_CONTAINER_DLL_insert(handle->request_head,
-                              handle->request_tail,
-                              vr);
+  v_msg->issuer_attribute_len = htons (strlen (issuer_attribute));
+  GNUNET_memcpy (&v_msg[1],
+                 issuer_attribute,
+                 strlen (issuer_attribute));
+  GNUNET_CREDENTIAL_credentials_serialize (credential_count,
+                                           credentials,
+                                           clen,
+                                           ((char*) &v_msg[1])
+                                           + strlen (issuer_attribute) + 1);
+  GNUNET_CONTAINER_DLL_insert (handle->request_head,
+                               handle->request_tail,
+                               vr);
   if (NULL != handle->mq)
-    GNUNET_MQ_send_copy(handle->mq,
-                        vr->env);
+    GNUNET_MQ_send_copy (handle->mq,
+                         vr->env);
   return vr;
 }