From 806629e64e8231d0c57a80d3b6584094cd6c89bd Mon Sep 17 00:00:00 2001
From: Sander Vrijders <sander.vrijders@ugent.be>
Date: Wed, 21 Jun 2017 11:50:19 +0200
Subject: lib, ipcpd, irmd: Add full-fledged QoS

This adds more Quality of Service support to Ouroboros. One part is
the network specific characteristics such as bandwidth, delay, ...
The other part is end-to-end QoS like reliability, window based flow
control, ...
---
 src/ipcpd/normal/dt_pci.h       | 2 +-
 src/ipcpd/normal/fa.h           | 2 +-
 src/ipcpd/normal/neighbors.c    | 2 +-
 src/ipcpd/normal/pol/complete.c | 8 ++------
 4 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/ipcpd/normal')

diff --git a/src/ipcpd/normal/dt_pci.h b/src/ipcpd/normal/dt_pci.h
index ddcf9066..2291329a 100644
--- a/src/ipcpd/normal/dt_pci.h
+++ b/src/ipcpd/normal/dt_pci.h
@@ -25,7 +25,7 @@
 
 #include <ouroboros/shm_du_buff.h>
 #include <ouroboros/proto.h>
-#include <ouroboros/shared.h>
+#include <ouroboros/qoscube.h>
 
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/src/ipcpd/normal/fa.h b/src/ipcpd/normal/fa.h
index a77dc723..929c0623 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/shared.h>
+#include <ouroboros/qoscube.h>
 #include <ouroboros/utils.h>
 
 int  fa_init(void);
diff --git a/src/ipcpd/normal/neighbors.c b/src/ipcpd/normal/neighbors.c
index 0dbc22f2..0fb721c2 100644
--- a/src/ipcpd/normal/neighbors.c
+++ b/src/ipcpd/normal/neighbors.c
@@ -23,7 +23,7 @@
 #define OUROBOROS_PREFIX "neighbors"
 
 #include <ouroboros/config.h>
-#include <ouroboros/shared.h>
+#include <ouroboros/qoscube.h>
 #include <ouroboros/ipcp-dev.h>
 #include <ouroboros/errno.h>
 #include <ouroboros/logs.h>
diff --git a/src/ipcpd/normal/pol/complete.c b/src/ipcpd/normal/pol/complete.c
index 732556c6..74848a1f 100644
--- a/src/ipcpd/normal/pol/complete.c
+++ b/src/ipcpd/normal/pol/complete.c
@@ -23,7 +23,7 @@
 #define OUROBOROS_PREFIX "complete"
 
 #include <ouroboros/config.h>
-#include <ouroboros/shared.h>
+#include <ouroboros/qoscube.h>
 #include <ouroboros/rib.h>
 #include <ouroboros/dev.h>
 #include <ouroboros/logs.h>
@@ -92,11 +92,7 @@ static void * allocator(void * o)
 
         complete = (struct complete *) o;
 
-        qs.delay = 0;
-        qs.jitter = 0;
-
-        /* FIXME: implement QoS specs */
-        qs.cube = QOS_CUBE_BE;
+        qosspec_init(&qs);
 
         while (true) {
                 len = rib_children(MEMBERS_PATH, &children);
-- 
cgit v1.2.3