FlexRAN: send slice ID to which UE belongs + reformat

- flexran_agent_ue_config_reply() and flexran_agent_ue_state_change() send
  slice_id

openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc.c

@@ -80,6 +80,12 @@ void flexran_agent_ue_state_change(mid_t mod_id, uint32_t rnti, uint8_t state_ch
     int i = find_UE_id(mod_id, rnti);
     config->has_rnti = 1;
     config->rnti = rnti;
+    config->imsi = flexran_get_ue_imsi(mod_id, i);
+    config->has_imsi = 1;
+    config->dl_slice_id = flexran_get_ue_dl_slice_id(mod_id, i);
+    config->has_dl_slice_id = 1;
+    config->ul_slice_id = flexran_get_ue_ul_slice_id(mod_id, i);
+    config->has_ul_slice_id = 1;
     if(flexran_get_time_alignment_timer(mod_id,i) != -1) {
       config->time_alignment_timer = flexran_get_time_alignment_timer(mod_id,i);
       config->has_time_alignment_timer = 1;
@@ -113,25 +119,19 @@ void flexran_agent_ue_state_change(mid_t mod_id, uint32_t rnti, uint8_t state_ch
     config->ue_aggregated_max_bitrate_dl = flexran_get_ue_aggregated_max_bitrate_dl(mod_id,i);
     config->has_ue_aggregated_max_bitrate_dl = 1;
 
-        //TODO: Set the UE capabilities
     Protocol__FlexUeCapabilities *c_capabilities;
     c_capabilities = malloc(sizeof(Protocol__FlexUeCapabilities));
     protocol__flex_ue_capabilities__init(c_capabilities);
-        //TODO: Set half duplex (FDD operation)
-        c_capabilities->has_half_duplex = 0;
-        c_capabilities->half_duplex = 1;//flexran_get_half_duplex(i);
-        //TODO: Set intra-frame hopping flag
-        c_capabilities->has_intra_sf_hopping = 0;
-        c_capabilities->intra_sf_hopping = 1;//flexran_get_intra_sf_hopping(i);
-        //TODO: Set support for type 2 hopping with n_sb > 1
-        c_capabilities->has_type2_sb_1 = 0;
-        c_capabilities->type2_sb_1 = 1;//flexran_get_type2_sb_1(i);
-        //TODO: Set ue category
-        c_capabilities->has_ue_category = 0;
-        c_capabilities->ue_category = 1;//flexran_get_ue_category(i);
-        //TODO: Set UE support for resource allocation type 1
-        c_capabilities->has_res_alloc_type1 = 0;
-        c_capabilities->res_alloc_type1 = 1;//flexran_get_res_alloc_type1(i);
+    c_capabilities->has_half_duplex = 1;
+    c_capabilities->half_duplex = flexran_get_half_duplex(mod_id, i);
+    c_capabilities->has_intra_sf_hopping = 1;
+    c_capabilities->intra_sf_hopping = flexran_get_intra_sf_hopping(mod_id, i);
+    c_capabilities->has_type2_sb_1 = 1;
+    c_capabilities->type2_sb_1 = flexran_get_type2_sb_1(mod_id, i);
+    c_capabilities->has_ue_category = 1;
+    c_capabilities->ue_category = flexran_get_ue_category(mod_id, i);
+    c_capabilities->has_res_alloc_type1 = 1;
+    c_capabilities->res_alloc_type1 = flexran_get_res_alloc_type1(mod_id, i);
     //Set the capabilites to the message
     config->capabilities = c_capabilities;