diff options
author | dimitri staessens <[email protected]> | 2016-08-08 14:34:12 +0200 |
---|---|---|
committer | dimitri staessens <[email protected]> | 2016-08-08 14:34:12 +0200 |
commit | 3220cd99c42f08bbd959cf73b9fc7b3ca8375676 (patch) | |
tree | ae9898536ee5767080b39e82806804fbf9911605 /include | |
parent | 3c80fae407f451691a4a4178617986e32d0c8162 (diff) | |
parent | d13a6dfd0f7a8ebc98cdb59cf0a04a282fa1593d (diff) | |
download | ouroboros-3220cd99c42f08bbd959cf73b9fc7b3ca8375676.tar.gz ouroboros-3220cd99c42f08bbd959cf73b9fc7b3ca8375676.zip |
Merged in sandervrijders/ouroboros/be-enroll (pull request #189)
ipcpd: normal: Allow exchange of static DIF information
Diffstat (limited to 'include')
-rw-r--r-- | include/ouroboros/CMakeLists.txt | 1 | ||||
-rw-r--r-- | include/ouroboros/cdap.h | 28 |
2 files changed, 18 insertions, 11 deletions
diff --git a/include/ouroboros/CMakeLists.txt b/include/ouroboros/CMakeLists.txt index ee339294..eb5297d2 100644 --- a/include/ouroboros/CMakeLists.txt +++ b/include/ouroboros/CMakeLists.txt @@ -4,7 +4,6 @@ configure_file( set(HEADER_FILES cdap.h - common.h dev.h errno.h flow.h diff --git a/include/ouroboros/cdap.h b/include/ouroboros/cdap.h index e26f192b..bd8aa551 100644 --- a/include/ouroboros/cdap.h +++ b/include/ouroboros/cdap.h @@ -24,8 +24,6 @@ #ifndef OUROBOROS_CDAP_H #define OUROBOROS_CDAP_H -#include <ouroboros/common.h> - #include <stdbool.h> #include <stdint.h> #include <unistd.h> @@ -39,27 +37,35 @@ struct cdap_ops { int (* cdap_reply)(struct cdap * instance, int invoke_id, int result, - buffer_t * val, + uint8_t * data, size_t len); int (* cdap_read)(struct cdap * instance, + int invoke_id, char * name); int (* cdap_write)(struct cdap * instance, + int invoke_id, char * name, - buffer_t * val, + uint8_t * data, size_t len, uint32_t flags); int (* cdap_create)(struct cdap * instance, + int invoke_id, char * name, - buffer_t val); + uint8_t * data, + size_t len); int (* cdap_delete)(struct cdap * instance, + int invoke_id, char * name, - buffer_t val); + uint8_t * data, + size_t len); int (* cdap_start)(struct cdap * instance, + int invoke_id, char * name); int (* cdap_stop)(struct cdap * instance, + int invoke_id, char * name); }; @@ -73,16 +79,18 @@ int cdap_send_read(struct cdap * instance, char * name); int cdap_send_write(struct cdap * instance, char * name, - buffer_t * val, + uint8_t * data, size_t len, uint32_t flags); int cdap_send_create(struct cdap * instance, char * name, - buffer_t val); + uint8_t * data, + size_t len); int cdap_send_delete(struct cdap * instance, char * name, - buffer_t val); + uint8_t * data, + size_t len); int cdap_send_start(struct cdap * instance, char * name); @@ -93,6 +101,6 @@ int cdap_send_stop(struct cdap * instance, int cdap_send_reply(struct cdap * instance, int invoke_id, int result, - buffer_t * val, + uint8_t * data, size_t len); #endif |