From b802b25ddfe6f1b6ecabe3ba70e3dac2e99e7a50 Mon Sep 17 00:00:00 2001
From: Dimitri Staessens <dimitri.staessens@ugent.be>
Date: Thu, 4 Oct 2018 18:06:32 +0200
Subject: lib: Pass qosspec at flow allocation

The flow allocator now passes the full qos specification to the
endpoint, instead of just a cube. This is a more flexible
architecture, as it makes QoS cubes internal to the layers.

Adds endianness transforms for the flow allocator protocol in the
normal IPCP.

Signed-off-by: Dimitri Staessens <dimitri.staessens@ugent.be>
Signed-off-by: Sander Vrijders <sander.vrijders@ugent.be>
---
 src/ipcpd/normal/fa.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ipcpd/normal/fa.h')

diff --git a/src/ipcpd/normal/fa.h b/src/ipcpd/normal/fa.h
index 87819d6f..a98d834a 100644
--- a/src/ipcpd/normal/fa.h
+++ b/src/ipcpd/normal/fa.h
@@ -36,7 +36,7 @@ void fa_stop(void);
 
 int  fa_alloc(int             fd,
               const uint8_t * dst,
-              qoscube_t       qos);
+              qosspec_t       qs);
 
 int  fa_alloc_resp(int fd,
                    int response);
-- 
cgit v1.2.3


From 10c0c07265d91dbbadb53b77aa5be8a27b7b3cd0 Mon Sep 17 00:00:00 2001
From: Dimitri Staessens <dimitri.staessens@ugent.be>
Date: Fri, 5 Oct 2018 21:07:26 +0200
Subject: include: Fix QoS include files

A lot of files were unnecessarily including qoscube.h.

Signed-off-by: Dimitri Staessens <dimitri.staessens@ugent.be>
Signed-off-by: Sander Vrijders <sander.vrijders@ugent.be>
---
 include/ouroboros/ipcp-dev.h    | 1 +
 include/ouroboros/np1_flow.h    | 2 +-
 include/ouroboros/shm_rdrbuff.h | 1 -
 src/ipcpd/ipcp.h                | 1 -
 src/ipcpd/normal/dt.h           | 1 +
 src/ipcpd/normal/fa.h           | 2 +-
 src/ipcpd/shim-data.h           | 1 -
 src/irmd/ipcp.h                 | 1 -
 src/irmd/irm_flow.h             | 2 +-
 src/irmd/registry.h             | 1 -
 10 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/ipcpd/normal/fa.h')

diff --git a/include/ouroboros/ipcp-dev.h b/include/ouroboros/ipcp-dev.h
index a0ed026c..4f8b5da8 100644
--- a/include/ouroboros/ipcp-dev.h
+++ b/include/ouroboros/ipcp-dev.h
@@ -21,6 +21,7 @@
  */
 
 #include <ouroboros/shm_rdrbuff.h>
+#include <ouroboros/qoscube.h>
 
 #ifndef OUROBOROS_IPCP_DEV_H
 #define OUROBOROS_IPCP_DEV_H
diff --git a/include/ouroboros/np1_flow.h b/include/ouroboros/np1_flow.h
index 3a2bbd12..3f80161a 100644
--- a/include/ouroboros/np1_flow.h
+++ b/include/ouroboros/np1_flow.h
@@ -23,7 +23,7 @@
 #ifndef OUROBOROS_NP1_FLOW_H
 #define OUROBOROS_NP1_FLOW_H
 
-#include <ouroboros/qoscube.h>
+#include <ouroboros/qos.h>
 
 #include <unistd.h>
 
diff --git a/include/ouroboros/shm_rdrbuff.h b/include/ouroboros/shm_rdrbuff.h
index 277609c5..49551497 100644
--- a/include/ouroboros/shm_rdrbuff.h
+++ b/include/ouroboros/shm_rdrbuff.h
@@ -24,7 +24,6 @@
 #define OUROBOROS_SHM_RDRBUFF_H
 
 #include <ouroboros/shm_du_buff.h>
