lib, irmd, irm: Add dif_config

This adds dif_config to the prototype, in which one is able to specify
the parameters a DIF should have. The bootstrap operation of an IPCP
takes this as parameter and is oblivious to whether it is a shim or a
normal IPCP. The dif_config struct is also correctly serialized and
deserialized and passed opaquely to the correct IPCP. This IPCP is in
charge of deserializing it correctly.

1 files changed, 11 insertions, 10 deletions

diff --git a/src/lib/irmd_messages.proto b/src/lib/irmd_messages.proto
index 44070755..3a2432f3 100644
--- a/src/lib/irmd_messages.proto
+++ b/src/lib/irmd_messages.proto
@@ -1,3 +1,5 @@
+import "dif_config.proto";
+
 enum irm_msg_code {
         IRM_CREATE_IPCP = 1;
         IRM_DESTROY_IPCP = 2;
@@ -26,14 +28,13 @@ message irm_msg {
         optional string ap_name = 2;
         optional uint32 api_id = 3;
         optional string ae_name = 4;
-        optional string ipcp_type = 5;
-        // Missing dif_config field here
-        repeated string dif_name = 7;
-        optional int32 fd = 8;
-        optional int32 result = 9;
-        // Missing qos_spec here
-        optional int32 oflags = 10;
-        optional string dst_ap_name = 11;
-        optional uint32 port_id = 12;
-        optional int32 pid = 13;
+        optional uint32 ipcp_type = 5;
+        repeated string dif_name = 6;
+        optional int32 fd = 7;
+        optional int32 result = 8;
+        optional int32 oflags = 9;
+        optional string dst_ap_name = 10;
+        optional uint32 port_id = 11;
+        optional int32 pid = 12;
+        optional dif_config_msg conf = 13;
 };