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
f4633ba2
Commit
f4633ba2
authored
Sep 14, 2018
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correctly add headers for RRC message transfer, remove warnings
parent
911e738f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
57 additions
and
16 deletions
+57
-16
openair2/F1AP/f1ap_cu_rrc_message_transfer.c
openair2/F1AP/f1ap_cu_rrc_message_transfer.c
+16
-8
openair2/F1AP/f1ap_cu_rrc_message_transfer.h
openair2/F1AP/f1ap_cu_rrc_message_transfer.h
+13
-4
openair2/F1AP/f1ap_du_rrc_message_transfer.c
openair2/F1AP/f1ap_du_rrc_message_transfer.c
+12
-3
openair2/F1AP/f1ap_du_rrc_message_transfer.h
openair2/F1AP/f1ap_du_rrc_message_transfer.h
+16
-1
No files found.
openair2/F1AP/f1ap_cu_rrc_message_transfer.c
View file @
f4633ba2
...
...
@@ -31,6 +31,9 @@
*/
#include "f1ap_common.h"
#include "f1ap_encoder.h"
#include "f1ap_decoder.h"
#include "f1ap_itti_messaging.h"
#include "f1ap_cu_rrc_message_transfer.h"
// undefine C_RNTI from
// openair1/PHY/LTE_TRANSPORT/transport_common.h which
...
...
@@ -42,7 +45,8 @@
Initial UL RRC Message Transfer
*/
int
CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER
(
int32_t
assoc_id
,
int
CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER
(
instance_t
instance
,
uint32_t
assoc_id
,
uint32_t
stream
,
F1AP_F1AP_PDU_t
*
pdu
)
{
...
...
@@ -54,13 +58,10 @@ int CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER(int32_t assoc_id,
F1AP_InitialULRRCMessageTransfer_t
*
container
;
F1AP_InitialULRRCMessageTransferIEs_t
*
ie
;
SRB_INFO
*
Srb_info
;
protocol_ctxt_t
ctxt
;
rnti_t
rnti
;
uint8_t
*
ccch_sdu
;
sdu_size_t
ccch_sdu_len
;
int
CC_id
=
0
;
int
instance
=
0
;
uint64_t
du_ue_f1ap_id
;
DevAssert
(
pdu
!=
NULL
);
...
...
@@ -82,7 +83,6 @@ int CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER(int32_t assoc_id,
/* NRCGI */
F1AP_FIND_PROTOCOLIE_BY_ID
(
F1AP_InitialULRRCMessageTransferIEs_t
,
ie
,
container
,
F1AP_ProtocolIE_ID_id_NRCGI
,
true
);
instance
=
0
;
///ie->value.choice. ?? //@Todo
/* RNTI */
F1AP_FIND_PROTOCOLIE_BY_ID
(
F1AP_InitialULRRCMessageTransferIEs_t
,
ie
,
container
,
...
...
@@ -140,6 +140,8 @@ int CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER(int32_t assoc_id,
*/
// if size > 0
// CU_send_DL_RRC_MESSAGE_TRANSFER(C.rrc[ctxt_pP->module_id]->carrier[CC_id].Srb0.Tx_buffer.Payload, RC.rrc[ctxt_pP->module_id]->carrier[CC_id].Srb0.Tx_buffer.payload_size)
return
0
;
}
...
...
@@ -148,7 +150,7 @@ int CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER(int32_t assoc_id,
*/
//void CU_send_DL_RRC_MESSAGE_TRANSFER(F1AP_DLRRCMessageTransfer_t *DLRRCMessageTransfer) {
void
CU_send_DL_RRC_MESSAGE_TRANSFER
(
void
)
{
int
CU_send_DL_RRC_MESSAGE_TRANSFER
(
instance_t
instance
)
{
F1AP_F1AP_PDU_t
pdu
;
F1AP_DLRRCMessageTransfer_t
*
out
;
F1AP_DLRRCMessageTransferIEs_t
*
ie
;
...
...
@@ -244,6 +246,7 @@ void CU_send_DL_RRC_MESSAGE_TRANSFER(void) {
/* encode */
if
(
f1ap_encode_pdu
(
&
pdu
,
&
buffer
,
&
len
)
<
0
)
{
printf
(
"Failed to encode F1 setup request
\n
"
);
return
-
1
;
}
printf
(
"
\n
"
);
...
...
@@ -251,14 +254,19 @@ void CU_send_DL_RRC_MESSAGE_TRANSFER(void) {
/* decode */
if
(
f1ap_decode_pdu
(
&
pdu
,
buffer
,
len
)
>
0
)
{
printf
(
"Failed to decode F1 setup request
\n
"
);
return
-
1
;
}
//AssertFatal(1==0,"Not implemented yet\n");
return
0
;
}
/*
UL RRC Message Transfer
*/
void
CU_handle_UL_RRC_MESSAGE_TRANSFER
(
F1AP_ULRRCMessageTransfer_t
*
ULRRCMessageTransfer
)
{
int
CU_handle_UL_RRC_MESSAGE_TRANSFER
(
instance_t
instance
,
uint32_t
assoc_id
,
uint32_t
stream
,
F1AP_F1AP_PDU_t
*
pdu
)
{
AssertFatal
(
1
==
0
,
"Not implemented yet
\n
"
);
}
openair2/F1AP/f1ap_cu_rrc_message_transfer.h
View file @
f4633ba2
...
...
@@ -33,7 +33,16 @@
#ifndef F1AP_CU_RRC_MESSAGE_TRANSFER_H_
#define F1AP_CU_RRC_MESSAGE_TRANSFER_H_
int
CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER
(
int32_t
assoc_id
,
int
CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER
(
instance_t
instance
,
uint32_t
assoc_id
,
uint32_t
stream
,
F1AP_F1AP_PDU_t
*
pdu
);
int
CU_send_DL_RRC_MESSAGE_TRANSFER
(
instance_t
instance
);
int
CU_handle_UL_RRC_MESSAGE_TRANSFER
(
instance_t
instance
,
uint32_t
assoc_id
,
uint32_t
stream
,
F1AP_F1AP_PDU_t
*
pdu
);
#endif
/* F1AP_CU_RRC_MESSAGE_TRANSFER_H_ */
openair2/F1AP/f1ap_du_rrc_message_transfer.c
View file @
f4633ba2
...
...
@@ -33,6 +33,7 @@
#include "f1ap_common.h"
#include "f1ap_encoder.h"
#include "f1ap_decoder.h"
#include "f1ap_itti_messaging.h"
#include "f1ap_du_rrc_message_transfer.h"
// undefine C_RNTI from
// openair1/PHY/LTE_TRANSPORT/transport_common.h which
...
...
@@ -43,12 +44,15 @@
extern
f1ap_setup_req_t
*
f1ap_du_data
;
/* DL RRC Message Transfer */
void
DU_handle_DL_RRC_MESSAGE_TRANSFER
(
F1AP_DLRRCMessageTransfer_t
*
DLRRCMessageTransfer
)
{
int
DU_handle_DL_RRC_MESSAGE_TRANSFER
(
instance_t
instance
,
uint32_t
assoc_id
,
uint32_t
stream
,
F1AP_F1AP_PDU_t
*
pdu
)
{
AssertFatal
(
1
==
0
,
"Not implemented yet
\n
"
);
}
//void DU_send_UL_RRC_MESSAGE_TRANSFER(F1AP_ULRRCMessageTransfer_t *ULRRCMessageTransfer) {
void
DU_send_UL_RRC_MESSAGE_TRANSFER
(
void
)
{
int
DU_send_UL_RRC_MESSAGE_TRANSFER
(
void
)
{
F1AP_F1AP_PDU_t
pdu
;
F1AP_ULRRCMessageTransfer_t
*
out
;
F1AP_ULRRCMessageTransferIEs_t
*
ie
;
...
...
@@ -107,6 +111,7 @@ void DU_send_UL_RRC_MESSAGE_TRANSFER(void) {
/* encode */
if
(
f1ap_encode_pdu
(
&
pdu
,
&
buffer
,
&
len
)
<
0
)
{
printf
(
"Failed to encode F1 setup request
\n
"
);
return
-
1
;
}
printf
(
"
\n
"
);
...
...
@@ -117,10 +122,12 @@ void DU_send_UL_RRC_MESSAGE_TRANSFER(void) {
// printf("Failed to decode F1 setup request\n");
// }
//AssertFatal(1==0,"Not implemented yet\n");
return
0
;
}
/* UL RRC Message Transfer */
void
DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER
(
int
DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER
(
module_id_t
module_idP
,
int
CC_idP
,
int
UE_id
,
...
...
@@ -204,11 +211,13 @@ void DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER(
/* encode */
if
(
f1ap_encode_pdu
(
&
pdu
,
&
buffer
,
&
len
)
<
0
)
{
printf
(
"Failed to encode F1 setup request
\n
"
);
return
-
1
;
}
printf
(
"
\n
"
);
du_f1ap_itti_send_sctp_data_req
(
0
,
f1ap_du_data
->
assoc_id
,
buffer
,
len
,
0
);
return
0
;
/* decode */
// if (f1ap_decode_pdu(&pdu, buffer, len) > 0) {
// printf("Failed to decode F1 setup request\n");
...
...
openair2/F1AP/f1ap_du_rrc_message_transfer.h
View file @
f4633ba2
...
...
@@ -34,4 +34,19 @@
#ifndef F1AP_DU_RRC_MESSAGE_TRANSFER_H_
#define F1AP_DU_RRC_MESSAGE_TRANSFER_H_
int
DU_handle_DL_RRC_MESSAGE_TRANSFER
(
instance_t
instance
,
uint32_t
assoc_id
,
uint32_t
stream
,
F1AP_F1AP_PDU_t
*
pdu
);
int
DU_send_UL_RRC_MESSAGE_TRANSFER
(
void
);
int
DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER
(
module_id_t
module_idP
,
int
CC_idP
,
int
UE_id
,
rnti_t
rntiP
,
uint8_t
*
sduP
,
sdu_size_t
sdu_lenP
);
#endif
/* F1AP_DU_RRC_MESSAGE_TRANSFER_H_ */
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