-#include <ouroboros/qoscube.h>
 #include <ouroboros/time_utils.h>
 
 #include <stdint.h>
diff --git a/src/ipcpd/ipcp.h b/src/ipcpd/ipcp.h
index 13751b6d..1d25fb3f 100644
--- a/src/ipcpd/ipcp.h
+++ b/src/ipcpd/ipcp.h
@@ -26,7 +26,6 @@
 #include <ouroboros/hash.h>
 #include <ouroboros/ipcp.h>
 #include <ouroboros/list.h>
-#include <ouroboros/qoscube.h>
 #include <ouroboros/sockets.h>
 #include <ouroboros/tpm.h>
 
diff --git a/src/ipcpd/normal/dt.h b/src/ipcpd/normal/dt.h
index 05b8220c..b74e84b0 100644
--- a/src/ipcpd/normal/dt.h
+++ b/src/ipcpd/normal/dt.h
@@ -24,6 +24,7 @@
 #define OUROBOROS_IPCPD_NORMAL_DT_H
 
 #include <ouroboros/ipcp.h>
+#include <ouroboros/qoscube.h>
 #include <ouroboros/shm_rdrbuff.h>
 
 #define DT_COMP      "Data Transfer"
diff --git a/src/ipcpd/normal/fa.h b/src/ipcpd/normal/fa.h
index a98d834a..6a836e17 100644
--- a/src/ipcpd/normal/fa.h
+++ b/src/ipcpd/normal/fa.h
@@ -23,7 +23,7 @@
 #ifndef OUROBOROS_IPCPD_NORMAL_FA_H
 #define OUROBOROS_IPCPD_NORMAL_FA_H
 
-#include <ouroboros/qoscube.h>
+#include <ouroboros/qos.h>
 #include <ouroboros/utils.h>
 
 int  fa_init(void);
diff --git a/src/ipcpd/shim-data.h b/src/ipcpd/shim-data.h
index 336ffa35..7a8c01c4 100644
--- a/src/ipcpd/shim-data.h
+++ b/src/ipcpd/shim-data.h
@@ -23,7 +23,6 @@
 #ifndef OUROBOROS_IPCPD_IPCP_DATA_H
 #define OUROBOROS_IPCPD_IPCP_DATA_H
 
-#include <ouroboros/qoscube.h>
 #include <ouroboros/list.h>
 
 #include <sys/types.h>
diff --git a/src/irmd/ipcp.h b/src/irmd/ipcp.h
index 5d096788..8d9686c2 100644
--- a/src/irmd/ipcp.h
+++ b/src/irmd/ipcp.h
@@ -22,7 +22,6 @@
 
 #include <ouroboros/ipcp.h>
 #include <ouroboros/sockets.h>
-#include <ouroboros/qoscube.h>
 
 #include <sys/types.h>
 
diff --git a/src/irmd/irm_flow.h b/src/irmd/irm_flow.h
index 1cd2e662..26263107 100644
--- a/src/irmd/irm_flow.h
+++ b/src/irmd/irm_flow.h
@@ -24,8 +24,8 @@
 #define OUROBOROS_IRMD_IRM_FLOW_H
 
 #include <ouroboros/list.h>
+#include <ouroboros/qos.h>
 #include <ouroboros/shm_rbuff.h>
-#include <ouroboros/qoscube.h>
 
 #include <sys/types.h>
 #include <pthread.h>
diff --git a/src/irmd/registry.h b/src/irmd/registry.h
index 62d90c39..c9ea8cce 100644
--- a/src/irmd/registry.h
+++ b/src/irmd/registry.h
@@ -26,7 +26,6 @@
 #include <ouroboros/hash.h>
 #include <ouroboros/ipcp.h>
 #include <ouroboros/list.h>
-#include <ouroboros/qoscube.h>
 
 #include "proc_table.h"
 #include "prog_table.h"
-- 
cgit v1.2.3