maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove gNB structure dependency from do_RRCReconfiguration in asn1_msg.c

Browse Source
This commit is contained in:
francescomani
2025-04-24 18:40:49 +02:00
parent 735a631499
commit 368e74930c
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/RRC/NR/MESSAGES/asn1_msg.c
+2 -2
View File
@@ -638,7 +638,7 @@ int do_NR_RRCRelease(uint8_t *buffer, size_t buffer_size, uint8_t Transaction_id
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
int do_RRCReconfiguration(const gNB_RRC_UE_t *UE, int do_RRCReconfiguration(int rrc_ue_id,
uint8_t *buffer, uint8_t *buffer,
size_t buffer_size, size_t buffer_size,
uint8_t Transaction_id, uint8_t Transaction_id,
@@ -738,7 +738,7 @@ int do_RRCReconfiguration(const gNB_RRC_UE_t *UE,
ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NR_DL_DCCH_Message, &dl_dcch_msg); ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NR_DL_DCCH_Message, &dl_dcch_msg);
LOG_D(NR_RRC, LOG_D(NR_RRC,
"RRCReconfiguration for UE %d: Encoded %zd bits (%zd bytes)\n", "RRCReconfiguration for UE %d: Encoded %zd bits (%zd bytes)\n",
UE->rrc_ue_id, rrc_ue_id,
enc_rval.encoded, enc_rval.encoded,
(enc_rval.encoded + 7) / 8); (enc_rval.encoded + 7) / 8);
openair2/RRC/NR/MESSAGES/asn1_msg.h
+1 -1
View File
@@ -103,7 +103,7 @@ int do_NR_SA_UECapabilityEnquiry(uint8_t *const buffer, const uint8_t Transactio
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);
int do_RRCReconfiguration(const gNB_RRC_UE_t *UE, int do_RRCReconfiguration(int rrc_ue_id,
uint8_t *buffer, uint8_t *buffer,
size_t buffer_size, size_t buffer_size,
uint8_t Transaction_id, uint8_t Transaction_id,
openair2/RRC/NR/rrc_gNB.c
+15 -5
View File
@@ -505,7 +505,7 @@ static int rrc_gNB_encode_RRCReconfiguration(gNB_RRC_INST *rrc,
NR_SRB_ToAddModList_t *SRBs = createSRBlist(UE, reestablish); NR_SRB_ToAddModList_t *SRBs = createSRBlist(UE, reestablish);
NR_DRB_ToAddModList_t *DRBs = createDRBlist(UE, reestablish); NR_DRB_ToAddModList_t *DRBs = createDRBlist(UE, reestablish);
int size = do_RRCReconfiguration(UE, int size = do_RRCReconfiguration(UE->rrc_ue_id,
buf, buf,
max_len, max_len,
xid, xid,
@@ -658,7 +658,7 @@ void rrc_gNB_modify_dedicatedRRCReconfiguration(gNB_RRC_INST *rrc, gNB_RRC_UE_t
NR_DRB_ToAddModList_t *DRBs = createDRBlist(ue_p, false); NR_DRB_ToAddModList_t *DRBs = createDRBlist(ue_p, false);
uint8_t buffer[NR_RRC_BUF_SIZE]; uint8_t buffer[NR_RRC_BUF_SIZE];
int size = do_RRCReconfiguration(ue_p, int size = do_RRCReconfiguration(ue_p->rrc_ue_id,
buffer, buffer,
NR_RRC_BUF_SIZE, NR_RRC_BUF_SIZE,
xid, xid,
@@ -710,7 +710,7 @@ void rrc_gNB_generate_dedicatedRRCReconfiguration_release(gNB_RRC_INST *rrc,
} }
uint8_t buffer[NR_RRC_BUF_SIZE] = {0}; uint8_t buffer[NR_RRC_BUF_SIZE] = {0};
int size = do_RRCReconfiguration(ue_p, int size = do_RRCReconfiguration(ue_p->rrc_ue_id,
buffer, buffer,
NR_RRC_BUF_SIZE, NR_RRC_BUF_SIZE,
xid, xid,
@@ -969,7 +969,7 @@ static void rrc_gNB_process_RRCReestablishmentComplete(gNB_RRC_INST *rrc, gNB_RR
uint8_t new_xid = rrc_gNB_get_next_transaction_identifier(rrc->module_id); uint8_t new_xid = rrc_gNB_get_next_transaction_identifier(rrc->module_id);
ue_p->xids[new_xid] = RRC_REESTABLISH_COMPLETE; ue_p->xids[new_xid] = RRC_REESTABLISH_COMPLETE;
uint8_t buffer[NR_RRC_BUF_SIZE] = {0}; uint8_t buffer[NR_RRC_BUF_SIZE] = {0};
int size = do_RRCReconfiguration(ue_p, int size = do_RRCReconfiguration(ue_p->rrc_ue_id,
buffer, buffer,
NR_RRC_BUF_SIZE, NR_RRC_BUF_SIZE,
new_xid, new_xid,
@@ -1010,7 +1010,17 @@ int nr_rrc_reconfiguration_req(gNB_RRC_INST *rrc, gNB_RRC_UE_t *ue_p, const int
} }
uint8_t buffer[NR_RRC_BUF_SIZE]; uint8_t buffer[NR_RRC_BUF_SIZE];
int size = do_RRCReconfiguration(ue_p, buffer, NR_RRC_BUF_SIZE, xid, NULL, NULL, NULL, NULL, NULL, NULL, masterCellGroup); int size = do_RRCReconfiguration(ue_p->rrc_ue_id,
buffer,
NR_RRC_BUF_SIZE,
xid,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
masterCellGroup);
const uint32_t msg_id = NR_DL_DCCH_MessageType__c1_PR_rrcReconfiguration; const uint32_t msg_id = NR_DL_DCCH_MessageType__c1_PR_rrcReconfiguration;
nr_rrc_transfer_protected_rrc_message(rrc, ue_p, DL_SCH_LCID_DCCH, msg_id, buffer, size); nr_rrc_transfer_protected_rrc_message(rrc, ue_p, DL_SCH_LCID_DCCH, msg_id, buffer, size);