diff --git a/openair2/RRC/NR/MESSAGES/asn1_msg.c b/openair2/RRC/NR/MESSAGES/asn1_msg.c
index 6cd4fc3500c89b7b640257ae427bb380d7eb5bef..6cd831ff4339107754e9f0035538f822530efc02 100644
--- a/openair2/RRC/NR/MESSAGES/asn1_msg.c
+++ b/openair2/RRC/NR/MESSAGES/asn1_msg.c
@@ -676,21 +676,17 @@ int do_NR_RRCRelease(uint8_t *buffer, size_t buffer_size, uint8_t Transaction_id
}
//------------------------------------------------------------------------------
-int16_t do_RRCReconfiguration(
- const protocol_ctxt_t *const ctxt_pP,
- uint8_t *buffer,
- size_t buffer_size,
- uint8_t Transaction_id,
- NR_SRB_ToAddModList_t *SRB_configList,
- NR_DRB_ToAddModList_t *DRB_configList,
- NR_DRB_ToReleaseList_t *DRB_releaseList,
- NR_SecurityConfig_t *security_config,
- NR_SDAP_Config_t *sdap_config,
- NR_MeasConfig_t *meas_config,
- struct NR_RRCReconfiguration_v1530_IEs__dedicatedNAS_MessageList *dedicatedNAS_MessageList,
- rrc_gNB_ue_context_t *const ue_context_pP,
- const NR_ServingCellConfigCommon_t *scc,
- NR_CellGroupConfig_t *cellGroupConfig)
+int16_t do_RRCReconfiguration(const gNB_RRC_UE_t *UE,
+ uint8_t *buffer,
+ size_t buffer_size,
+ uint8_t Transaction_id,
+ NR_SRB_ToAddModList_t *SRB_configList,
+ NR_DRB_ToAddModList_t *DRB_configList,
+ NR_DRB_ToReleaseList_t *DRB_releaseList,
+ NR_SecurityConfig_t *security_config,
+ NR_MeasConfig_t *meas_config,
+ struct NR_RRCReconfiguration_v1530_IEs__dedicatedNAS_MessageList *dedicatedNAS_MessageList,
+ NR_CellGroupConfig_t *cellGroupConfig)
//------------------------------------------------------------------------------
{
NR_DL_DCCH_Message_t dl_dcch_msg={0};
@@ -771,11 +767,11 @@ int16_t do_RRCReconfiguration(
AssertFatal(enc_rval.encoded >0, "ASN1 message encoding failed (%s, %lu)!\n",
enc_rval.failed_type->name, enc_rval.encoded);
- LOG_D(NR_RRC,"[gNB %d] RRCReconfiguration for UE %lx Encoded %zd bits (%zd bytes)\n",
- ctxt_pP->module_id,
- ctxt_pP->rntiMaybeUEid,
+ LOG_D(NR_RRC,
+ "RRCReconfiguration for UE %d: Encoded %zd bits (%zd bytes)\n",
+ UE->rrc_ue_id,
enc_rval.encoded,
- (enc_rval.encoded+7)/8);
+ (enc_rval.encoded + 7) / 8);
return((enc_rval.encoded+7)/8);
}
diff --git a/openair2/RRC/NR/MESSAGES/asn1_msg.h b/openair2/RRC/NR/MESSAGES/asn1_msg.h
index a81091357ad526b68447c4eb3835891d67bf05bc..83c4e4897c578fd66831e02ee0f2718e0e8e95c3 100644
--- a/openair2/RRC/NR/MESSAGES/asn1_msg.h
+++ b/openair2/RRC/NR/MESSAGES/asn1_msg.h
@@ -97,7 +97,7 @@ uint8_t do_NR_SA_UECapabilityEnquiry( const protocol_ctxt_t *const ctxt_pP,
int do_NR_RRCRelease(uint8_t *buffer, size_t buffer_size, uint8_t Transaction_id);
-int16_t do_RRCReconfiguration(const protocol_ctxt_t *const ctxt_pP,
+int16_t do_RRCReconfiguration(const gNB_RRC_UE_t *UE,
uint8_t *buffer,
size_t buffer_size,
uint8_t Transaction_id,
@@ -105,11 +105,8 @@ int16_t do_RRCReconfiguration(const protocol_ctxt_t *const ctxt_pP,
NR_DRB_ToAddModList_t *DRB_configList,
NR_DRB_ToReleaseList_t *DRB_releaseList,
NR_SecurityConfig_t *security_config,
- NR_SDAP_Config_t *sdap_config,
NR_MeasConfig_t *meas_config,
struct NR_RRCReconfiguration_v1530_IEs__dedicatedNAS_MessageList *dedicatedNAS_MessageList,
- rrc_gNB_ue_context_t *const ue_context_pP,
- const NR_ServingCellConfigCommon_t *scc,
NR_CellGroupConfig_t *cellGroupConfig);
uint8_t do_RRCSetupComplete(uint8_t Mod_id,
diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index 86d50a4bb02f9ddfe9bd5701b53bb0bff357244e..9c6fed9bddfbc6b99f83f7e20f48b4a5732427e9 100644
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -562,7 +562,7 @@ static void rrc_gNB_generate_defaultRRCReconfiguration(const protocol_ctxt_t *co
NR_MeasConfig_t *measconfig = get_defaultMeasConfig(arfcn, band, scs);
uint8_t buffer[RRC_BUF_SIZE] = {0};
- int size = do_RRCReconfiguration(ctxt_pP,
+ int size = do_RRCReconfiguration(ue_p,
buffer,
RRC_BUF_SIZE,
xid,
@@ -570,11 +570,8 @@ static void rrc_gNB_generate_defaultRRCReconfiguration(const protocol_ctxt_t *co
NULL, //*DRB_configList,
NULL,
NULL,
- NULL,
measconfig,
dedicatedNAS_MessageList,
- ue_context_pP,
- NULL,
ue_p->masterCellGroup);
AssertFatal(size > 0, "cannot encode RRCReconfiguration in %s()\n", __func__);
LOG_W(NR_RRC, "do_RRCReconfiguration(): size %d\n", size);
@@ -668,7 +665,7 @@ void rrc_gNB_generate_dedicatedRRCReconfiguration(const protocol_ctxt_t *const c
NR_SRB_ToAddModList_t *SRBs = createSRBlist(ue_p, false);
NR_DRB_ToAddModList_t *DRBs = createDRBlist(ue_p, false);
- int size = do_RRCReconfiguration(ctxt_pP,
+ int size = do_RRCReconfiguration(ue_p,
buffer,
RRC_BUF_SIZE,
xid,
@@ -677,10 +674,7 @@ void rrc_gNB_generate_dedicatedRRCReconfiguration(const protocol_ctxt_t *const c
NULL,
NULL,
NULL,
- NULL,
dedicatedNAS_MessageList,
- ue_context_pP,
- NULL,
cellGroupConfig);
LOG_DUMPMSG(NR_RRC,DEBUG_RRC,(char *)buffer,size,"[MSG] RRC Reconfiguration\n");
freeSRBlist(SRBs);
@@ -799,7 +793,7 @@ rrc_gNB_modify_dedicatedRRCReconfiguration(
}
uint8_t buffer[RRC_BUF_SIZE];
- int size = do_RRCReconfiguration(ctxt_pP,
+ int size = do_RRCReconfiguration(ue_p,
buffer,
RRC_BUF_SIZE,
xid,
@@ -808,10 +802,7 @@ rrc_gNB_modify_dedicatedRRCReconfiguration(
NULL,
NULL,
NULL,
- NULL,
dedicatedNAS_MessageList,
- NULL,
- NULL,
NULL);
LOG_DUMPMSG(NR_RRC, DEBUG_RRC, (char *)buffer, size, "[MSG] RRC Reconfiguration\n");
@@ -872,7 +863,7 @@ rrc_gNB_generate_dedicatedRRCReconfiguration_release(
}
uint8_t buffer[RRC_BUF_SIZE] = {0};
- int size = do_RRCReconfiguration(ctxt_pP,
+ int size = do_RRCReconfiguration(ue_p,
buffer,
RRC_BUF_SIZE,
xid,
@@ -881,10 +872,7 @@ rrc_gNB_generate_dedicatedRRCReconfiguration_release(
DRB_Release_configList2,
NULL,
NULL,
- NULL,
dedicatedNAS_MessageList,
- NULL,
- NULL,
NULL);
LOG_DUMPMSG(NR_RRC,DEBUG_RRC,(char *)buffer,size, "[MSG] RRC Reconfiguration\n");
@@ -1113,7 +1101,7 @@ static void rrc_gNB_process_RRCReestablishmentComplete(const protocol_ctxt_t *co
NR_DRB_ToAddModList_t *DRBs = createDRBlist(ue_p, true);
uint8_t buffer[RRC_BUF_SIZE] = {0};
- int size = do_RRCReconfiguration(ctxt_pP,
+ int size = do_RRCReconfiguration(ue_p,
buffer,
RRC_BUF_SIZE,
new_xid,
@@ -1121,11 +1109,8 @@ static void rrc_gNB_process_RRCReestablishmentComplete(const protocol_ctxt_t *co
DRBs,
NULL,
NULL,
- NULL,
NULL, // MeasObj_list,
NULL,
- ue_context_pP,
- NULL,
cellGroupConfig);
freeSRBlist(SRBs);
freeDRBlist(DRBs);
@@ -1160,20 +1145,7 @@ int nr_rrc_reconfiguration_req(rrc_gNB_ue_context_t *const ue_context_pP
}
uint8_t buffer[RRC_BUF_SIZE];
- int size = do_RRCReconfiguration(ctxt_pP,
- buffer,
- RRC_BUF_SIZE,
- xid,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- ue_context_pP,
- NULL,
- masterCellGroup);
+ int size = do_RRCReconfiguration(ue_p, buffer, RRC_BUF_SIZE, xid, NULL, NULL, NULL, NULL, NULL, NULL, masterCellGroup);
gNB_RRC_INST *rrc = RC.nrrrc[ctxt_pP->module_id];
nr_rrc_transfer_protected_rrc_message(rrc, ue_p, DCCH, buffer, size);