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
zzha zzha
OpenXG-RAN
Commits
9044dc35
Commit
9044dc35
authored
Dec 14, 2016
by
gabrielC
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/issue-154-PDCP_FIFO_NETLINK' into develop_integration_w50
PDCP fix
parents
1167dd6b
2f3483d1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
5 deletions
+9
-5
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
+9
-5
No files found.
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
View file @
9044dc35
...
@@ -424,18 +424,22 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
...
@@ -424,18 +424,22 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
return
0
;
return
0
;
# else
/* PDCP_USE_NETLINK_QUEUES*/
# else
/* PDCP_USE_NETLINK_QUEUES*/
int
len
=
1
;
int
len
=
1
;
int
msg_len
;
rb_id_t
rab_id
=
0
;
rb_id_t
rab_id
=
0
;
int
rlc_data_req_flag
=
3
;
while
(
len
>
0
)
{
while
((
len
>
0
)
&&
(
rlc_data_req_flag
!=
0
))
{
len
=
recvmsg
(
nas_sock_fd
,
&
nas_msg_rx
,
0
);
len
=
recvmsg
(
nas_sock_fd
,
&
nas_msg_rx
,
0
);
if
(
len
<=
0
)
{
if
(
len
<=
0
)
{
// nothing in pdcp NAS socket
// nothing in pdcp NAS socket
//LOG_D(PDCP, "[PDCP][NETLINK] Nothing in socket, length %d \n", len);
//LOG_D(PDCP, "[PDCP][NETLINK] Nothing in socket, length %d \n", len);
}
else
{
}
else
{
msg_len
=
len
;
for
(
nas_nlh_rx
=
(
struct
nlmsghdr
*
)
nl_rx_buf
;
for
(
nas_nlh_rx
=
(
struct
nlmsghdr
*
)
nl_rx_buf
;
NLMSG_OK
(
nas_nlh_rx
,
len
);
NLMSG_OK
(
nas_nlh_rx
,
msg_
len
);
nas_nlh_rx
=
NLMSG_NEXT
(
nas_nlh_rx
,
len
))
{
nas_nlh_rx
=
NLMSG_NEXT
(
nas_nlh_rx
,
msg_
len
))
{
if
(
nas_nlh_rx
->
nlmsg_type
==
NLMSG_DONE
)
{
if
(
nas_nlh_rx
->
nlmsg_type
==
NLMSG_DONE
)
{
LOG_D
(
PDCP
,
"[PDCP][NETLINK] RX NLMSG_DONE
\n
"
);
LOG_D
(
PDCP
,
"[PDCP][NETLINK] RX NLMSG_DONE
\n
"
);
...
@@ -493,7 +497,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
...
@@ -493,7 +497,7 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
ctxt
.
enb_flag
=
ctxt_cpy
.
enb_flag
;
ctxt
.
enb_flag
=
ctxt_cpy
.
enb_flag
;
#ifdef PDCP_DEBUG
#ifdef PDCP_DEBUG
LOG_
D
(
PDCP
,
"[PDCP][NETLINK] pdcp_read_header_g.rb_id = %d
\n
"
,
pdcp_read_header_g
.
rb_id
);
LOG_
I
(
PDCP
,
"[PDCP][NETLINK] pdcp_read_header_g.rb_id = %d
\n
"
,
pdcp_read_header_g
.
rb_id
);
#endif
#endif
if
(
ctxt_cpy
.
enb_flag
)
{
if
(
ctxt_cpy
.
enb_flag
)
{
...
...
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