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
spbro
OpenXG-RAN
Commits
fc7bccec
Commit
fc7bccec
authored
Jan 18, 2023
by
Cedric Roux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix a small bug and add a log for when recvfrom() fails
recvfrom() returns ssize_t, not size_t.
parent
08e57ca3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
5 deletions
+14
-5
radio/ETHERNET/USERSPACE/LIB/eth_udp.c
radio/ETHERNET/USERSPACE/LIB/eth_udp.c
+14
-5
No files found.
radio/ETHERNET/USERSPACE/LIB/eth_udp.c
View file @
fc7bccec
...
...
@@ -447,10 +447,20 @@ void *udp_read_thread(void *arg) {
while
(
oai_exit
==
0
)
{
LOG_I
(
PHY
,
"UDP read thread %d, waiting for start sampling_rate_d %d, sampling_rate_n %d
\n
"
,
u
->
thread_id
,
device
->
sampling_rate_ratio_n
,
device
->
sampling_rate_ratio_d
);
while
(
fhstate
->
active
>
0
)
{
size_t
count
=
recvfrom
(((
eth_state_t
*
)
device
->
priv
)
->
sockfdd
[
0
],
buffer
,
sizeof
(
buffer
),
0
,
(
struct
sockaddr
*
)
&
((
eth_state_t
*
)
device
->
priv
)
->
dest_addrd
,
(
socklen_t
*
)
&
((
eth_state_t
*
)
device
->
priv
)
->
addr_len
);
ssize_t
count
=
recvfrom
(((
eth_state_t
*
)
device
->
priv
)
->
sockfdd
[
0
],
buffer
,
sizeof
(
buffer
),
0
,
(
struct
sockaddr
*
)
&
((
eth_state_t
*
)
device
->
priv
)
->
dest_addrd
,
(
socklen_t
*
)
&
((
eth_state_t
*
)
device
->
priv
)
->
addr_len
);
/* log and skip processing in case of error from recvfrom */
/* (to be refined if needed) */
if
(
count
==
0
)
{
LOG_E
(
PHY
,
"recvfrom returned 0
\n
"
);
continue
;
}
if
(
count
<
0
)
{
LOG_E
(
PHY
,
"recvfrom failed (%s)
\n
"
,
strerror
(
errno
));
continue
;
}
/* if oai_exit is 1 here, don't access the array rxbase,
* it may have been freed(), so let's break at this point
*/
...
...
@@ -460,7 +470,6 @@ void *udp_read_thread(void *arg) {
TS
=
*
(
openair0_timestamp
*
)(
&
buffer
[
ECPRICOMMON_BYTES
+
ECPRIPCID_BYTES
]);
// convert TS to samples, /6 for AW2S @ 30.72 Ms/s, this is converted for other sample rates in OAI application
TS
=
(
device
->
sampling_rate_ratio_n
*
TS
)
/
(
device
->
sampling_rate_ratio_d
*
6
);
if
((
int
)
count
<=
0
)
continue
;
AssertFatal
(
aid
<
8
,
"Cannot handle more than 8 antennas, got aid %d
\n
"
,
aid
);
fhstate
->
r
[
aid
]
=
1
;
if
(
aid
==
0
&&
first_read
==
0
)
fhstate
->
TS0
=
TS
;
...
...
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