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
509cc8cc
Commit
509cc8cc
authored
Nov 28, 2024
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use PLMNID_TO_MCC_MNC() to decode PLMN ID
parent
3de8a746
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
openair2/F1AP/lib/f1ap_interface_management.c
openair2/F1AP/lib/f1ap_interface_management.c
+5
-5
No files found.
openair2/F1AP/lib/f1ap_interface_management.c
View file @
509cc8cc
...
@@ -173,7 +173,7 @@ static bool decode_served_cell_info(const F1AP_Served_Cell_Information_t *in, f1
...
@@ -173,7 +173,7 @@ static bool decode_served_cell_info(const F1AP_Served_Cell_Information_t *in, f1
OCTET_STRING_TO_INT24
(
in
->
fiveGS_TAC
,
*
info
->
tac
);
OCTET_STRING_TO_INT24
(
in
->
fiveGS_TAC
,
*
info
->
tac
);
}
}
// NR CGI (M)
// NR CGI (M)
TBC
D_TO_MCC_MNC
(
&
(
in
->
nRCGI
.
pLMN_Identity
),
info
->
plmn
.
mcc
,
info
->
plmn
.
mnc
,
info
->
plmn
.
mnc_digit_length
);
PLMNI
D_TO_MCC_MNC
(
&
(
in
->
nRCGI
.
pLMN_Identity
),
info
->
plmn
.
mcc
,
info
->
plmn
.
mnc
,
info
->
plmn
.
mnc_digit_length
);
// NR Cell Identity (M)
// NR Cell Identity (M)
BIT_STRING_TO_NR_CELL_IDENTITY
(
&
in
->
nRCGI
.
nRCellIdentity
,
info
->
nr_cellid
);
BIT_STRING_TO_NR_CELL_IDENTITY
(
&
in
->
nRCGI
.
nRCellIdentity
,
info
->
nr_cellid
);
// NR PCI (M)
// NR PCI (M)
...
@@ -310,7 +310,7 @@ static bool decode_cells_to_activate(served_cells_to_activate_t *out, const F1AP
...
@@ -310,7 +310,7 @@ static bool decode_cells_to_activate(served_cells_to_activate_t *out, const F1AP
"in->value.present != F1AP_Cells_to_be_Activated_List_ItemIEs__value_PR_Cells_to_be_Activated_List_Item
\n
"
);
"in->value.present != F1AP_Cells_to_be_Activated_List_ItemIEs__value_PR_Cells_to_be_Activated_List_Item
\n
"
);
const
F1AP_Cells_to_be_Activated_List_Item_t
*
cell
=
&
in
->
value
.
choice
.
Cells_to_be_Activated_List_Item
;
const
F1AP_Cells_to_be_Activated_List_Item_t
*
cell
=
&
in
->
value
.
choice
.
Cells_to_be_Activated_List_Item
;
// NR CGI (M)
// NR CGI (M)
TBC
D_TO_MCC_MNC
(
&
cell
->
nRCGI
.
pLMN_Identity
,
out
->
plmn
.
mcc
,
out
->
plmn
.
mnc
,
out
->
plmn
.
mnc_digit_length
);
PLMNI
D_TO_MCC_MNC
(
&
cell
->
nRCGI
.
pLMN_Identity
,
out
->
plmn
.
mcc
,
out
->
plmn
.
mnc
,
out
->
plmn
.
mnc_digit_length
);
BIT_STRING_TO_NR_CELL_IDENTITY
(
&
cell
->
nRCGI
.
nRCellIdentity
,
out
->
nr_cellid
);
BIT_STRING_TO_NR_CELL_IDENTITY
(
&
cell
->
nRCGI
.
nRCellIdentity
,
out
->
nr_cellid
);
// NR PCI (O)
// NR PCI (O)
if
(
cell
->
nRPCI
!=
NULL
)
if
(
cell
->
nRPCI
!=
NULL
)
...
@@ -1162,7 +1162,7 @@ bool decode_f1ap_du_configuration_update(const F1AP_F1AP_PDU_t *pdu, f1ap_gnb_du
...
@@ -1162,7 +1162,7 @@ bool decode_f1ap_du_configuration_update(const F1AP_F1AP_PDU_t *pdu, f1ap_gnb_du
/* Old NR CGI (M) */
/* Old NR CGI (M) */
F1AP_NRCGI_t
*
oldNRCGI
=
&
served_cells_item
->
oldNRCGI
;
F1AP_NRCGI_t
*
oldNRCGI
=
&
served_cells_item
->
oldNRCGI
;
f1ap_plmn_t
*
old_plmn
=
&
out
->
cell_to_modify
[
i
].
old_plmn
;
f1ap_plmn_t
*
old_plmn
=
&
out
->
cell_to_modify
[
i
].
old_plmn
;
TBCD_TO_MCC_MNC
(
&
(
oldNRCGI
->
pLMN_Identity
)
,
old_plmn
->
mcc
,
old_plmn
->
mnc
,
old_plmn
->
mnc_digit_length
);
PLMNID_TO_MCC_MNC
(
&
oldNRCGI
->
pLMN_Identity
,
old_plmn
->
mcc
,
old_plmn
->
mnc
,
old_plmn
->
mnc_digit_length
);
/* Old NR CGI Cell ID */
/* Old NR CGI Cell ID */
BIT_STRING_TO_NR_CELL_IDENTITY
(
&
oldNRCGI
->
nRCellIdentity
,
out
->
cell_to_modify
[
i
].
old_nr_cellid
);
BIT_STRING_TO_NR_CELL_IDENTITY
(
&
oldNRCGI
->
nRCellIdentity
,
out
->
cell_to_modify
[
i
].
old_nr_cellid
);
/* Served Cell Information (M) */
/* Served Cell Information (M) */
...
@@ -1186,7 +1186,7 @@ bool decode_f1ap_du_configuration_update(const F1AP_F1AP_PDU_t *pdu, f1ap_gnb_du
...
@@ -1186,7 +1186,7 @@ bool decode_f1ap_du_configuration_update(const F1AP_F1AP_PDU_t *pdu, f1ap_gnb_du
F1AP_NRCGI_t
*
oldNRCGI
=
&
served_cells_item
->
oldNRCGI
;
F1AP_NRCGI_t
*
oldNRCGI
=
&
served_cells_item
->
oldNRCGI
;
f1ap_plmn_t
*
plmn
=
&
out
->
cell_to_delete
[
i
].
plmn
;
f1ap_plmn_t
*
plmn
=
&
out
->
cell_to_delete
[
i
].
plmn
;
/* Old NR CGI (M) */
/* Old NR CGI (M) */
TBC
D_TO_MCC_MNC
(
&
(
oldNRCGI
->
pLMN_Identity
),
plmn
->
mcc
,
plmn
->
mnc
,
plmn
->
mnc_digit_length
);
PLMNI
D_TO_MCC_MNC
(
&
(
oldNRCGI
->
pLMN_Identity
),
plmn
->
mcc
,
plmn
->
mnc
,
plmn
->
mnc_digit_length
);
// NR cellID
// NR cellID
BIT_STRING_TO_NR_CELL_IDENTITY
(
&
oldNRCGI
->
nRCellIdentity
,
out
->
cell_to_delete
[
i
].
nr_cellid
);
BIT_STRING_TO_NR_CELL_IDENTITY
(
&
oldNRCGI
->
nRCellIdentity
,
out
->
cell_to_delete
[
i
].
nr_cellid
);
}
}
...
@@ -1541,7 +1541,7 @@ bool decode_f1ap_cu_configuration_update_acknowledge(const F1AP_F1AP_PDU_t *pdu,
...
@@ -1541,7 +1541,7 @@ bool decode_f1ap_cu_configuration_update_acknowledge(const F1AP_F1AP_PDU_t *pdu,
const
F1AP_Cells_Failed_to_be_Activated_List_Item_t
*
item
=
&
itemIE
->
value
.
choice
.
Cells_Failed_to_be_Activated_List_Item
;
const
F1AP_Cells_Failed_to_be_Activated_List_Item_t
*
item
=
&
itemIE
->
value
.
choice
.
Cells_Failed_to_be_Activated_List_Item
;
// NR CGI (M)
// NR CGI (M)
f1ap_plmn_t
*
plmn
=
&
out
->
cells_failed_to_be_activated
[
j
].
plmn
;
f1ap_plmn_t
*
plmn
=
&
out
->
cells_failed_to_be_activated
[
j
].
plmn
;
TBC
D_TO_MCC_MNC
(
&
(
item
->
nRCGI
.
pLMN_Identity
),
plmn
->
mcc
,
plmn
->
mnc
,
plmn
->
mnc_digit_length
);
PLMNI
D_TO_MCC_MNC
(
&
(
item
->
nRCGI
.
pLMN_Identity
),
plmn
->
mcc
,
plmn
->
mnc
,
plmn
->
mnc_digit_length
);
BIT_STRING_TO_NR_CELL_IDENTITY
(
&
item
->
nRCGI
.
nRCellIdentity
,
out
->
cells_failed_to_be_activated
[
j
].
nr_cellid
);
BIT_STRING_TO_NR_CELL_IDENTITY
(
&
item
->
nRCGI
.
nRCellIdentity
,
out
->
cells_failed_to_be_activated
[
j
].
nr_cellid
);
// Cause (M)
// Cause (M)
switch
(
item
->
cause
.
present
)
{
switch
(
item
->
cause
.
present
)
{
...
...
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