Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenXG
OpenXG-RAN
Commits
89547f8a
Commit
89547f8a
authored
Jan 16, 2025
by
Guido Casati
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle null pointers and improve logs in process_Event_Based_Measurement_Report
parent
f5d8debd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
7 deletions
+15
-7
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB.c
+15
-7
No files found.
openair2/RRC/NR/rrc_gNB.c
View file @
89547f8a
...
...
@@ -1276,7 +1276,11 @@ static void process_Event_Based_Measurement_Report(gNB_RRC_UE_t *ue, NR_ReportCo
break
;
case
NR_EventTriggerConfig__eventId_PR_eventA3
:
{
LOG_W
(
NR_RRC
,
"HO LOG: Event A3 Report - Neighbour Becomes Better than Serving!
\n
"
);
LOG_W
(
NR_RRC
,
"HO LOG: Event A3 Report for UE %d - Neighbour Becomes Better than Serving!
\n
"
,
ue
->
rrc_ue_id
);
if
(
!
measurementReport
->
criticalExtensions
.
choice
.
measurementReport
)
{
LOG_E
(
NR_RRC
,
"HO LOG: Event A3 Report: measurementReport is null
\n
"
);
break
;
}
const
NR_MeasResults_t
*
measResults
=
&
measurementReport
->
criticalExtensions
.
choice
.
measurementReport
->
measResults
;
for
(
int
serving_cell_idx
=
0
;
serving_cell_idx
<
measResults
->
measResultServingMOList
.
list
.
count
;
serving_cell_idx
++
)
{
...
...
@@ -1290,11 +1294,11 @@ static void process_Event_Based_Measurement_Report(gNB_RRC_UE_t *ue, NR_ReportCo
LOG_D
(
NR_RRC
,
"Serving Cell RSRP: %d
\n
"
,
servingCellRSRP
);
}
if
(
measResults
->
measResultNeighCells
==
NULL
)
break
;
if
(
measResults
->
measResultNeighCells
->
present
!=
NR_MeasResults__measResultNeighCells_PR_measResultListNR
)
if
(
measResults
->
measResultNeighCells
==
NULL
||
measResults
->
measResultNeighCells
->
present
!=
NR_MeasResults__measResultNeighCells_PR_measResultListNR
)
{
LOG_D
(
NR_RRC
,
"HO LOG: No neighbor cell measurements available
\n
"
);
break
;
}
const
NR_MeasResultListNR_t
*
measResultListNR
=
measResults
->
measResultNeighCells
->
choice
.
measResultListNR
;
for
(
int
neigh_meas_idx
=
0
;
neigh_meas_idx
<
measResultListNR
->
list
.
count
;
neigh_meas_idx
++
)
{
...
...
@@ -1392,7 +1396,7 @@ static void rrc_gNB_process_MeasurementReport(gNB_RRC_UE_t *UE, NR_MeasurementRe
}
}
if
(
report_config
==
NULL
)
{
if
(
report_config
==
NULL
||
report_config
->
choice
.
reportConfigNR
==
NULL
)
{
LOG_E
(
NR_RRC
,
"There is no related report configuration for this measId!
\n
"
);
return
;
}
...
...
@@ -1741,7 +1745,11 @@ static int rrc_gNB_decode_dcch(gNB_RRC_INST *rrc, const f1ap_ul_rrc_message_t *m
break
;
case
NR_UL_DCCH_MessageType__c1_PR_measurementReport
:
rrc_gNB_process_MeasurementReport
(
UE
,
ul_dcch_msg
->
message
.
choice
.
c1
->
choice
.
measurementReport
);
if
(
ul_dcch_msg
->
message
.
choice
.
c1
->
choice
.
measurementReport
!=
NULL
)
{
rrc_gNB_process_MeasurementReport
(
UE
,
ul_dcch_msg
->
message
.
choice
.
c1
->
choice
.
measurementReport
);
}
else
{
LOG_E
(
NR_RRC
,
"UE %d: No measurementReport CHOICE is given
\n
"
,
ue_context_p
->
ue_context
.
rrc_ue_id
);
}
break
;
case
NR_UL_DCCH_MessageType__c1_PR_ulInformationTransfer
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment