Required changes/modifications are done at both eNB and gNB side

openair2/RRC/LTE/rrc_defs.h

@@ -40,6 +40,10 @@
 #include "rrc_types.h"
 //#include "PHY/phy_defs.h"
 #include "LAYER2/RLC/rlc.h"
+#include "RRC/NR/nr_rrc_types.h"
+#include "NR_UE-MRDC-Capability.h"
+#include "NR_UE-NR-Capability.h"
+
 
 #include "COMMON/platform_constants.h"
 #include "COMMON/platform_types.h"
@@ -569,6 +573,10 @@ typedef struct eNB_RRC_UE_s {
 
   LTE_UE_EUTRA_Capability_t         *UE_Capability;
   int                                UE_Capability_size;
+  NR_UE_MRDC_Capability_t           *UE_Capability_MRDC;
+  int                UE_MRDC_Capability_size;
+  NR_UE_NR_Capability_t       *UE_Capability_nr;
+  int                UE_NR_Capability_size;
   ImsiMobileIdentity_t               imsi;
 
   /* KeNB as derived from KASME received from EPC */
@@ -614,7 +622,7 @@ typedef struct eNB_RRC_UE_s {
   /* Number of e_rab to be modified in the list */
   uint8_t                            nb_of_modify_e_rabs;
   uint8_t                            nb_of_failed_e_rabs;
-  uint8_t							 nb_of_modify_endc_e_rabs;
+  uint8_t              nb_of_modify_endc_e_rabs;
   e_rab_param_t                      modify_e_rab[NB_RB_MAX];//[S1AP_MAX_E_RAB];
   /* list of e_rab to be setup by RRC layers */
   e_rab_param_t                      e_rab[NB_RB_MAX];//[S1AP_MAX_E_RAB];

openair2/RRC/NR/rrc_gNB_internode.c

@@ -39,47 +39,48 @@
 #include "NR_CG-Config.h"
 
 int parse_CG_ConfigInfo(gNB_RRC_INST *rrc, NR_CG_ConfigInfo_t *CG_ConfigInfo, x2ap_ENDC_sgnb_addition_req_t *m) {
-
   if (CG_ConfigInfo->criticalExtensions.present == NR_CG_ConfigInfo__criticalExtensions_PR_c1) {
     if (CG_ConfigInfo->criticalExtensions.choice.c1) {
       if (CG_ConfigInfo->criticalExtensions.choice.c1->present == NR_CG_ConfigInfo__criticalExtensions__c1_PR_cg_ConfigInfo) {
-	NR_CG_ConfigInfo_IEs_t *cg_ConfigInfo = CG_ConfigInfo->criticalExtensions.choice.c1->choice.cg_ConfigInfo;
-	if (cg_ConfigInfo->ue_CapabilityInfo) {
-	  // Decode UE-CapabilityRAT-ContainerList
+        NR_CG_ConfigInfo_IEs_t *cg_ConfigInfo = CG_ConfigInfo->criticalExtensions.choice.c1->choice.cg_ConfigInfo;
+
+        if (cg_ConfigInfo->ue_CapabilityInfo) {
+          // Decode UE-CapabilityRAT-ContainerList
           LTE_UE_CapabilityRAT_ContainerList_t *UE_CapabilityRAT_ContainerList=NULL;
-	  asn_dec_rval_t dec_rval = uper_decode(NULL,
-					        &asn_DEF_LTE_UE_CapabilityRAT_ContainerList,
-						(void**)&UE_CapabilityRAT_ContainerList,
-						cg_ConfigInfo->ue_CapabilityInfo->buf,
-						cg_ConfigInfo->ue_CapabilityInfo->size, 0, 0);
+          UE_CapabilityRAT_ContainerList = calloc(1,sizeof(LTE_UE_CapabilityRAT_ContainerList_t));
+          asn_dec_rval_t dec_rval = uper_decode(NULL,
+                                                &asn_DEF_LTE_UE_CapabilityRAT_ContainerList,
+                                                (void **)&UE_CapabilityRAT_ContainerList,
+                                                cg_ConfigInfo->ue_CapabilityInfo->buf,
+                                                cg_ConfigInfo->ue_CapabilityInfo->size, 0, 0);
+
           if ((dec_rval.code != RC_OK) && (dec_rval.consumed == 0)) {
-	    AssertFatal(1==0,"[InterNode] Failed to decode NR_UE_CapabilityRAT_ContainerList (%zu bits), size of OCTET_STRING %lu\n",
-			dec_rval.consumed, cg_ConfigInfo->ue_CapabilityInfo->size);
-	  }
-	  rrc_parse_ue_capabilities(rrc,UE_CapabilityRAT_ContainerList, m,cg_ConfigInfo);
-	}
-	if (cg_ConfigInfo->candidateCellInfoListMN) AssertFatal(1==0,"Can't handle candidateCellInfoListMN yet\n");
-      }
-      else AssertFatal(1==0,"c1 extension is not cg_ConfigInfo, returning\n");
-    }
-    else {
+            AssertFatal(1==0,"[InterNode] Failed to decode NR_UE_CapabilityRAT_ContainerList (%zu bits), size of OCTET_STRING %lu\n",
+                        dec_rval.consumed, cg_ConfigInfo->ue_CapabilityInfo->size);
+          }
+
+          rrc_parse_ue_capabilities(rrc,UE_CapabilityRAT_ContainerList, m,cg_ConfigInfo);
+        }
+
+        if (cg_ConfigInfo->candidateCellInfoListMN) AssertFatal(1==0,"Can't handle candidateCellInfoListMN yet\n");
+      } else AssertFatal(1==0,"c1 extension is not cg_ConfigInfo, returning\n");
+    } else {
       LOG_E(RRC,"c1 extension not found, returning\n");
-      return(-1); 
+      return(-1);
     }
   } else {
     LOG_E(RRC,"Ignoring unknown CG_ConfigInfo extensions\n");
     return(-1);
   }
-  return(0);  
-}
 
