Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
openairinterface5G
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Patricio Latini
openairinterface5G
Commits
9044dc35
Commit
9044dc35
authored
8 years ago
by
Gabriel
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/issue-154-PDCP_FIFO_NETLINK' into develop_integration_w50
PDCP fix
parents
1167dd6b
2f3483d1
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
+9
-5
9 additions, 5 deletions
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
with
9 additions
and
5 deletions
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
+
9
−
5
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
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment