Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
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 UE
Commits
2a68855c
Commit
2a68855c
authored
Aug 09, 2021
by
Laurent THOMAS
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix a regression I made
parent
6195e797
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
43 additions
and
18 deletions
+43
-18
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+4
-4
openair2/F1AP/f1ap_du_interface_management.c
openair2/F1AP/f1ap_du_interface_management.c
+36
-11
openair2/F1AP/f1ap_handlers.c
openair2/F1AP/f1ap_handlers.c
+3
-2
openair3/S1AP/s1ap_common.h
openair3/S1AP/s1ap_common.h
+0
-1
No files found.
cmake_targets/CMakeLists.txt
View file @
2a68855c
...
...
@@ -345,12 +345,12 @@ endif ()
add_definitions
(
"-DASN_DISABLE_OER_SUPPORT"
)
#########################
set
(
CMAKE_EXE_LINKER_FLAGS
"
${
CMAKE_EXE_LINKER_FLAGS
}
-Wl,-rpath -Wl,
${
CMAKE_CURRENT_BINARY_DIR
}
"
)
set
(
CMAKE_EXE_LINKER_FLAGS
"
${
CMAKE_EXE_LINKER_FLAGS
}
-
ggdb3 -
Wl,-rpath -Wl,
${
CMAKE_CURRENT_BINARY_DIR
}
"
)
#########################
# set a flag for changes in the source code
# these changes are related to hardcoded path to include .h files
set
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS
}
-g3 -Og -DMALLOC_CHECK_=3"
)
set
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"
${
CMAKE_C_FLAGS
}
-g3 -DMALLOC_CHECK_=3 -O2 -fno-delete-null-pointer-checks"
)
set
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS
}
-g
gdb
3 -Og -DMALLOC_CHECK_=3"
)
set
(
CMAKE_C_FLAGS_RELWITHDEBINFO
"
${
CMAKE_C_FLAGS
}
-g
gdb
3 -DMALLOC_CHECK_=3 -O2 -fno-delete-null-pointer-checks"
)
set
(
CMAKE_C_FLAGS_RELEASE
"
${
CMAKE_C_FLAGS
}
-O3"
)
set
(
GIT_BRANCH
"UNKNOWN"
)
...
...
openair2/F1AP/f1ap_du_interface_management.c
View file @
2a68855c
...
...
@@ -300,7 +300,6 @@ int DU_send_F1_SETUP_REQUEST(instance_t instance) {
/* mandatory */
/* c5. RRC VERSION */
if
(
RC
.
nrrrc
)
{
asn1cSequenceAdd
(
f1Setup
->
protocolIEs
.
list
,
F1AP_F1SetupRequestIEs_t
,
ie2
);
ie2
->
id
=
F1AP_ProtocolIE_ID_id_GNB_DU_RRC_Version
;
ie2
->
criticality
=
F1AP_Criticality_reject
;
...
...
@@ -309,7 +308,6 @@ int DU_send_F1_SETUP_REQUEST(instance_t instance) {
ie2
->
value
.
choice
.
RRC_Version
.
latest_RRC_Version
.
buf
[
0
]
=
0xe0
;
ie2
->
value
.
choice
.
RRC_Version
.
latest_RRC_Version
.
size
=
1
;
ie2
->
value
.
choice
.
RRC_Version
.
latest_RRC_Version
.
bits_unused
=
5
;
}
/* encode */
if
(
f1ap_encode_pdu
(
&
pdu
,
&
buffer
,
&
len
)
<
0
)
{
...
...
@@ -474,6 +472,7 @@ int DU_handle_F1_SETUP_RESPONSE(instance_t instance,
}
// for IE
AssertFatal
(
TransactionId
!=-
1
,
"TransactionId was not sent
\n
"
);
LOG_D
(
F1AP
,
"F1AP: num_cells_to_activate %d
\n
"
,
num_cells_to_activate
);
F1AP_SETUP_RESP
(
msg_p
).
num_cells_to_activate
=
num_cells_to_activate
;
// tmp
...
...
@@ -481,10 +480,19 @@ int DU_handle_F1_SETUP_RESPONSE(instance_t instance,
for
(
int
i
=
0
;
i
<
num_cells_to_activate
;
i
++
)
AssertFatal
(
F1AP_SETUP_RESP
(
msg_p
).
cells_to_activate
[
i
].
num_SI
>
0
,
"System Information %d is missing"
,
i
);
MSC_LOG_RX_MESSAGE
(
MSC_F1AP_DU
,
MSC_F1AP_CU
,
0
,
0
,
MSC_AS_TIME_FMT
" DU_handle_F1_SETUP_RESPONSE successfulOutcome assoc_id %d"
,
0
,
0
,
//MSC_AS_TIME_ARGS(ctxt_pP),
assoc_id
);
LOG_D
(
F1AP
,
"Sending F1AP_SETUP_RESP ITTI message
\n
"
);
itti_send_msg_to_task
(
TASK_F1APP
,
GNB_MODULE_ID_TO_INSTANCE
(
assoc_id
),
msg_p
);
return
0
;
}
// SETUP FAILURE
int
DU_handle_F1_SETUP_FAILURE
(
instance_t
instance
,
uint32_t
assoc_id
,
...
...
@@ -509,9 +517,12 @@ int DU_handle_F1_SETUP_FAILURE(instance_t instance,
return
0
;
}
/*
gNB-DU Configuration Update
*/
//void DU_send_gNB_DU_CONFIGURATION_UPDATE(F1AP_GNBDUConfigurationUpdate_t *GNBDUConfigurationUpdate) {
int
DU_send_gNB_DU_CONFIGURATION_UPDATE
(
instance_t
instance
,
instance_t
du_mod_idP
,
...
...
@@ -749,14 +760,16 @@ int DU_handle_gNB_DU_CONFIGURATION_FAILURE(instance_t instance,
F1AP_F1AP_PDU_t
*
pdu
)
{
AssertFatal
(
1
==
0
,
"Not implemented yet
\n
"
);
}
int
DU_handle_gNB_DU_CONFIGURATION_UPDATE_ACKNOWLEDGE
(
instance_t
instance
,
uint32_t
assoc_id
,
uint32_t
stream
,
F1AP_F1AP_PDU_t
*
pdu
)
{
AssertFatal
(
1
==
0
,
"Not implemented yet
\n
"
);
}
int
DU_handle_gNB_CU_CONFIGURATION_UPDATE
(
instance_t
instance
,
int
DU_handle_gNB_CU_CONFIGURATION_UPDATE
(
instance_t
instance
,
uint32_t
assoc_id
,
uint32_t
stream
,
F1AP_F1AP_PDU_t
*
pdu
)
{
...
...
@@ -894,6 +907,14 @@ int DU_handle_gNB_CU_CONFIGURATION_UPDATE(instance_t instance,
AssertFatal
(
TransactionId
!=-
1
,
"TransactionId was not sent
\n
"
);
LOG_D
(
F1AP
,
"F1AP: num_cells_to_activate %d
\n
"
,
num_cells_to_activate
);
F1AP_GNB_CU_CONFIGURATION_UPDATE
(
msg_p
).
num_cells_to_activate
=
num_cells_to_activate
;
MSC_LOG_RX_MESSAGE
(
MSC_F1AP_DU
,
MSC_F1AP_CU
,
0
,
0
,
MSC_AS_TIME_FMT
" DU_handle_GNB_CU_CONFIGURATION_UPDATE initiatingMessage assoc_id %d"
,
0
,
0
,
//MSC_AS_TIME_ARGS(ctxt_pP),
assoc_id
);
LOG_D
(
F1AP
,
"Sending F1AP_GNB_CU_CONFIGURATION_UPDATE ITTI message
\n
"
);
itti_send_msg_to_task
(
TASK_F1APP
,
GNB_MODULE_ID_TO_INSTANCE
(
assoc_id
),
msg_p
);
return
0
;
...
...
@@ -904,6 +925,7 @@ int DU_send_gNB_CU_CONFIGURATION_UPDATE_FAILURE(instance_t instance,
AssertFatal
(
1
==
0
,
"received gNB CU CONFIGURATION UPDATE FAILURE with cause %d
\n
"
,
GNBCUConfigurationUpdateFailure
->
cause
);
}
int
DU_send_gNB_CU_CONFIGURATION_UPDATE_ACKNOWLEDGE
(
instance_t
instance
,
f1ap_gnb_cu_configuration_update_acknowledge_t
*
GNBCUConfigurationUpdateAcknowledge
)
{
AssertFatal
(
GNBCUConfigurationUpdateAcknowledge
->
num_cells_failed_to_be_activated
==
0
,
...
...
@@ -947,10 +969,13 @@ int DU_send_gNB_CU_CONFIGURATION_UPDATE_ACKNOWLEDGE(instance_t instance,
f1ap_itti_send_sctp_data_req
(
false
,
instance
,
buffer
,
len
,
0
);
return
0
;
}
int
DU_send_gNB_DU_RESOURCE_COORDINATION_REQUEST
(
instance_t
instance
,
F1AP_GNBDUResourceCoordinationRequest_t
*
GNBDUResourceCoordinationRequest
)
{
AssertFatal
(
0
,
"Not implemented yet
\n
"
);
}
int
DU_handle_gNB_DU_RESOURCE_COORDINATION_RESPONSE
(
instance_t
instance
,
uint32_t
assoc_id
,
uint32_t
stream
,
...
...
openair2/F1AP/f1ap_handlers.c
View file @
2a68855c
...
...
@@ -91,8 +91,9 @@ int f1ap_handle_message(instance_t instance, uint32_t assoc_id, int32_t stream,
}
/* Checking procedure Code and direction of message */
if
(
pdu
.
choice
.
initiatingMessage
->
procedureCode
>=
sizeof
(
f1ap_message_processing_t
)
/
(
3
*
sizeof
(
f1ap_message_processing_t
))
if
(
pdu
.
choice
.
initiatingMessage
->
procedureCode
>=
sizeof
(
f1ap_messages_processing
)
/
(
3
*
sizeof
(
f1ap_message_processing_t
))
||
(
pdu
.
present
>
F1AP_F1AP_PDU_PR_unsuccessfulOutcome
))
{
LOG_E
(
F1AP
,
"[SCTP %d] Either procedureCode %ld or direction %d exceed expected
\n
"
,
assoc_id
,
pdu
.
choice
.
initiatingMessage
->
procedureCode
,
pdu
.
present
);
...
...
openair3/S1AP/s1ap_common.h
View file @
2a68855c
...
...
@@ -82,7 +82,6 @@ extern int asn1_xer_print;
# define S1AP_INFO(x, args...) LOG_I(S1AP, x, ##args)
# define S1AP_DEBUG(x, args...) LOG_I(S1AP, x, ##args)
#else
# include "mme_default_values.h"
# define S1AP_ERROR(x, args...) do { fprintf(stdout, "[S1AP][E]"x, ##args); } while(0)
# define S1AP_WARN(x, args...) do { fprintf(stdout, "[S1AP][W]"x, ##args); } while(0)
# define S1AP_TRAF(x, args...) do { fprintf(stdout, "[S1AP][T]"x, ##args); } while(0)
...
...
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