From 2da76c5db47aeabb91669d6ca9c4da92911fbec9 Mon Sep 17 00:00:00 2001
From: dimitri staessens <dimitri.staessens@intec.ugent.be>
Date: Fri, 10 Feb 2017 23:56:10 +0100
Subject: cdap: Take void * for send operations

This facilitates sending arbitrary variables over CDAP.
---
 include/ouroboros/cdap.h |  6 +++---
 src/lib/cdap.c           | 26 +++++++++++++++-----------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/include/ouroboros/cdap.h b/include/ouroboros/cdap.h
index 23a8a3d6..9f6e2654 100644
--- a/include/ouroboros/cdap.h
+++ b/include/ouroboros/cdap.h
@@ -52,8 +52,8 @@ int           cdap_destroy(struct cdap * instance);
 
 cdap_key_t    cdap_request_send(struct cdap *    instance,
                                 enum cdap_opcode code,
-                                char *           name,
-                                uint8_t *        data,
+                                const char *     name,
+                                const void *     data,
                                 size_t           len,
                                 uint32_t         flags);
 
@@ -72,7 +72,7 @@ cdap_key_t    cdap_request_wait(struct cdap *      instance,
 int           cdap_reply_send(struct cdap * instance,
                               cdap_key_t    key,
                               int           result,
-                              uint8_t *     data,
+                              const void *  data,
                               size_t        len);
 
 #endif /* OUROBOROS_CDAP_H */
diff --git a/src/lib/cdap.c b/src/lib/cdap.c
index 956486d1..6c46775c 100644
--- a/src/lib/cdap.c
+++ b/src/lib/cdap.c
@@ -67,7 +67,7 @@ struct cdap_rcvd {
 
         enum cdap_opcode opcode;
         char *           name;
-        uint8_t *        data;
+        void *           data;
         size_t           len;
         uint32_t         flags;
 };
@@ -89,7 +89,8 @@ static int next_invoke_id(struct cdap * instance)
         return ret;
 }
 
-static int release_invoke_id(struct cdap * instance, int id)
+static int release_invoke_id(struct cdap * instance,
+                             int           id)
 {
         int ret;
 
@@ -130,7 +131,8 @@ static struct cdap_req * cdap_sent_get_by_key(struct cdap * instance,
         return NULL;
 }
 
-static struct cdap_req * cdap_sent_add(struct cdap * instance, cdap_key_t key)
+static struct cdap_req * cdap_sent_add(struct cdap * instance,
+                                       cdap_key_t    key)
 {
         struct cdap_req * req;
 
@@ -151,7 +153,8 @@ static struct cdap_req * cdap_sent_add(struct cdap * instance, cdap_key_t key)
         return req;
 }
 
-static void cdap_sent_del(struct cdap * instance, struct cdap_req * req)
+static void cdap_sent_del(struct cdap *     instance,
+                          struct cdap_req * req)
 {
         assert(instance);
         assert(req);
@@ -405,7 +408,8 @@ int cdap_destroy(struct cdap * instance)
         return 0;
 }
 
-static int write_msg(struct cdap * instance, cdap_t * msg)
+static int write_msg(struct cdap * instance,
+                     cdap_t *      msg)
 {
         int ret;
         uint8_t * data;
@@ -449,8 +453,8 @@ static invoke_id_t key_to_invoke_id(cdap_key_t key)
 
 cdap_key_t cdap_request_send(struct cdap *    instance,
                              enum cdap_opcode code,
-                             char *           name,
-                             uint8_t *        data,
+                             const char *     name,
+                             const void *     data,
                              size_t           len,
                              uint32_t         flags)
 {
@@ -491,13 +495,13 @@ cdap_key_t cdap_request_send(struct cdap *    instance,
                 return -EINVAL;
         }
 
-        msg.name = name;
+        msg.name = (char *) name;
         msg.has_flags = true;
         msg.flags = flags;
         msg.invoke_id = iid;
         if (data != NULL) {
                 msg.has_value = true;
-                msg.value.data = data;
+                msg.value.data = (uint8_t *) data;
                 msg.value.len = len;
         }
 
@@ -599,7 +603,7 @@ cdap_key_t cdap_request_wait(struct cdap *      instance,
 int cdap_reply_send(struct cdap * instance,
                     cdap_key_t    key,
                     int           result,
-                    uint8_t *     data,
+                    const void *  data,
                     size_t        len)
 {
         cdap_t msg = CDAP__INIT;
@@ -615,7 +619,7 @@ int cdap_reply_send(struct cdap * instance,
 
         if (data != NULL) {
                 msg.has_value = true;
-                msg.value.data = data;
+                msg.value.data = (uint8_t *) data;
                 msg.value.len = len;
         }
 
-- 
cgit v1.2.3