Merged in sandervrijders/ouroboros/be (pull request #172)

ipcpd: normal: Establish N-1 management flows

2 files changed, 8 insertions, 7 deletions

diff --git a/include/ouroboros/dev.h b/include/ouroboros/dev.h
index 699973a3..eb779953 100644
--- a/include/ouroboros/dev.h
+++ b/include/ouroboros/dev.h
@@ -35,17 +35,19 @@
 int     ap_init(char * ap_name);
 void    ap_fini(void);
 
-/* Returns file descriptor (> 0) and client AE name */
+/* Returns file descriptor (> 0) and client AE name. */
 int     flow_accept(char ** ae_name);
 int     flow_alloc_resp(int fd, int result);
 
-/* Returns file descriptor */
+/*
+ * Returns file descriptor (> 0).
+ * On returning, qos will contain the actual supplied QoS.
+ */
 int     flow_alloc(char * dst_name,
                    char * src_ae_name,
                    struct qos_spec * qos);
-
-/* If flow is accepted returns a value > 0 */
 int     flow_alloc_res(int fd);
+
 int     flow_dealloc(int fd);
 
 int     flow_cntl(int fd, int cmd, int oflags);
diff --git a/include/ouroboros/qos.h b/include/ouroboros/qos.h
index c87b7c69..8f573b7d 100644
--- a/include/ouroboros/qos.h
+++ b/include/ouroboros/qos.h
@@ -23,11 +23,10 @@
 #ifndef OUROBOROS_QOS_H
 #define OUROBOROS_QOS_H
 
+#include <stdint.h>
+
 /* FIXME: may need revision */
 struct qos_spec {
-        char * qos_name;
-        char * dif_name;
-
         uint32_t delay;
         uint32_t jitter;
 };