Merge branch 'testing' into be

1 files changed, 6 insertions, 24 deletions

diff --git a/src/lib/qoscube.c b/src/lib/qoscube.c
index 5dfa35ad..efca0e42 100644
--- a/src/lib/qoscube.c
+++ b/src/lib/qoscube.c
@@ -25,38 +25,20 @@
 
 #include <string.h>
 
+
+
 qoscube_t qos_spec_to_cube(qosspec_t qs)
 {
-        if (qs.loss == 0)
-                return QOS_CUBE_DATA;
-        else if (qs.delay <= qos_voice.delay &&
+        if (qs.delay <= qos_voice.delay &&
             qs.bandwidth <= qos_voice.bandwidth &&
             qs.availability >= qos_voice.availability &&
-            qs.maximum_interruption <= qos_voice.maximum_interruption)
+            qs.max_gap <= qos_voice.max_gap)
                 return QOS_CUBE_VOICE;
         else if (qs.delay <= qos_video.delay &&
                  qs.bandwidth <= qos_video.bandwidth &&
                  qs.availability >= qos_video.availability &&
-                 qs.maximum_interruption <= qos_video.maximum_interruption)
+                 qs.max_gap <= qos_video.max_gap)
                 return QOS_CUBE_VIDEO;
-        else if (qs.in_order == 1)
-                return QOS_CUBE_BE;
         else
-                return QOS_CUBE_RAW;
-}
-
-qosspec_t qos_cube_to_spec(qoscube_t qc)
-{
-        switch (qc) {
-        case QOS_CUBE_VOICE:
-                return qos_voice;
-        case QOS_CUBE_VIDEO:
-                return qos_video;
-        case QOS_CUBE_BE:
-                return qos_best_effort;
-        case QOS_CUBE_DATA:
-                return qos_data;
-        default:
-                return qos_raw;
-        }
+                return QOS_CUBE_BE;
 }