include: modified structures

merged the data structure for the irm.

1 files changed, 14 insertions, 7 deletions

diff --git a/include/ouroboros/common.h b/include/ouroboros/common.h
index 36f6171c..a6efaafa 100644
--- a/include/ouroboros/common.h
+++ b/include/ouroboros/common.h
@@ -32,7 +32,7 @@ typedef uint32_t port_id_t;
 
 typedef struct {
         uint8_t * data;
-        size_t size;
+        size_t    size;
 } buffer_t;
 
 typedef struct {
@@ -44,31 +44,38 @@ typedef struct {
 
 /* FIXME: To be extended to have all QoS params */
 struct qos_spec {
+        char * qos_name;
+
         uint32_t delay;
         uint32_t jitter;
 };
 
-struct dt_const {
+/* FIXME: What should be configurable in the DIF? */
+struct dif_config {
+        /* general data */
+        char * dif_name;
+
+        qos_spec * qosspecs;
+
+        /* FIXME: this might not be the way to go */
+        char ** policies;
+        /* char * policy_set? */
+
         /* dt field sizes in octets */
         uint8_t addr_size;
         uint8_t cep_id_size;
         uint8_t pdu_length_size;
         uint8_t qos_id_size;
         uint8_t seqno_size;
-        /* uint8_t ctrl_sqnum_sz;  is this in the spec?? */
 
         /* constants for dup */
         uint8_t ttl_size;
         uint8_t chk_size;
-};
 
-/* FIXME: What should be configurable in the DIF? */
-struct dif_info {
         /* values, octets */
         uint32_t min_pdu_size;
         uint32_t max_pdu_size;
 
-        struct dt_const dtc;
 };
 
 #endif /* OUROBOROS_COMMON_H */