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
3a5ace00
Commit
3a5ace00
authored
Aug 29, 2024
by
Guido Casati
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use F1AP lib for F1 Setup Response in stack
parent
df2c92e6
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
301 deletions
+24
-301
openair2/F1AP/f1ap_cu_interface_management.c
openair2/F1AP/f1ap_cu_interface_management.c
+11
-127
openair2/F1AP/f1ap_du_interface_management.c
openair2/F1AP/f1ap_du_interface_management.c
+6
-170
openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.c
openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.c
+5
-4
openair2/RRC/NR/mac_rrc_dl_f1ap.c
openair2/RRC/NR/mac_rrc_dl_f1ap.c
+2
-0
No files found.
openair2/F1AP/f1ap_cu_interface_management.c
View file @
3a5ace00
...
...
@@ -102,142 +102,26 @@ int CU_handle_F1_SETUP_REQUEST(instance_t instance, sctp_assoc_t assoc_id, uint3
return
0
;
}
/**
* @brief F1AP Setup Response encoding (9.2.1.5 of 3GPP TS 38.473) and message transfer
*/
int
CU_send_F1_SETUP_RESPONSE
(
sctp_assoc_t
assoc_id
,
f1ap_setup_resp_t
*
f1ap_setup_resp
)
{
F1AP_F1AP_PDU_t
pdu
=
{
0
};
uint8_t
*
buffer
=
NULL
;
uint32_t
len
=
0
;
/* Create */
/* 0. Message Type */
pdu
.
present
=
F1AP_F1AP_PDU_PR_successfulOutcome
;
asn1cCalloc
(
pdu
.
choice
.
successfulOutcome
,
tmp
);
tmp
->
procedureCode
=
F1AP_ProcedureCode_id_F1Setup
;
tmp
->
criticality
=
F1AP_Criticality_reject
;
tmp
->
value
.
present
=
F1AP_SuccessfulOutcome__value_PR_F1SetupResponse
;
F1AP_F1SetupResponse_t
*
out
=
&
pdu
.
choice
.
successfulOutcome
->
value
.
choice
.
F1SetupResponse
;
/* mandatory */
/* c1. Transaction ID (integer value)*/
asn1cSequenceAdd
(
out
->
protocolIEs
.
list
,
F1AP_F1SetupResponseIEs_t
,
ie1
);
ie1
->
id
=
F1AP_ProtocolIE_ID_id_TransactionID
;
ie1
->
criticality
=
F1AP_Criticality_reject
;
ie1
->
value
.
present
=
F1AP_F1SetupResponseIEs__value_PR_TransactionID
;
ie1
->
value
.
choice
.
TransactionID
=
f1ap_setup_resp
->
transaction_id
;
uint32_t
len
=
0
;
/* optional */
/* c2. GNB_CU_Name */
if
(
f1ap_setup_resp
->
gNB_CU_name
!=
NULL
)
{
asn1cSequenceAdd
(
out
->
protocolIEs
.
list
,
F1AP_F1SetupResponseIEs_t
,
ie2
);
ie2
->
id
=
F1AP_ProtocolIE_ID_id_gNB_CU_Name
;
ie2
->
criticality
=
F1AP_Criticality_ignore
;
ie2
->
value
.
present
=
F1AP_F1SetupResponseIEs__value_PR_GNB_CU_Name
;
OCTET_STRING_fromBuf
(
&
ie2
->
value
.
choice
.
GNB_CU_Name
,
f1ap_setup_resp
->
gNB_CU_name
,
strlen
(
f1ap_setup_resp
->
gNB_CU_name
));
}
/* mandatory */
/* c3. cells to be Activated list */
int
num_cells_to_activate
=
f1ap_setup_resp
->
num_cells_to_activate
;
LOG_D
(
F1AP
,
"num_cells_to_activate = %d
\n
"
,
num_cells_to_activate
);
if
(
num_cells_to_activate
>
0
)
{
asn1cSequenceAdd
(
out
->
protocolIEs
.
list
,
F1AP_F1SetupResponseIEs_t
,
ie3
);
ie3
->
id
=
F1AP_ProtocolIE_ID_id_Cells_to_be_Activated_List
;
ie3
->
criticality
=
F1AP_Criticality_reject
;
ie3
->
value
.
present
=
F1AP_F1SetupResponseIEs__value_PR_Cells_to_be_Activated_List
;
for
(
int
i
=
0
;
i
<
num_cells_to_activate
;
i
++
)
{
asn1cSequenceAdd
(
ie3
->
value
.
choice
.
Cells_to_be_Activated_List
.
list
,
F1AP_Cells_to_be_Activated_List_ItemIEs_t
,
cells_to_be_activated_ies
);
cells_to_be_activated_ies
->
id
=
F1AP_ProtocolIE_ID_id_Cells_to_be_Activated_List_Item
;
cells_to_be_activated_ies
->
criticality
=
F1AP_Criticality_reject
;
cells_to_be_activated_ies
->
value
.
present
=
F1AP_Cells_to_be_Activated_List_ItemIEs__value_PR_Cells_to_be_Activated_List_Item
;
/* 3.1 cells to be Activated list item */
F1AP_Cells_to_be_Activated_List_Item_t
*
cells_to_be_activated_item
=
&
cells_to_be_activated_ies
->
value
.
choice
.
Cells_to_be_Activated_List_Item
;
/* - nRCGI */
addnRCGI
(
cells_to_be_activated_item
->
nRCGI
,
f1ap_setup_resp
->
cells_to_activate
+
i
);
/* optional */
/* - nRPCI */
if
(
1
)
{
cells_to_be_activated_item
->
nRPCI
=
(
F1AP_NRPCI_t
*
)
calloc
(
1
,
sizeof
(
F1AP_NRPCI_t
));
*
cells_to_be_activated_item
->
nRPCI
=
f1ap_setup_resp
->
cells_to_activate
[
i
].
nrpci
;
// int 0..1007
}
/* optional */
/* - gNB-CU System Information */
if
(
f1ap_setup_resp
->
cells_to_activate
[
i
].
num_SI
>
0
)
{
/* 3.1.2 gNB-CUSystem Information */
F1AP_ProtocolExtensionContainer_10696P112_t
*
p
=
calloc
(
1
,
sizeof
(
*
p
));
cells_to_be_activated_item
->
iE_Extensions
=
(
struct
F1AP_ProtocolExtensionContainer
*
)
p
;
asn1cSequenceAdd
(
p
->
list
,
F1AP_Cells_to_be_Activated_List_ItemExtIEs_t
,
cells_to_be_activated_itemExtIEs
);
cells_to_be_activated_itemExtIEs
->
id
=
F1AP_ProtocolIE_ID_id_gNB_CUSystemInformation
;
cells_to_be_activated_itemExtIEs
->
criticality
=
F1AP_Criticality_reject
;
cells_to_be_activated_itemExtIEs
->
extensionValue
.
present
=
F1AP_Cells_to_be_Activated_List_ItemExtIEs__extensionValue_PR_GNB_CUSystemInformation
;
F1AP_GNB_CUSystemInformation_t
*
gNB_CUSystemInformation
=
&
cells_to_be_activated_itemExtIEs
->
extensionValue
.
choice
.
GNB_CUSystemInformation
;
// for (int sIBtype=2;sIBtype<33;sIBtype++) { //21 ? 33 ?
for
(
int
sIBtype
=
2
;
sIBtype
<
21
;
sIBtype
++
)
{
for
(
int
n
=
0
;
n
<
f1ap_setup_resp
->
cells_to_activate
[
i
].
num_SI
;
n
++
)
{
if
(
f1ap_setup_resp
->
cells_to_activate
[
i
].
SI_msg
[
n
].
SI_container
!=
NULL
)
{
if
(
f1ap_setup_resp
->
cells_to_activate
[
i
].
SI_msg
[
n
].
SI_type
>
6
&&
f1ap_setup_resp
->
cells_to_activate
[
i
].
SI_msg
[
n
].
SI_type
!=
9
)
{
asn1cSequenceAdd
(
gNB_CUSystemInformation
->
sibtypetobeupdatedlist
.
list
,
F1AP_SibtypetobeupdatedListItem_t
,
sib_item
);
sib_item
->
sIBtype
=
f1ap_setup_resp
->
cells_to_activate
[
i
].
SI_msg
[
n
].
SI_type
;
OCTET_STRING_fromBuf
(
&
sib_item
->
sIBmessage
,
(
const
char
*
)
f1ap_setup_resp
->
cells_to_activate
[
i
].
SI_msg
[
n
].
SI_container
,
f1ap_setup_resp
->
cells_to_activate
[
i
].
SI_msg
[
n
].
SI_container_length
);
LOG_D
(
F1AP
,
"f1ap_setup_resp->cells_to_activate[%d].SI_msg[%d].SI_container_length = %d
\n
"
,
i
,
n
,
f1ap_setup_resp
->
cells_to_activate
[
i
].
SI_msg
[
n
].
SI_container_length
);
}
}
}
}
}
}
}
/* c5. RRC VERSION */
asn1cSequenceAdd
(
out
->
protocolIEs
.
list
,
F1AP_F1SetupResponseIEs_t
,
ie4
);
ie4
->
id
=
F1AP_ProtocolIE_ID_id_GNB_CU_RRC_Version
;
ie4
->
criticality
=
F1AP_Criticality_reject
;
ie4
->
value
.
present
=
F1AP_F1SetupResponseIEs__value_PR_RRC_Version
;
// RRC Version: "This IE is not used in this release."
// we put one bit for each byte in rrc_ver that is != 0
uint8_t
bits
=
0
;
for
(
int
i
=
0
;
i
<
3
;
++
i
)
bits
|=
(
f1ap_setup_resp
->
rrc_ver
[
i
]
!=
0
)
<<
i
;
BIT_STRING_t
*
bs
=
&
ie4
->
value
.
choice
.
RRC_Version
.
latest_RRC_Version
;
bs
->
buf
=
calloc
(
1
,
sizeof
(
char
));
AssertFatal
(
bs
->
buf
!=
NULL
,
"out of memory
\n
"
);
bs
->
buf
[
0
]
=
bits
;
bs
->
size
=
1
;
bs
->
bits_unused
=
5
;
F1AP_ProtocolExtensionContainer_10696P228_t
*
p
=
(
F1AP_ProtocolExtensionContainer_10696P228_t
*
)
calloc
(
1
,
sizeof
(
F1AP_ProtocolExtensionContainer_10696P228_t
));
asn1cSequenceAdd
(
p
->
list
,
F1AP_RRC_Version_ExtIEs_t
,
rrcv_ext
);
rrcv_ext
->
id
=
F1AP_ProtocolIE_ID_id_latest_RRC_Version_Enhanced
;
rrcv_ext
->
criticality
=
F1AP_Criticality_ignore
;
rrcv_ext
->
extensionValue
.
present
=
F1AP_RRC_Version_ExtIEs__extensionValue_PR_OCTET_STRING_SIZE_3_
;
OCTET_STRING_t
*
os
=
&
rrcv_ext
->
extensionValue
.
choice
.
OCTET_STRING_SIZE_3_
;
os
->
size
=
3
;
os
->
buf
=
malloc
(
3
*
sizeof
(
*
os
->
buf
));
AssertFatal
(
os
->
buf
!=
NULL
,
"out of memory
\n
"
);
for
(
int
i
=
0
;
i
<
3
;
++
i
)
os
->
buf
[
i
]
=
f1ap_setup_resp
->
rrc_ver
[
i
];
ie4
->
value
.
choice
.
RRC_Version
.
iE_Extensions
=
(
struct
F1AP_ProtocolExtensionContainer
*
)
p
;
/* Encode F1 Setup Response */
F1AP_F1AP_PDU_t
*
pdu
=
encode_f1ap_setup_response
(
f1ap_setup_resp
);
/* Free after encode */
free_f1ap_setup_response
(
f1ap_setup_resp
);
/* encode */
if
(
f1ap_encode_pdu
(
&
pdu
,
&
buffer
,
&
len
)
<
0
)
{
if
(
f1ap_encode_pdu
(
pdu
,
&
buffer
,
&
len
)
<
0
)
{
LOG_E
(
F1AP
,
"Failed to encode F1 setup response
\n
"
);
ASN_STRUCT_FREE
(
asn_DEF_F1AP_F1AP_PDU
,
pdu
);
return
-
1
;
}
ASN_STRUCT_RESET
(
asn_DEF_F1AP_F1AP_PDU
,
&
pdu
);
ASN_STRUCT_FREE
(
asn_DEF_F1AP_F1AP_PDU
,
pdu
);
f1ap_itti_send_sctp_data_req
(
assoc_id
,
buffer
,
len
);
return
0
;
}
...
...
openair2/F1AP/f1ap_du_interface_management.c
View file @
3a5ace00
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.c
View file @
3a5ace00
...
...
@@ -28,6 +28,7 @@
#include "F1AP_CauseRadioNetwork.h"
#include "openair3/ocp-gtpu/gtp_itf.h"
#include "openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.h"
#include "lib/f1ap_interface_management.h"
#include "executables/softmodem-common.h"
...
...
@@ -169,10 +170,10 @@ void f1_setup_response(const f1ap_setup_resp_t *resp)
mac
->
f1_config
.
setup_resp
=
malloc
(
sizeof
(
*
mac
->
f1_config
.
setup_resp
));
AssertFatal
(
mac
->
f1_config
.
setup_resp
!=
NULL
,
"out of memory
\n
"
);
*
mac
->
f1_config
.
setup_resp
=
*
resp
;
if
(
resp
->
gNB_CU_name
)
mac
->
f1_config
.
setup_resp
->
gNB_CU_name
=
strdup
(
resp
->
gNB_CU_name
);
// Copy F1AP message
*
mac
->
f1_config
.
setup_resp
=
cp_f1ap_setup_response
(
resp
);
// free F1AP message after copy
free_f1ap_setup_response
(
resp
);
NR_SCHED_UNLOCK
(
&
mac
->
sched_lock
);
// NOTE: Before accepting any UEs, we should initialize the UE states.
...
...
openair2/RRC/NR/mac_rrc_dl_f1ap.c
View file @
3a5ace00
...
...
@@ -24,6 +24,7 @@
#include "mac_rrc_dl.h"
#include "nr_rrc_defs.h"
#include "openair2/F1AP/lib/f1ap_rrc_message_transfer.h"
#include "openair2/F1AP/lib/f1ap_interface_management.h"
static
void
f1_reset_cu_initiated_f1ap
(
sctp_assoc_t
assoc_id
,
const
f1ap_reset_t
*
reset
)
{
...
...
@@ -45,6 +46,7 @@ static void f1_setup_response_f1ap(sctp_assoc_t assoc_id, const f1ap_setup_resp_
*
f1ap_msg
=
*
resp
;
if
(
resp
->
gNB_CU_name
!=
NULL
)
f1ap_msg
->
gNB_CU_name
=
strdup
(
resp
->
gNB_CU_name
);
free_f1ap_setup_response
(
resp
);
itti_send_msg_to_task
(
TASK_CU_F1
,
0
,
msg
);
}
...
...
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