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

Fix number of RRCSetup encoded bytes

Browse Source
This commit is contained in:
luis_pereira87
2022-01-12 17:51:32 +00:00
parent 4f50fcce2a
commit b15f1f1830
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/RRC/LTE/rrc_defs.h
+1 -1
View File
@@ -484,7 +484,7 @@ typedef struct MEASUREMENT_INFO_s {
typedef struct { typedef struct {
char Payload[RRC_BUFFER_SIZE_MAX]; char Payload[RRC_BUFFER_SIZE_MAX];
char Header[RRC_HEADER_SIZE_MAX]; char Header[RRC_HEADER_SIZE_MAX];
char payload_size; uint16_t payload_size;
} RRC_BUFFER; } RRC_BUFFER;
#define RRC_BUFFER_SIZE sizeof(RRC_BUFFER) #define RRC_BUFFER_SIZE sizeof(RRC_BUFFER)
openair2/RRC/NR/MESSAGES/asn1_msg.c
+1 -1
View File
@@ -2059,7 +2059,7 @@ void fill_initial_cellGroupConfig(rnti_t rnti,
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
uint8_t do_RRCSetup(rrc_gNB_ue_context_t *const ue_context_pP, int16_t do_RRCSetup(rrc_gNB_ue_context_t *const ue_context_pP,
uint8_t *const buffer, uint8_t *const buffer,
const uint8_t transaction_id, const uint8_t transaction_id,
OCTET_STRING_t *masterCellGroup_from_DU, OCTET_STRING_t *masterCellGroup_from_DU,
openair2/RRC/NR/MESSAGES/asn1_msg.h
+1 -1
View File
@@ -116,7 +116,7 @@ void fill_initial_cellGroupConfig(rnti_t rnti,
void fill_mastercellGroupConfig(NR_CellGroupConfig_t *cellGroupConfig, NR_CellGroupConfig_t *ue_context_mastercellGroup); void fill_mastercellGroupConfig(NR_CellGroupConfig_t *cellGroupConfig, NR_CellGroupConfig_t *ue_context_mastercellGroup);
uint8_t do_RRCSetup(rrc_gNB_ue_context_t *const ue_context_pP, int16_t do_RRCSetup(rrc_gNB_ue_context_t *const ue_context_pP,
uint8_t *const buffer, uint8_t *const buffer,
const uint8_t transaction_id, const uint8_t transaction_id,
OCTET_STRING_t *masterCellGroup_from_DU, OCTET_STRING_t *masterCellGroup_from_DU,
openair2/RRC/NR/rrc_gNB.c
+18 -10
View File
@@ -399,11 +399,15 @@ rrc_gNB_generate_RRCSetup(
gNB_RRC_UE_t *ue_p = &ue_context_pP->ue_context; gNB_RRC_UE_t *ue_p = &ue_context_pP->ue_context;
gNB_RRC_INST *rrc = RC.nrrrc[ctxt_pP->module_id]; gNB_RRC_INST *rrc = RC.nrrrc[ctxt_pP->module_id];
NR_ServingCellConfig_t *servingcellconfigdedicated = rrc->configuration.scd; NR_ServingCellConfig_t *servingcellconfigdedicated = rrc->configuration.scd;
ue_p->Srb0.Tx_buffer.payload_size = do_RRCSetup(ue_context_pP, int16_t ret = do_RRCSetup(ue_context_pP,
(uint8_t *) ue_p->Srb0.Tx_buffer.Payload, (uint8_t *) ue_p->Srb0.Tx_buffer.Payload,
rrc_gNB_get_next_transaction_identifier(ctxt_pP->module_id), rrc_gNB_get_next_transaction_identifier(ctxt_pP->module_id),
masterCellGroup_from_DU, masterCellGroup_from_DU,
scc,servingcellconfigdedicated,&rrc->carrier); scc,servingcellconfigdedicated,&rrc->carrier);
AssertFatal(ret>0,"Error generating RRCSetup for RRCSetupRequest\n");
ue_p->Srb0.Tx_buffer.payload_size = ret;
LOG_DUMPMSG(NR_RRC, DEBUG_RRC, LOG_DUMPMSG(NR_RRC, DEBUG_RRC,
(char *)(ue_p->Srb0.Tx_buffer.Payload), (char *)(ue_p->Srb0.Tx_buffer.Payload),
@@ -519,11 +523,15 @@ rrc_gNB_generate_RRCSetup_for_RRCReestablishmentRequest(
ue_context_pP = rrc_gNB_get_next_free_ue_context(ctxt_pP, rrc_instance_p, 0); ue_context_pP = rrc_gNB_get_next_free_ue_context(ctxt_pP, rrc_instance_p, 0);
gNB_RRC_UE_t *ue_p = &ue_context_pP->ue_context; gNB_RRC_UE_t *ue_p = &ue_context_pP->ue_context;
ue_p->Srb0.Tx_buffer.payload_size = do_RRCSetup(ue_context_pP, int16_t ret = do_RRCSetup(ue_context_pP,
(uint8_t *) ue_p->Srb0.Tx_buffer.Payload, (uint8_t *) ue_p->Srb0.Tx_buffer.Payload,
rrc_gNB_get_next_transaction_identifier(ctxt_pP->module_id), rrc_gNB_get_next_transaction_identifier(ctxt_pP->module_id),
NULL, NULL,
scc,servingcellconfigdedicated,&rrc_instance_p->carrier); scc,servingcellconfigdedicated,&rrc_instance_p->carrier);
AssertFatal(ret>0,"Error generating RRCSetup for RRCReestablishmentRequest\n");
ue_p->Srb0.Tx_buffer.payload_size = ret;
LOG_DUMPMSG(NR_RRC, DEBUG_RRC, LOG_DUMPMSG(NR_RRC, DEBUG_RRC,
(char *)(ue_p->Srb0.Tx_buffer.Payload), (char *)(ue_p->Srb0.Tx_buffer.Payload),