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
ao gleen
OpenXG-RAN
Commits
2ffb674d
Commit
2ffb674d
authored
Dec 11, 2024
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
F1AP: Use GTP direct API instead of ITTI
See parent commit for more information.
parent
3c5e999f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
29 deletions
+7
-29
doc/F1AP/F1-design.md
doc/F1AP/F1-design.md
+4
-4
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+1
-15
openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
+2
-10
No files found.
doc/F1AP/F1-design.md
View file @
2ffb674d
...
@@ -378,15 +378,15 @@ You might also want to consult TS 38.401 regarding the message exchange.
...
@@ -378,15 +378,15 @@ You might also want to consult TS 38.401 regarding the message exchange.
### General
### General
In the DU in UL, RLC checks in
`deliver_sdu()`
if we are operating in split
In the DU in UL, RLC checks in
`deliver_sdu()`
if we are operating in split
mode, and either (direct) calls
`pdcp_data_ind`
(DRB) or (f1ap) sends a
n
mode, and either (direct) calls
`pdcp_data_ind`
(DRB) or (f1ap) sends a
GTP
`GTPV1U_TUNNEL_DATA_REQ`
ITTI message to the GTP task
.
message through the GTP API
.
In the CU in UL, assuming the tunnel is in place, GTP decapsulates the packet
In the CU in UL, assuming the tunnel is in place, GTP decapsulates the packet
and calls the callback
`cu_f1u_data_req()`
, which calls
`pdcp_data_ind()`
in CU.
and calls the callback
`cu_f1u_data_req()`
, which calls
`pdcp_data_ind()`
in CU.
In the CU in DL, the PDCP function
`deliver_pdu_drb_gnb()`
either (direct) calls
In the CU in DL, the PDCP function
`deliver_pdu_drb_gnb()`
either (direct) calls
into the RLC via
`enqueue_rlc_data_req()`
, or (f1ap) sends a
into the RLC via
`enqueue_rlc_data_req()`
, or (f1ap) sends a
GTP message
`GTPV1U_TUNNEL_DATA_REQ`
ITTI message to the GTP task
.
through the GTP API
.
In the DU in DL, assuming the GTP-U tunnel exists, GTP decapsulates the packet
In the DU in DL, assuming the GTP-U tunnel exists, GTP decapsulates the packet
and calls the reception call back
`du_rlc_data_req()`
, which calls
and calls the reception call back
`du_rlc_data_req()`
, which calls
...
...
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
View file @
2ffb674d
...
@@ -718,23 +718,9 @@ static void deliver_pdu_drb_gnb(void *deliver_pdu_data, ue_id_t ue_id, int rb_id
...
@@ -718,23 +718,9 @@ static void deliver_pdu_drb_gnb(void *deliver_pdu_data, ue_id_t ue_id, int rb_id
protocol_ctxt_t
ctxt
=
{
.
enb_flag
=
1
,
.
rntiMaybeUEid
=
ue_data
.
secondary_ue
};
protocol_ctxt_t
ctxt
=
{
.
enb_flag
=
1
,
.
rntiMaybeUEid
=
ue_data
.
secondary_ue
};
if
(
NODE_IS_CU
(
node_type
))
{
if
(
NODE_IS_CU
(
node_type
))
{
MessageDef
*
message_p
=
itti_alloc_new_message_sized
(
TASK_PDCP_ENB
,
0
,
GTPV1U_TUNNEL_DATA_REQ
,
sizeof
(
gtpv1u_tunnel_data_req_t
)
+
size
+
GTPU_HEADER_OVERHEAD_MAX
);
AssertFatal
(
message_p
!=
NULL
,
"OUT OF MEMORY"
);
gtpv1u_tunnel_data_req_t
*
req
=&
GTPV1U_TUNNEL_DATA_REQ
(
message_p
);
uint8_t
*
gtpu_buffer_p
=
(
uint8_t
*
)(
req
+
1
);
memcpy
(
gtpu_buffer_p
+
GTPU_HEADER_OVERHEAD_MAX
,
buf
,
size
);
req
->
buffer
=
gtpu_buffer_p
;
req
->
length
=
size
;
req
->
offset
=
GTPU_HEADER_OVERHEAD_MAX
;
req
->
ue_id
=
ue_id
;
// use CU UE ID as GTP will use that to look up TEID
req
->
bearer_id
=
rb_id
;
LOG_D
(
PDCP
,
"%s() (drb %d) sending message to gtp size %d
\n
"
,
__func__
,
rb_id
,
size
);
LOG_D
(
PDCP
,
"%s() (drb %d) sending message to gtp size %d
\n
"
,
__func__
,
rb_id
,
size
);
extern
instance_t
CUuniqInstance
;
extern
instance_t
CUuniqInstance
;
itti_send_msg_to_task
(
TASK_GTPV1_U
,
CUuniqInstance
,
message_p
);
gtpv1uSendDirect
(
CUuniqInstance
,
ue_id
,
rb_id
,
(
uint8_t
*
)
buf
,
size
,
false
,
false
);
}
else
{
}
else
{
uint8_t
*
memblock
=
malloc16
(
size
);
uint8_t
*
memblock
=
malloc16
(
size
);
memcpy
(
memblock
,
buf
,
size
);
memcpy
(
memblock
,
buf
,
size
);
...
...
openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
View file @
2ffb674d
...
@@ -40,6 +40,7 @@
...
@@ -40,6 +40,7 @@
#include "openair2/F1AP/f1ap_du_rrc_message_transfer.h"
#include "openair2/F1AP/f1ap_du_rrc_message_transfer.h"
#include "openair2/F1AP/f1ap_ids.h"
#include "openair2/F1AP/f1ap_ids.h"
#include "openair3/ocp-gtpu/gtp_itf.h"
extern
RAN_CONTEXT_t
RC
;
extern
RAN_CONTEXT_t
RC
;
...
@@ -525,18 +526,9 @@ rb_found:
...
@@ -525,18 +526,9 @@ rb_found:
itti_send_msg_to_task
(
TASK_DU_F1
,
ENB_MODULE_ID_TO_INSTANCE
(
0
/*ctxt_pP->module_id*/
),
msg
);
itti_send_msg_to_task
(
TASK_DU_F1
,
ENB_MODULE_ID_TO_INSTANCE
(
0
/*ctxt_pP->module_id*/
),
msg
);
return
;
return
;
}
else
{
}
else
{
MessageDef
*
msg
=
itti_alloc_new_message_sized
(
TASK_RLC_ENB
,
0
,
GTPV1U_TUNNEL_DATA_REQ
,
sizeof
(
gtpv1u_tunnel_data_req_t
)
+
size
);
gtpv1u_tunnel_data_req_t
*
req
=&
GTPV1U_TUNNEL_DATA_REQ
(
msg
);
req
->
buffer
=
(
uint8_t
*
)(
req
+
1
);
memcpy
(
req
->
buffer
,
buf
,
size
);
req
->
length
=
size
;
req
->
offset
=
0
;
req
->
ue_id
=
ue
->
ue_id
;
req
->
bearer_id
=
rb_id
;
LOG_D
(
RLC
,
"Received uplink user-plane traffic at RLC-DU to be sent to the CU, size %d
\n
"
,
size
);
LOG_D
(
RLC
,
"Received uplink user-plane traffic at RLC-DU to be sent to the CU, size %d
\n
"
,
size
);
extern
instance_t
DUuniqInstance
;
extern
instance_t
DUuniqInstance
;
itti_send_msg_to_task
(
TASK_GTPV1_U
,
DUuniqInstance
,
msg
);
gtpv1uSendDirect
(
DUuniqInstance
,
ue
->
ue_id
,
rb_id
,
(
uint8_t
*
)
buf
,
size
,
false
,
false
);
return
;
return
;
}
}
}
}
...
...
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