Skip to content

O
OpenXG-RAN
Commit c69e8b68 authored by Robert Schmidt's avatar Robert Schmidt
Browse files
Options

Clean up do_RRCReconfiguration()

parent 3982cc2e
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 57 deletions
openair2/RRC/NR/MESSAGES/asn1_msg.c
View file @ c69e8b68
...@@ -676,21 +676,17 @@ int do_NR_RRCRelease(uint8_t *buffer, size_t buffer_size, uint8_t Transaction_id ...@@ -676,21 +676,17 @@ int do_NR_RRCRelease(uint8_t *buffer, size_t buffer_size, uint8_t Transaction_id
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
int16_t do_RRCReconfiguration( int16_t do_RRCReconfiguration(const gNB_RRC_UE_t *UE,
const protocol_ctxt_t *const ctxt_pP, uint8_t *buffer,
uint8_t *buffer, size_t buffer_size,
size_t buffer_size, uint8_t Transaction_id,
uint8_t Transaction_id, NR_SRB_ToAddModList_t *SRB_configList,
NR_SRB_ToAddModList_t *SRB_configList, NR_DRB_ToAddModList_t *DRB_configList,
NR_DRB_ToAddModList_t *DRB_configList, NR_DRB_ToReleaseList_t *DRB_releaseList,
NR_DRB_ToReleaseList_t *DRB_releaseList, NR_SecurityConfig_t *security_config,
NR_SecurityConfig_t *security_config, NR_MeasConfig_t *meas_config,
NR_SDAP_Config_t *sdap_config, struct NR_RRCReconfiguration_v1530_IEs__dedicatedNAS_MessageList *dedicatedNAS_MessageList,
NR_MeasConfig_t *meas_config, NR_CellGroupConfig_t *cellGroupConfig)
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)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
{ {
NR_DL_DCCH_Message_t dl_dcch_msg={0}; NR_DL_DCCH_Message_t dl_dcch_msg={0};
...@@ -771,11 +767,11 @@ int16_t do_RRCReconfiguration( ...@@ -771,11 +767,11 @@ int16_t do_RRCReconfiguration(
AssertFatal(enc_rval.encoded >0, "ASN1 message encoding failed (%s, %lu)!\n", AssertFatal(enc_rval.encoded >0, "ASN1 message encoding failed (%s, %lu)!\n",
enc_rval.failed_type->name, enc_rval.encoded); enc_rval.failed_type->name, enc_rval.encoded);
LOG_D(NR_RRC,"[gNB %d] RRCReconfiguration for UE %lx Encoded %zd bits (%zd bytes)\n", LOG_D(NR_RRC,
ctxt_pP->module_id, "RRCReconfiguration for UE %d: Encoded %zd bits (%zd bytes)\n",
ctxt_pP->rntiMaybeUEid, UE->rrc_ue_id,
enc_rval.encoded, enc_rval.encoded,
(enc_rval.encoded+7)/8); (enc_rval.encoded + 7) / 8);
return((enc_rval.encoded+7)/8); return((enc_rval.encoded+7)/8);
} }
......
openair2/RRC/NR/MESSAGES/asn1_msg.h
View file @ c69e8b68
...@@ -97,7 +97,7 @@ uint8_t do_NR_SA_UECapabilityEnquiry( const protocol_ctxt_t *const ctxt_pP, ...@@ -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); 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, uint8_t *buffer,
size_t buffer_size, size_t buffer_size,
uint8_t Transaction_id, uint8_t Transaction_id,
...@@ -105,11 +105,8 @@ int16_t do_RRCReconfiguration(const protocol_ctxt_t *const ctxt_pP, ...@@ -105,11 +105,8 @@ int16_t do_RRCReconfiguration(const protocol_ctxt_t *const ctxt_pP,
NR_DRB_ToAddModList_t *DRB_configList, NR_DRB_ToAddModList_t *DRB_configList,
NR_DRB_ToReleaseList_t *DRB_releaseList, NR_DRB_ToReleaseList_t *DRB_releaseList,
NR_SecurityConfig_t *security_config, NR_SecurityConfig_t *security_config,
NR_SDAP_Config_t *sdap_config,
NR_MeasConfig_t *meas_config, NR_MeasConfig_t *meas_config,
struct NR_RRCReconfiguration_v1530_IEs__dedicatedNAS_MessageList *dedicatedNAS_MessageList, 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); NR_CellGroupConfig_t *cellGroupConfig);
uint8_t do_RRCSetupComplete(uint8_t Mod_id, uint8_t do_RRCSetupComplete(uint8_t Mod_id,
......
openair2/RRC/NR/rrc_gNB.c
View file @ c69e8b68
...@@ -562,7 +562,7 @@ static void rrc_gNB_generate_defaultRRCReconfiguration(const protocol_ctxt_t *co ...@@ -562,7 +562,7 @@ static void rrc_gNB_generate_defaultRRCReconfiguration(const protocol_ctxt_t *co
NR_MeasConfig_t *measconfig = get_defaultMeasConfig(arfcn, band, scs); NR_MeasConfig_t *measconfig = get_defaultMeasConfig(arfcn, band, scs);
uint8_t buffer[RRC_BUF_SIZE] = {0}; uint8_t buffer[RRC_BUF_SIZE] = {0};
int size = do_RRCReconfiguration(ctxt_pP, int size = do_RRCReconfiguration(ue_p,
buffer, buffer,
RRC_BUF_SIZE, RRC_BUF_SIZE,
xid, xid,
...@@ -570,11 +570,8 @@ static void rrc_gNB_generate_defaultRRCReconfiguration(const protocol_ctxt_t *co ...@@ -570,11 +570,8 @@ static void rrc_gNB_generate_defaultRRCReconfiguration(const protocol_ctxt_t *co
NULL, //*DRB_configList, NULL, //*DRB_configList,
NULL, NULL,
NULL, NULL,
NULL,
measconfig, measconfig,
dedicatedNAS_MessageList, dedicatedNAS_MessageList,
ue_context_pP,
NULL,
ue_p->masterCellGroup); ue_p->masterCellGroup);
AssertFatal(size > 0, "cannot encode RRCReconfiguration in %s()\n", __func__); AssertFatal(size > 0, "cannot encode RRCReconfiguration in %s()\n", __func__);
LOG_W(NR_RRC, "do_RRCReconfiguration(): size %d\n", size); 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 ...@@ -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_SRB_ToAddModList_t *SRBs = createSRBlist(ue_p, false);
NR_DRB_ToAddModList_t *DRBs = createDRBlist(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, buffer,
RRC_BUF_SIZE, RRC_BUF_SIZE,
xid, xid,
...@@ -677,10 +674,7 @@ void rrc_gNB_generate_dedicatedRRCReconfiguration(const protocol_ctxt_t *const c ...@@ -677,10 +674,7 @@ void rrc_gNB_generate_dedicatedRRCReconfiguration(const protocol_ctxt_t *const c
NULL, NULL,
NULL, NULL,
NULL, NULL,
NULL,
dedicatedNAS_MessageList, dedicatedNAS_MessageList,
ue_context_pP,
NULL,
cellGroupConfig); cellGroupConfig);
LOG_DUMPMSG(NR_RRC,DEBUG_RRC,(char *)buffer,size,"[MSG] RRC Reconfiguration\n"); LOG_DUMPMSG(NR_RRC,DEBUG_RRC,(char *)buffer,size,"[MSG] RRC Reconfiguration\n");
freeSRBlist(SRBs); freeSRBlist(SRBs);
...@@ -799,7 +793,7 @@ rrc_gNB_modify_dedicatedRRCReconfiguration( ...@@ -799,7 +793,7 @@ rrc_gNB_modify_dedicatedRRCReconfiguration(
} }
uint8_t buffer[RRC_BUF_SIZE]; uint8_t buffer[RRC_BUF_SIZE];
int size = do_RRCReconfiguration(ctxt_pP, int size = do_RRCReconfiguration(ue_p,
buffer, buffer,
RRC_BUF_SIZE, RRC_BUF_SIZE,
xid, xid,
...@@ -808,10 +802,7 @@ rrc_gNB_modify_dedicatedRRCReconfiguration( ...@@ -808,10 +802,7 @@ rrc_gNB_modify_dedicatedRRCReconfiguration(
NULL, NULL,
NULL, NULL,
NULL, NULL,
NULL,
dedicatedNAS_MessageList, dedicatedNAS_MessageList,
NULL,
NULL,
NULL); NULL);
LOG_DUMPMSG(NR_RRC, DEBUG_RRC, (char *)buffer, size, "[MSG] RRC Reconfiguration\n"); LOG_DUMPMSG(NR_RRC, DEBUG_RRC, (char *)buffer, size, "[MSG] RRC Reconfiguration\n");
...@@ -872,7 +863,7 @@ rrc_gNB_generate_dedicatedRRCReconfiguration_release( ...@@ -872,7 +863,7 @@ rrc_gNB_generate_dedicatedRRCReconfiguration_release(
} }
uint8_t buffer[RRC_BUF_SIZE] = {0}; uint8_t buffer[RRC_BUF_SIZE] = {0};
int size = do_RRCReconfiguration(ctxt_pP, int size = do_RRCReconfiguration(ue_p,
buffer, buffer,
RRC_BUF_SIZE, RRC_BUF_SIZE,
xid, xid,
...@@ -881,10 +872,7 @@ rrc_gNB_generate_dedicatedRRCReconfiguration_release( ...@@ -881,10 +872,7 @@ rrc_gNB_generate_dedicatedRRCReconfiguration_release(
DRB_Release_configList2, DRB_Release_configList2,
NULL, NULL,
NULL, NULL,
NULL,
dedicatedNAS_MessageList, dedicatedNAS_MessageList,
NULL,
NULL,
NULL); NULL);
LOG_DUMPMSG(NR_RRC,DEBUG_RRC,(char *)buffer,size, "[MSG] RRC Reconfiguration\n"); 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 ...@@ -1113,7 +1101,7 @@ static void rrc_gNB_process_RRCReestablishmentComplete(const protocol_ctxt_t *co
NR_DRB_ToAddModList_t *DRBs = createDRBlist(ue_p, true); NR_DRB_ToAddModList_t *DRBs = createDRBlist(ue_p, true);
uint8_t buffer[RRC_BUF_SIZE] = {0}; uint8_t buffer[RRC_BUF_SIZE] = {0};
int size = do_RRCReconfiguration(ctxt_pP, int size = do_RRCReconfiguration(ue_p,
buffer, buffer,
RRC_BUF_SIZE, RRC_BUF_SIZE,
new_xid, new_xid,
...@@ -1121,11 +1109,8 @@ static void rrc_gNB_process_RRCReestablishmentComplete(const protocol_ctxt_t *co ...@@ -1121,11 +1109,8 @@ static void rrc_gNB_process_RRCReestablishmentComplete(const protocol_ctxt_t *co
DRBs, DRBs,
NULL, NULL,
NULL, NULL,
NULL,
NULL, // MeasObj_list, NULL, // MeasObj_list,
NULL, NULL,
ue_context_pP,
NULL,
cellGroupConfig); cellGroupConfig);
freeSRBlist(SRBs); freeSRBlist(SRBs);
freeDRBlist(DRBs); freeDRBlist(DRBs);
...@@ -1160,20 +1145,7 @@ int nr_rrc_reconfiguration_req(rrc_gNB_ue_context_t *const ue_context_pP ...@@ -1160,20 +1145,7 @@ int nr_rrc_reconfiguration_req(rrc_gNB_ue_context_t *const ue_context_pP
} }
uint8_t buffer[RRC_BUF_SIZE]; uint8_t buffer[RRC_BUF_SIZE];
int size = do_RRCReconfiguration(ctxt_pP, int size = do_RRCReconfiguration(ue_p, buffer, RRC_BUF_SIZE, xid, NULL, NULL, NULL, NULL, NULL, NULL, masterCellGroup);
buffer,
RRC_BUF_SIZE,
xid,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
ue_context_pP,
NULL,
masterCellGroup);
gNB_RRC_INST *rrc = RC.nrrrc[ctxt_pP->module_id]; gNB_RRC_INST *rrc = RC.nrrrc[ctxt_pP->module_id];
nr_rrc_transfer_protected_rrc_message(rrc, ue_p, DCCH, buffer, size); nr_rrc_transfer_protected_rrc_message(rrc, ue_p, DCCH, buffer, size);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment