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
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
canghaiwuhen
OpenXG-RAN
Commits
14298413
Commit
14298413
authored
Sep 05, 2018
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix obvious warnings when building CU/DU tests
parent
b2583c6f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
40 deletions
+23
-40
openair2/F1AP/CU_F1AP.c
openair2/F1AP/CU_F1AP.c
+15
-24
openair2/F1AP/DU_F1AP.c
openair2/F1AP/DU_F1AP.c
+7
-15
openair2/F1AP/f1ap_handlers.c
openair2/F1AP/f1ap_handlers.c
+1
-1
No files found.
openair2/F1AP/CU_F1AP.c
View file @
14298413
...
...
@@ -84,7 +84,7 @@ uint8_t F1AP_get_next_transaction_identifier(module_id_t enb_mod_idP, module_id_
// ==============================================================================
void
F1AP_CU_task
()
{
void
F1AP_CU_task
(
void
)
{
printf
(
"Start F1AP CU task!
\n
"
);
sctp_cu_init
();
...
...
@@ -122,18 +122,16 @@ void F1AP_CU_task() {
// } // while
return
NULL
;
return
;
}
// ==============================================================================
//void CU_handle_F1_SETUP_REQUEST(struct F1AP_F1AP_PDU_t *message_p) {
void
CU_handle_F1_SETUP_REQUEST
()
{
void
CU_handle_F1_SETUP_REQUEST
(
F1AP_F1SetupRequest_t
*
message_p
)
{
F1AP_F1AP_PDU_t
pdu
;
uint8_t
*
buffer
;
uint32_t
len
;
int
ret
=
0
;
/* Receiver */
//f1ap_receiver(&buffer);
...
...
@@ -152,7 +150,7 @@ void CU_handle_F1_SETUP_REQUEST() {
}
void
CU_send_F1_SETUP_RESPONSE
()
{
void
CU_send_F1_SETUP_RESPONSE
(
void
)
{
//void CU_send_F1_SETUP_RESPONSE(F1AP_F1SetupResponse_t *F1SetupResponse) {
//AssertFatal(1==0,"Not implemented yet\n");
...
...
@@ -168,7 +166,6 @@ void CU_send_F1_SETUP_RESPONSE() {
uint8_t
*
buffer
;
uint32_t
len
;
int
ret
=
0
;
int
i
=
0
;
f1ap_info_t
f1ap_info
;
...
...
@@ -420,7 +417,7 @@ void CU_send_RESET_ACKKNOWLEDGE(F1AP_ResetAcknowledge_t *ResetAcknowledge) {
AssertFatal
(
1
==
0
,
"Not implemented yet
\n
"
);
}
void
CU_handle_UL_INITIAL_RRC_MESSAGE_TRANSFER
(
)
{
void
CU_handle_UL_INITIAL_RRC_MESSAGE_TRANSFER
(
void
)
{
printf
(
"CU_handle_UL_INITIAL_RRC_MESSAGE_TRANSFER
\n
"
);
// decode the F1 message
...
...
@@ -436,15 +433,13 @@ void CU_handle_UL_RRC_MESSAGE_TRANSFER(F1AP_ULRRCMessageTransfer_t *ULRRCMessage
}
//void CU_send_DL_RRC_MESSAGE_TRANSFER(F1AP_DLRRCMessageTransfer_t *DLRRCMessageTransfer) {
void
CU_send_DL_RRC_MESSAGE_TRANSFER
()
{
void
CU_send_DL_RRC_MESSAGE_TRANSFER
(
void
)
{
F1AP_F1AP_PDU_t
pdu
;
F1AP_DLRRCMessageTransfer_t
*
out
;
F1AP_DLRRCMessageTransferIEs_t
*
ie
;
uint8_t
*
buffer
;
uint32_t
len
;
int
ret
=
0
;
int
i
=
0
;
/* Create */
/* 0. Message Type */
...
...
@@ -534,7 +529,6 @@ void CU_send_DL_RRC_MESSAGE_TRANSFER() {
/* encode */
if
(
f1ap_encode_pdu
(
&
pdu
,
&
buffer
,
&
len
)
<
0
)
{
printf
(
"Failed to encode F1 setup request
\n
"
);
return
-
1
;
}
printf
(
"
\n
"
);
...
...
@@ -568,7 +562,6 @@ void CU_send_gNB_CU_CONFIGURATION_UPDATE(module_id_t enb_mod_idP, module_id_t du
uint8_t
*
buffer
;
uint32_t
len
;
int
ret
=
0
;
int
i
=
0
;
f1ap_info_t
f1ap_info
;
...
...
@@ -929,7 +922,7 @@ void CU_send_gNB_CU_CONFIGURATION_UPDATE(module_id_t enb_mod_idP, module_id_t du
/* encode */
if
(
f1ap_encode_pdu
(
&
pdu
,
&
buffer
,
&
len
)
<
0
)
{
printf
(
"Failed to encode F1 setup request
\n
"
);
return
-
1
;
return
;
}
printf
(
"
\n
"
);
...
...
@@ -950,14 +943,13 @@ void CU_send_gNB_CU_CONFIGURATION_UPDATE_ACKNOWLEDGE(F1AP_GNBCUConfigurationUpda
//void CU_send_UE_CONTEXT_SETUP_REQUEST(F1AP_UEContextSetupRequest_t *UEContextSetupRequest) {
void
CU_send_UE_CONTEXT_SETUP_REQUEST
()
{
void
CU_send_UE_CONTEXT_SETUP_REQUEST
(
void
)
{
F1AP_F1AP_PDU_t
pdu
;
F1AP_UEContextSetupRequest_t
*
out
;
F1AP_UEContextSetupRequestIEs_t
*
ie
;
uint8_t
*
buffer
;
uint32_t
len
;
int
ret
=
0
;
int
i
=
0
;
f1ap_info_t
f1ap_info
;
...
...
@@ -1263,16 +1255,16 @@ void CU_send_UE_CONTEXT_SETUP_REQUEST() {
/* OPTIONAL */
if
(
0
)
{
F1AP_InactivityMonitoringRequest_t
InactivityMonitoringRequest
;
F1AP_RAT_FrequencyPriorityInformation_t
RAT_FrequencyPriorityInformation
;
F1AP_RRCContainer_t
RRCContainer
;
F1AP_MaskedIMEISV_t
MaskedIMEISV
;
//
F1AP_InactivityMonitoringRequest_t InactivityMonitoringRequest;
//
F1AP_RAT_FrequencyPriorityInformation_t RAT_FrequencyPriorityInformation;
//
F1AP_RRCContainer_t RRCContainer;
//
F1AP_MaskedIMEISV_t MaskedIMEISV;
}
/* encode */
if
(
f1ap_encode_pdu
(
&
pdu
,
&
buffer
,
&
len
)
<
0
)
{
printf
(
"Failed to encode F1 setup request
\n
"
);
return
-
1
;
return
;
}
printf
(
"
\n
"
);
...
...
@@ -1308,14 +1300,13 @@ void CU_handle_UE_CONTEXT_RELEASE_COMPLETE(F1AP_UEContextReleaseComplete_t *UECo
}
//void CU_send_UE_CONTEXT_MODIFICATION_REQUEST(F1AP_UEContextModificationRequest_t *UEContextModificationRequest) {
void
CU_send_UE_CONTEXT_MODIFICATION_REQUEST
()
{
void
CU_send_UE_CONTEXT_MODIFICATION_REQUEST
(
void
)
{
F1AP_F1AP_PDU_t
pdu
;
F1AP_UEContextModificationRequest_t
*
out
;
F1AP_UEContextModificationRequestIEs_t
*
ie
;
uint8_t
*
buffer
;
uint32_t
len
;
int
ret
=
0
;
int
i
=
0
;
f1ap_info_t
f1ap_info
;
...
...
@@ -1771,7 +1762,7 @@ void CU_send_UE_CONTEXT_MODIFICATION_REQUEST() {
/* encode */
if
(
f1ap_encode_pdu
(
&
pdu
,
&
buffer
,
&
len
)
<
0
)
{
printf
(
"Failed to encode F1 setup request
\n
"
);
return
-
1
;
return
;
}
printf
(
"
\n
"
);
...
...
openair2/F1AP/DU_F1AP.c
View file @
14298413
...
...
@@ -93,7 +93,7 @@ uint8_t F1AP_get_UE_identifier(module_id_t enb_mod_idP, int CC_idP, int UE_id) {
// ==============================================================================
void
F1AP_DU_task
()
{
void
F1AP_DU_task
(
void
)
{
printf
(
"Start F1AP DU task!
\n
"
);
sctp_du_init
();
...
...
@@ -116,7 +116,7 @@ void F1AP_DU_task() {
// } // while
return
NULL
;
return
;
}
// ==============================================================================
...
...
@@ -136,7 +136,6 @@ void DU_send_F1_SETUP_REQUEST(module_id_t enb_mod_idP, module_id_t du_mod_idP) {
uint8_t
*
buffer
;
uint32_t
len
;
int
ret
=
0
;
int
i
=
0
;
// for test
...
...
@@ -607,8 +606,6 @@ void DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER(
uint8_t
*
buffer
;
uint32_t
len
;
int
ret
=
0
;
int
i
=
0
;
// for test
f1ap_info_t
f1ap_info
;
...
...
@@ -700,15 +697,13 @@ void DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER(
}
//void DU_send_UL_RRC_MESSAGE_TRANSFER(F1AP_ULRRCMessageTransfer_t *ULRRCMessageTransfer) {
void
DU_send_UL_RRC_MESSAGE_TRANSFER
()
{
void
DU_send_UL_RRC_MESSAGE_TRANSFER
(
void
)
{
F1AP_F1AP_PDU_t
pdu
;
F1AP_ULRRCMessageTransfer_t
*
out
;
F1AP_ULRRCMessageTransferIEs_t
*
ie
;
uint8_t
*
buffer
;
uint32_t
len
;
int
ret
=
0
;
int
i
=
0
;
/* Create */
/* 0. Message Type */
...
...
@@ -786,7 +781,6 @@ void DU_send_gNB_DU_CONFIGURATION_UPDATE(module_id_t enb_mod_idP, module_id_t du
uint8_t
*
buffer
;
uint32_t
len
;
int
ret
=
0
;
int
i
=
0
;
// for test
...
...
@@ -1263,14 +1257,13 @@ void DU_handle_UE_CONTEXT_SETUP_REQUEST(F1AP_UEContextSetupRequest_t *UEContextS
}
//void DU_send_UE_CONTEXT_SETUP_RESPONSE(F1AP_UEContextSetupResponse_t *UEContextSetupResponse) {
void
DU_send_UE_CONTEXT_SETUP_RESPONSE
()
{
void
DU_send_UE_CONTEXT_SETUP_RESPONSE
(
void
)
{
F1AP_F1AP_PDU_t
pdu
;
F1AP_UEContextSetupResponse_t
*
out
;
F1AP_UEContextSetupResponseIEs_t
*
ie
;
uint8_t
*
buffer
;
uint32_t
len
;
int
ret
=
0
;
int
i
=
0
;
f1ap_info_t
f1ap_info
;
...
...
@@ -1533,7 +1526,7 @@ void DU_send_UE_CONTEXT_SETUP_RESPONSE() {
/* encode */
if
(
f1ap_encode_pdu
(
&
pdu
,
&
buffer
,
&
len
)
<
0
)
{
printf
(
"Failed to encode F1 setup request
\n
"
);
return
-
1
;
return
;
}
printf
(
"
\n
"
);
...
...
@@ -1569,14 +1562,13 @@ void DU_handle_UE_CONTEXT_MODIFICATION_REQUEST(F1AP_UEContextModificationRequest
}
//void DU_send_UE_CONTEXT_MODIFICATION_RESPONSE(F1AP_UEContextModificationResponse_t *UEContextModificationResponse) {
void
DU_send_UE_CONTEXT_MODIFICATION_RESPONSE
()
{
void
DU_send_UE_CONTEXT_MODIFICATION_RESPONSE
(
void
)
{
F1AP_F1AP_PDU_t
pdu
;
F1AP_UEContextModificationResponse_t
*
out
;
F1AP_UEContextModificationResponseIEs_t
*
ie
;
uint8_t
*
buffer
;
uint32_t
len
;
int
ret
=
0
;
int
i
=
0
;
f1ap_info_t
f1ap_info
;
...
...
@@ -1922,7 +1914,7 @@ void DU_send_UE_CONTEXT_MODIFICATION_RESPONSE() {
/* encode */
if
(
f1ap_encode_pdu
(
&
pdu
,
&
buffer
,
&
len
)
<
0
)
{
printf
(
"Failed to encode F1 setup request
\n
"
);
return
-
1
;
return
;
}
printf
(
"
\n
"
);
...
...
openair2/F1AP/f1ap_handlers.c
View file @
14298413
...
...
@@ -83,7 +83,7 @@ f1ap_message_decoded_callback messages_callback[][3] = {
{
0
,
0
,
0
},
/* PWSFailureIndication */
};
char
*
f1ap_direction2String
(
int
f1ap_dir
)
{
c
onst
c
har
*
f1ap_direction2String
(
int
f1ap_dir
)
{
static
const
char
*
f1ap_direction_String
[]
=
{
""
,
/* Nothing */
"Initiating message"
,
/* initiating message */
...
...
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