#define SRB1 1
#define SRB2 2
#define DRB1 1
-#define DRB2 6 //Pls Ignore this; to avoid the collision with DRBID=2 in UE COntext setup
+#define DRB2 2
+#define DRB3 3
#define QCI 9
-#define MAX_DRB_SET 2
+#define MAX_DRB_SET_UE_CONTEXT_SETUP_REQ 2 /*Number of DRBs to be added using UE CONTEXT SETUP procedure*/
+#define MAX_DRB_SET_UE_CONTEXT_MOD_REQ 1 /*Number of DRBs to be added/setup via UE CONTEXT MODIFICATION procedure*/
+#define MAX_DRB_MODIFIED_UE_MOD_REQ 1 /*Currently CU trigger Modification of 2DRBs*/
+#define DRB_ID_TO_ADD_MOD MAX_DRB_SET_UE_CONTEXT_SETUP_REQ+1 /*The DRB ID: which will be added using Modification Procedure*/
+
+/*Total num of DRBs added using UE COntext Setup and Modification procedures*/
+#define MAX_NUM_DRB_ADDED_PER_UE (MAX_DRB_SET_UE_CONTEXT_SETUP_REQ + MAX_DRB_SET_UE_CONTEXT_MOD_REQ)
#define CU_UE_F1AP_ID 0
#define DU_UE_F1AP_ID 1
#define SECURITY_MODE_COMPLETE 5
#define RRC_RECONFIG 6
#define UE_CONTEXT_MOD_REQ 7
+#define NUM_QOS_EXT 1
typedef struct f1apDb