Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
L
libzmq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
libzmq
Commits
e78d20ff
Commit
e78d20ff
authored
May 15, 2018
by
Simon Giesecke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Problem: test_radio_dish_udp_ipv6 triggers assertion under Windows
Solution: fix handling of sockaddr in recvfrom
parent
dd1c87f9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
udp_engine.cpp
src/udp_engine.cpp
+4
-3
No files found.
src/udp_engine.cpp
View file @
e78d20ff
...
...
@@ -425,8 +425,8 @@ void zmq::udp_engine_t::restart_output ()
void
zmq
::
udp_engine_t
::
in_event
()
{
s
truct
sockaddr_in
in_address
;
socklen_t
in_addrlen
=
sizeof
(
sockaddr_
in
);
s
ockaddr_storage
in_address
;
socklen_t
in_addrlen
=
sizeof
(
sockaddr_
storage
);
#ifdef ZMQ_HAVE_WINDOWS
int
nbytes
=
recvfrom
(
fd
,
(
char
*
)
in_buffer
,
MAX_UDP_MSG
,
0
,
(
sockaddr
*
)
&
in_address
,
&
in_addrlen
);
...
...
@@ -459,7 +459,8 @@ void zmq::udp_engine_t::in_event ()
msg_t
msg
;
if
(
options
.
raw_socket
)
{
sockaddr_to_msg
(
&
msg
,
&
in_address
);
zmq_assert
(
in_address
.
ss_family
==
AF_INET
);
sockaddr_to_msg
(
&
msg
,
reinterpret_cast
<
sockaddr_in
*>
(
&
in_address
));
body_size
=
nbytes
;
body_offset
=
0
;
...
...
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