From af1dff6fc06f55d6565589282ac4ebacc53b4d29 Mon Sep 17 00:00:00 2001
From: Sander Vrijders <sander.vrijders@intec.ugent.be>
Date: Sat, 14 May 2016 18:32:49 +0200
Subject: lib, ipcpd, irmd: Add QoS cube definition

This adds the QoS cube definition, which is an enum to select which
QoS is needed in the IPCP. An application has to use the qos_spec in
qos.h to define what it needs. The IRMd will map this unto a qos cube
definition.

Some headers are now also no longer installed on the system, since
they are only to be used within the irmd and ipcps.
---
 src/irmd/main.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/irmd')

diff --git a/src/irmd/main.c b/src/irmd/main.c
index d266273d..65c173de 100644
--- a/src/irmd/main.c
+++ b/src/irmd/main.c
@@ -24,7 +24,6 @@
 
 #include <ouroboros/config.h>
 #include <ouroboros/logs.h>
-#include <ouroboros/common.h>
 #include <ouroboros/sockets.h>
 #include <ouroboros/irm.h>
 #include <ouroboros/ipcp.h>
@@ -35,6 +34,8 @@
 #include <ouroboros/dif_config.h>
 #include <ouroboros/shm_du_map.h>
 #include <ouroboros/bitmap.h>
+#include <ouroboros/flow.h>
+#include <ouroboros/qos.h>
 
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -56,12 +57,6 @@
   #define IRMD_THREADPOOL_SIZE 3
 #endif
 
-enum flow_state {
-        FLOW_NULL = 0,
-        FLOW_PENDING,
-        FLOW_ALLOCATED
-};
-
 struct ipcp_entry {
         struct list_head  next;
         instance_name_t * api;
@@ -927,6 +922,8 @@ static struct port_map_entry * flow_alloc(pid_t  pid,
         struct port_map_entry * pme;
         instance_name_t * ipcp;
 
+        /* FIXME: Map qos_spec to qos_cube */
+
         pthread_mutex_lock(&instance->s_lock);
         if (instance->shutdown) {
                 pthread_mutex_unlock(&instance->s_lock);
@@ -965,7 +962,7 @@ static struct port_map_entry * flow_alloc(pid_t  pid,
                             dst_name,
                             src_ap_name,
                             src_ae_name,
-                            qos) < 0) {
+                            QOS_CUBE_BE) < 0) {
                 pthread_mutex_lock(&instance->r_lock);
 
                 list_del(&pme->next);
-- 
cgit v1.2.3