generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-10 08:08:33 +01:00
Code Issues Projects Releases Wiki Activity

Problem: test_radio_dish_udp_ipv6 triggers assertion under Windows

Browse Source 
Solution: fix handling of sockaddr in recvfrom
This commit is contained in:
Simon Giesecke
2018-05-15 14:53:22 +02:00
parent dd1c87f9d9
commit e78d20ff2c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/udp_engine.cpp
View File

@@ -425,8 +425,8 @@ void zmq::udp_engine_t::restart_output ()
void zmq::udp_engine_t::in_event () void zmq::udp_engine_t::in_event ()
{ {
struct sockaddr_in in_address; sockaddr_storage in_address;
socklen_t in_addrlen = sizeof (sockaddr_in); socklen_t in_addrlen = sizeof (sockaddr_storage);
#ifdef ZMQ_HAVE_WINDOWS #ifdef ZMQ_HAVE_WINDOWS
int nbytes = recvfrom (fd, (char *) in_buffer, MAX_UDP_MSG, 0, int nbytes = recvfrom (fd, (char *) in_buffer, MAX_UDP_MSG, 0,
(sockaddr *) &in_address, &in_addrlen); (sockaddr *) &in_address, &in_addrlen);
@@ -459,7 +459,8 @@ void zmq::udp_engine_t::in_event ()
msg_t msg; msg_t msg;
if (options.raw_socket) { 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_size = nbytes;
body_offset = 0; body_offset = 0;