Iterate Over All configured PLMNs

openair2/RRC/NR/rrc_gNB_du.c

@@ -96,11 +96,22 @@ static int du_compare(const nr_rrc_du_container_t *a, const nr_rrc_du_container_
 /* Tree management functions */
 RB_GENERATE/*_STATIC*/(rrc_du_tree, nr_rrc_du_container_t, entries, du_compare);
 
+//static bool rrc_gNB_plmn_matches(const gNB_RRC_INST *rrc, const f1ap_served_cell_info_t *info)
+//{
+//  const gNB_RrcConfigurationReq *conf = &rrc->configuration;
+//  return conf->num_plmn == 1 // F1 supports only one
+//         && conf->plmn[0].mcc == info->plmn.mcc && conf->plmn[0].mnc == info->plmn.mnc;
+//}
 static bool rrc_gNB_plmn_matches(const gNB_RRC_INST *rrc, const f1ap_served_cell_info_t *info)
 {
   const gNB_RrcConfigurationReq *conf = &rrc->configuration;
-  return conf->num_plmn == 1 // F1 supports only one
-         && conf->plmn[0].mcc == info->plmn.mcc && conf->plmn[0].mnc == info->plmn.mnc;
+  for (int i = 0; i < conf->num_plmn; ++i) {
+    if (conf->plmn[i].mcc == info->plmn.mcc &&
+        conf->plmn[i].mnc == info->plmn.mnc) {
+      return true;
+    }
+  }
+  return false;
 }
 
 static bool extract_sys_info(const f1ap_gnb_du_system_info_t *sys_info, NR_MIB_t **mib, NR_SIB1_t **sib1)

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf

@@ -11,7 +11,7 @@ gNBs =
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
-    plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; }) });
+    plmn_list = ({ mcc = 001; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; }) }, { mcc = 001; mnc = 02; mnc_length = 2; snssaiList = ({ sst = 1; }) });
 
     nr_cellid = 12345678L;
 
@@ -19,7 +19,7 @@ gNBs =
 
     do_CSIRS                                                  = 1;
     do_SRS                                                    = 1;
-
+    min_rxtxtime                                              = 6;
     #uess_agg_levels = [0,1,2,2,1]
     servingCellConfigCommon = (
     {