Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split

Tested with one UE Possibly broken FLEXRAN (different methods for configuring the link manager)
2018-04-05 13:22:12 +03:00
parent 73691de7f6 1272cabb35
commit 4195681fc9
246 changed files with 30644 additions and 19464 deletions
@@ -1,28 +0,0 @@
-package protocol;
-
-message fsp_ctxt {
-	optional uint32 fsp_mod_id = 1;
-	optional bool fsp_enb_flag = 2;
-	optional uint32 fsp_instance = 3;
-	optional uint32 fsp_rnti = 4;
-	optional uint32 fsp_frame = 5;
-	optional uint32 fsp_subframe = 6;
-	optional uint32 fsp_eNB_index = 7;
-
-}
-
-message fspRlcPdu {
-	optional bytes fsp_pdu_data = 1; // Maximum PDU to be transfered
-}
-
-message fspRlcData {
-	optional fsp_ctxt fsp_ctxt = 1;
-	optional bool fsp_srb_flag = 2;
-	optional bool fsp_mbms_flag = 3;
-	optional uint32 fsp_rb_id = 4;
-	optional uint32 fsp_muip = 5;
-	optional uint32 fsp_confirm = 6;
-	optional int32 fsp_sdu_buffer_size = 7;
-	optional fspRlcPdu fsp_pdu = 8;
-}
-
@@ -1,7 +1,28 @@
 package protocol;

-import "header.proto";
-import "flexsplit-messages.proto";
+
+message fsp_header {
+        optional uint32 version = 1;
+        optional uint32 type = 2;
+        optional uint32 xid = 4;
+}
+
+enum fsp_type {
+     // Discovery and maintenance messages
+     FSPT_HELLO = 0;
+     FSPT_ECHO_REQUEST = 1;
+     FSPT_ECHO_REPLY = 2;
+     FSPT_RLC_DATA_REQ = 3;
+     FSPT_RLC_DATA_REQ_ACK = 4;
+     FSPT_PDCP_DATA_IND = 5;
+     FSPT_PDCP_DATA_IND_ACK = 6;
+}
+
+enum f1u_type {
+     // Discovery and maintenance messages
+     F1U_DL_DATA = 0;
+     F1U_DL_STATUS = 1;
+}


 message f1u_message{
@@ -52,6 +73,32 @@ enum flexsplit_err {
 	UNEXPECTED = -100;	
 }

+message fsp_ctxt {
+        optional uint32 fsp_mod_id = 1;
+        optional bool fsp_enb_flag = 2;
+        optional uint32 fsp_instance = 3;
+        optional uint32 fsp_rnti = 4;
+        optional uint32 fsp_frame = 5;
+        optional uint32 fsp_subframe = 6;
+        optional uint32 fsp_eNB_index = 7;
+
+}
+
+message fspRlcPdu {
+        optional bytes fsp_pdu_data = 1; // Maximum PDU to be transfered
+}
+
+message fspRlcData {
+        optional fsp_ctxt fsp_ctxt = 1;
+        optional bool fsp_srb_flag = 2;
+        optional bool fsp_mbms_flag = 3;
+        optional uint32 fsp_rb_id = 4;
+        optional uint32 fsp_muip = 5;
+        optional uint32 fsp_confirm = 6;
+        optional int32 fsp_sdu_buffer_size = 7;
+        optional fspRlcPdu fsp_pdu = 8;
+}
+
 //
 // Maintenance and discovery messages
 //
@@ -1,25 +0,0 @@
-package protocol;
-
-message fsp_header {
-	optional uint32 version = 1;
-	optional uint32 type = 2;
-	optional uint32 xid = 4;
-}
-
-enum fsp_type {
-     // Discovery and maintenance messages
-     FSPT_HELLO = 0;
-     FSPT_ECHO_REQUEST = 1;
-     FSPT_ECHO_REPLY = 2;
-     FSPT_RLC_DATA_REQ = 3;
-     FSPT_RLC_DATA_REQ_ACK = 4;
-     FSPT_PDCP_DATA_IND = 5;
-     FSPT_PDCP_DATA_IND_ACK = 6;
-}
-
-enum f1u_type {
-     // Discovery and maintenance messages
-     F1U_DL_DATA = 0;
-     F1U_DL_STATUS = 1;
-}
-
@@ -11,7 +11,6 @@
 #        define NUMBER_OF_RU_MAX 32
 #        define NUMBER_OF_UE_MAX 20
 #        define NUMBER_OF_CONNECTED_eNB_MAX 3
-
 #        if defined(STANDALONE) && STANDALONE==1
 #                undef  NUMBER_OF_eNB_MAX
 #                undef  NUMBER_OF_UE_MAX