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

Protect some xer_fprints by an if

Browse Source
This commit is contained in:
rmagueta
2021-07-14 15:30:07 +01:00
parent 7758e8acfc
commit a2450bb4b7
7 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executables/nr-ru.c
-2
View File
@@ -1386,7 +1386,6 @@ void *ru_thread( void *param ) {
} }
} }
// At this point, all information for subframe has been received on FH interface // At this point, all information for subframe has been received on FH interface
res = pullTpool(gNB->resp_L1, gNB->threadPool); res = pullTpool(gNB->resp_L1, gNB->threadPool);
syncMsg = (processingData_L1_t *)NotifiedFifoData(res); syncMsg = (processingData_L1_t *)NotifiedFifoData(res);
@@ -1399,7 +1398,6 @@ void *ru_thread( void *param ) {
res->key = proc->tti_rx; res->key = proc->tti_rx;
pushTpool(gNB->threadPool, res); pushTpool(gNB->threadPool, res);
} }
printf( "Exiting ru_thread \n"); printf( "Exiting ru_thread \n");
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+2
View File
@@ -2276,7 +2276,9 @@ uint16_t nr_generate_ulsch_pdu(uint8_t *sdus_payload,
if(buflen > 0) // If the buflen is provided if(buflen > 0) // If the buflen is provided
padding_bytes = buflen + pdu - (unsigned char *) mac_pdu_ptr; padding_bytes = buflen + pdu - (unsigned char *) mac_pdu_ptr;
AssertFatal(padding_bytes>=0,""); AssertFatal(padding_bytes>=0,"");
// Compute final offset for padding // Compute final offset for padding
if (post_padding || padding_bytes>0) { if (post_padding || padding_bytes>0) {
((NR_MAC_SUBHEADER_FIXED *) mac_pdu_ptr)->R = 0; ((NR_MAC_SUBHEADER_FIXED *) mac_pdu_ptr)->R = 0;
openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
+1
View File
@@ -47,6 +47,7 @@ extern RAN_CONTEXT_t RC;
#include <stdint.h> #include <stdint.h>
#include <executables/softmodem-common.h> #include <executables/softmodem-common.h>
static nr_rlc_ue_manager_t *nr_rlc_ue_manager; static nr_rlc_ue_manager_t *nr_rlc_ue_manager;
/* TODO: handle time a bit more properly */ /* TODO: handle time a bit more properly */
openair2/RRC/NR_UE/rrc_UE.c
+5 -3
View File
@@ -1257,7 +1257,10 @@ nr_rrc_ue_process_masterCellGroup(
(void **)&cellGroupConfig, (void **)&cellGroupConfig,
(uint8_t *)masterCellGroup->buf, (uint8_t *)masterCellGroup->buf,
masterCellGroup->size, 0, 0); masterCellGroup->size, 0, 0);
if ( LOG_DEBUGFLAG(DEBUG_ASN1) ) {
xer_fprint(stdout, &asn_DEF_NR_CellGroupConfig, (const void *) cellGroupConfig); xer_fprint(stdout, &asn_DEF_NR_CellGroupConfig, (const void *) cellGroupConfig);
}
if( cellGroupConfig->spCellConfig != NULL && cellGroupConfig->spCellConfig->reconfigurationWithSync != NULL){ if( cellGroupConfig->spCellConfig != NULL && cellGroupConfig->spCellConfig->reconfigurationWithSync != NULL){
//TODO (perform Reconfiguration with sync according to 5.3.5.5.2) //TODO (perform Reconfiguration with sync according to 5.3.5.5.2)
@@ -2200,7 +2203,6 @@ nr_rrc_ue_establish_srb2(
ie->nonCriticalExtension->masterCellGroup); ie->nonCriticalExtension->masterCellGroup);
} }
if (ie->radioBearerConfig != NULL) { if (ie->radioBearerConfig != NULL) {
LOG_I(NR_RRC, "radio Bearer Configuration is present\n"); LOG_I(NR_RRC, "radio Bearer Configuration is present\n");
nr_sa_rrc_ue_process_radioBearerConfig(ctxt_pP, gNB_index, ie->radioBearerConfig); nr_sa_rrc_ue_process_radioBearerConfig(ctxt_pP, gNB_index, ie->radioBearerConfig);
@@ -2304,9 +2306,9 @@ nr_rrc_ue_establish_srb2(
return -1; return -1;
} }
// if ( LOG_DEBUGFLAG(DEBUG_ASN1) ) { if ( LOG_DEBUGFLAG(DEBUG_ASN1) ) {
xer_fprint(stdout, &asn_DEF_NR_DL_DCCH_Message,(void *)dl_dcch_msg); xer_fprint(stdout, &asn_DEF_NR_DL_DCCH_Message,(void *)dl_dcch_msg);
// } }
if (dl_dcch_msg->message.present == NR_DL_DCCH_MessageType_PR_c1) { if (dl_dcch_msg->message.present == NR_DL_DCCH_MessageType_PR_c1) {
switch (dl_dcch_msg->message.choice.c1->present) { switch (dl_dcch_msg->message.choice.c1->present) {
openair3/NGAP/ngap_gNB_nas_procedures.c
+5
View File
@@ -771,7 +771,10 @@ int ngap_gNB_initial_ctxt_resp(
//item->pDUSessionResourceSetupResponseTransfer.buf = res.buffer; //item->pDUSessionResourceSetupResponseTransfer.buf = res.buffer;
//item->pDUSessionResourceSetupResponseTransfer.size = res.result.encoded; //item->pDUSessionResourceSetupResponseTransfer.size = res.result.encoded;
if (asn1_xer_print) {
xer_fprint(stdout, &asn_DEF_NGAP_PDUSessionResourceSetupResponseTransfer, pdusessionTransfer_p); xer_fprint(stdout, &asn_DEF_NGAP_PDUSessionResourceSetupResponseTransfer, pdusessionTransfer_p);
}
memset(pdusessionTransfer_buffer, 0, 1000); memset(pdusessionTransfer_buffer, 0, 1000);
asn_enc_rval_t enc_rval = aper_encode_to_buffer(&asn_DEF_NGAP_PDUSessionResourceSetupResponseTransfer, asn_enc_rval_t enc_rval = aper_encode_to_buffer(&asn_DEF_NGAP_PDUSessionResourceSetupResponseTransfer,
NULL, NULL,
@@ -858,7 +861,9 @@ int ngap_gNB_initial_ctxt_resp(
ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie); ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
} }
if (asn1_xer_print) {
xer_fprint(stdout, &asn_DEF_NGAP_NGAP_PDU, &pdu); xer_fprint(stdout, &asn_DEF_NGAP_NGAP_PDU, &pdu);
}
if (ngap_gNB_encode_pdu(&pdu, &buffer, &length) < 0) { if (ngap_gNB_encode_pdu(&pdu, &buffer, &length) < 0) {
NGAP_ERROR("Failed to encode InitialContextSetupResponse\n"); NGAP_ERROR("Failed to encode InitialContextSetupResponse\n");