4 files changed, 15 insertions, 11 deletions
diff --git a/include/ouroboros/common.h b/include/ouroboros/common.h
index 36f6171c..00d1f482 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 {
@@ -42,33 +42,37 @@ typedef struct {
         int    aei_id;
 } rina_name_t;
 
-/* FIXME: To be extended to have all QoS params */
+/* FIXME: may need revision */
 struct qos_spec {
+        char * qos_name;
+        char * dif_name;
+
         uint32_t delay;
         uint32_t jitter;
 };
 
-struct dt_const {
+/* FIXME: What should be configurable in the DIF? */
+struct dif_config {
+        /* general data */
+        struct qos_spec * qosspecs;
+
+        /* TODO: efficient policies */
+
         /* 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 */
diff --git a/include/ouroboros/ipcp.h b/include/ouroboros/ipcp.h
index 91223bec..7b53d827 100644
--- a/include/ouroboros/ipcp.h
+++ b/include/ouroboros/ipcp.h
@@ -35,7 +35,7 @@ int ipcp_unreg(int instance,
                char ** difs);
 
 int ipcp_bootstrap(int instance,
-                   struct dif_info info);
+                   struct dif_conf conf);
 int ipcp_enroll(int instance,
                 char * dif_name,
                 rina_name_t member);
diff --git a/include/ouroboros/irm.h b/include/ouroboros/irm.h
index 819675d1..459b0e9f 100644
--- a/include/ouroboros/irm.h
+++ b/include/ouroboros/irm.h
@@ -30,7 +30,7 @@ int     irm_create_ipcp(rina_name_t name,
 int     irm_destroy_ipcp(rina_name_t name);
 
 int     irm_bootstrap_ipcp(rina_name_t name,
-                           struct dif_info info);
+                           struct dif_config conf);
 int     irm_enroll_ipcp(rina_name_t name,
                         char * dif_name);
 
diff --git a/include/ouroboros/sockets.h b/include/ouroboros/sockets.h
index 88e9564b..e2409c2b 100644
--- a/include/ouroboros/sockets.h
+++ b/include/ouroboros/sockets.h
@@ -39,7 +39,7 @@ struct irm_msg {
         enum irm_msg_code code;
         rina_name_t * name;
         char * ipcp_type;
-        struct dif_info * info;
+        struct dif_config * conf;
         char * dif_name;
         char ** difs;
         size_t difs_size;