-
-int generate_CG_Config(gNB_RRC_INST *rrc, 
-		       NR_CG_Config_t *cg_Config,
-		       NR_RRCReconfiguration_t *reconfig,
-		       NR_RadioBearerConfig_t *rbconfig) {
+  return(0);
+}
 
 
+int generate_CG_Config(gNB_RRC_INST *rrc,
+                       NR_CG_Config_t *cg_Config,
+                       NR_RRCReconfiguration_t *reconfig,
+                       NR_RadioBearerConfig_t *rbconfig) {
   cg_Config->criticalExtensions.present = NR_CG_Config__criticalExtensions_PR_c1;
   cg_Config->criticalExtensions.choice.c1 = calloc(1,sizeof(*cg_Config->criticalExtensions.choice.c1));
   cg_Config->criticalExtensions.choice.c1->present = NR_CG_Config__criticalExtensions__c1_PR_cg_Config;
@@ -91,36 +92,37 @@ int generate_CG_Config(gNB_RRC_INST *rrc,
                enc_rval.failed_type->name, enc_rval.encoded);
   cg_Config->criticalExtensions.choice.c1->choice.cg_Config->scg_CellGroupConfig = calloc(1,sizeof(OCTET_STRING_t));
   OCTET_STRING_fromBuf(cg_Config->criticalExtensions.choice.c1->choice.cg_Config->scg_CellGroupConfig,
-		       (const char *)buffer,
-		       (enc_rval.encoded+7)>>3);
+                       (const char *)buffer,
+                       (enc_rval.encoded+7)>>3);
   total_size = (enc_rval.encoded+7)>>3;
-
   LOG_I(RRC,"Dumping NR_RRCReconfiguration message (%jd bytes)\n",(enc_rval.encoded+7)>>3);
-  for (int i=0;i<(enc_rval.encoded+7)>>3;i++) {
+
+  for (int i=0; i<(enc_rval.encoded+7)>>3; i++) {
     printf("%02x",((uint8_t *)buffer)[i]);
   }
+
   printf("\n");
   FILE *fd = fopen("reconfig.raw","w");
-  fwrite((void*)buffer,1,(size_t)((enc_rval.encoded+7)>>3),fd);
+  fwrite((void *)buffer,1,(size_t)((enc_rval.encoded+7)>>3),fd);
   fclose(fd);
-
   enc_rval = uper_encode_to_buffer(&asn_DEF_NR_RadioBearerConfig, NULL, (void *)rbconfig, buffer, 1024);
   AssertFatal (enc_rval.encoded > 0, "ASN1 message encoding failed (%s, %jd)!\n",
                enc_rval.failed_type->name, enc_rval.encoded);
   cg_Config->criticalExtensions.choice.c1->choice.cg_Config->scg_RB_Config = calloc(1,sizeof(OCTET_STRING_t));
   OCTET_STRING_fromBuf(cg_Config->criticalExtensions.choice.c1->choice.cg_Config->scg_RB_Config,
-		       (const char *)buffer,
-		       (enc_rval.encoded+7)>>3);  
+                       (const char *)buffer,
+                       (enc_rval.encoded+7)>>3);
   LOG_I(RRC,"Dumping scg_RB_Config message (%jd bytes)\n",(enc_rval.encoded+7)>>3);
-  for (int i=0;i<(enc_rval.encoded+7)>>3;i++) {
-    printf("%02x",((uint8_t*)buffer)[i]);
+
+  for (int i=0; i<(enc_rval.encoded+7)>>3; i++) {
+    printf("%02x",((uint8_t *)buffer)[i]);
   }
+
   printf("\n");
   fd = fopen("rbconfig.raw","w");
-  fwrite((void*)buffer,1,(size_t)((enc_rval.encoded+7)>>3),fd);
+  fwrite((void *)buffer,1,(size_t)((enc_rval.encoded+7)>>3),fd);
   fclose(fd);
   total_size = total_size + ((enc_rval.encoded+7)>>3);
-
   return(total_size);
 }