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
wangwenhui
OpenXG-RAN
Commits
6eb00a08
Commit
6eb00a08
authored
Jul 20, 2020
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable multi-module support in pdcp_fifo_flush_sdus()
parent
33b860f1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
+7
-5
No files found.
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
View file @
6eb00a08
...
...
@@ -114,7 +114,9 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t *const ctxt_pP) {
int
ret
=
0
;
while
((
sdu_p
=
pollNotifiedFIFO
(
&
pdcp_sdu_list
))
!=
NULL
)
{
pdcp_data_ind_header_t
*
pdcpHead
=
(
pdcp_data_ind_header_t
*
)
NotifiedFifoData
(
sdu_p
);
AssertFatal
(
pdcpHead
->
inst
==
ctxt_pP
->
module_id
,
"To implement correctly multi module id
\n
"
);
/* Note: we ignore the instance ID in the context and use the one in the
* PDCP packet to pick the right socket below */
int
rb_id
=
pdcpHead
->
rb_id
;
int
sizeToWrite
=
sizeof
(
pdcp_data_ind_header_t
)
+
...
...
@@ -130,19 +132,19 @@ int pdcp_fifo_flush_sdus(const protocol_ctxt_t *const ctxt_pP) {
sizeof
(
sidelink_pc5s_element
),
0
,
(
struct
sockaddr
*
)
&
prose_pdcp_addr
,
sizeof
(
prose_pdcp_addr
)
);
}
else
if
(
UE_NAS_USE_TUN
)
{
//ret = write(nas_sock_fd[
ctxt_pP->module_id
], &(sdu_p->data[sizeof(pdcp_data_ind_header_t)]),sizeToWrite );
//ret = write(nas_sock_fd[
pdcpHead->inst
], &(sdu_p->data[sizeof(pdcp_data_ind_header_t)]),sizeToWrite );
if
(
rb_id
==
mbms_rab_id
){
ret
=
write
(
nas_sock_mbms_fd
,
pdcpData
,
sizeToWrite
);
LOG_I
(
PDCP
,
"[PDCP_FIFOS] ret %d TRIED TO PUSH MBMS DATA TO rb_id %d handle %d sizeToWrite %d
\n
"
,
ret
,
rb_id
,
nas_sock_fd
[
ctxt_pP
->
module_id
],
sizeToWrite
);
ret
,
rb_id
,
nas_sock_fd
[
pdcpHead
->
inst
],
sizeToWrite
);
}
else
{
if
(
LOG_DEBUGFLAG
(
DEBUG_PDCP
)
)
log_dump
(
PDCP
,
pdcpData
,
sizeToWrite
,
LOG_DUMP_CHAR
,
"PDCP output to be sent to TUN interface:
\n
"
);
ret
=
write
(
nas_sock_fd
[
ctxt_pP
->
module_id
],
pdcpData
,
sizeToWrite
);
ret
=
write
(
nas_sock_fd
[
pdcpHead
->
inst
],
pdcpData
,
sizeToWrite
);
LOG_T
(
PDCP
,
"[UE PDCP_FIFOS] ret %d TRIED TO PUSH DATA TO rb_id %d handle %d sizeToWrite %d
\n
"
,
ret
,
rb_id
,
nas_sock_fd
[
ctxt_pP
->
module_id
],
sizeToWrite
);
ret
,
rb_id
,
nas_sock_fd
[
pdcpHead
->
inst
],
sizeToWrite
);
}
}
else
if
(
ENB_NAS_USE_TUN
)
{
if
(
LOG_DEBUGFLAG
(
DEBUG_PDCP
)
)
...
...
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