luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udp: use sockaddr_storage instead of union

Browse Source 
PR-URL: https://github.com/libuv/libuv/pull/2202
Reviewed-By: Saúl Ibarra Corretgé <saghul@gmail.com>
This commit is contained in:
Santiago Gimeno 2019-03-12 07:04:49 +01:00
parent f91702a470
commit 7452507f7d
No known key found for this signature in database
GPG Key ID: F28C3C8DA33C03BE
2 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/unix/udp.c
View File

@ -847,35 +847,40 @@ int uv_udp_set_source_membership(uv_udp_t* handle,
const char* source_addr,
uv_membership membership) {
int err;
union sockaddr {
struct sockaddr_in sa_in;
struct sockaddr_in6 sa_in6;
};
struct sockaddr_storage mcast_addr;
struct sockaddr_in* mcast_addr4;
struct sockaddr_in6* mcast_addr6;
struct sockaddr_storage src_addr;
struct sockaddr_in* src_addr4;
struct sockaddr_in6* src_addr6;
union sockaddr mcast_addr;
union sockaddr src_addr;
mcast_addr4 = (struct sockaddr_in*)&mcast_addr;
mcast_addr6 = (struct sockaddr_in6*)&mcast_addr;
src_addr4 = (struct sockaddr_in*)&src_addr;
src_addr6 = (struct sockaddr_in6*)&src_addr;
err = uv_ip4_addr(multicast_addr, 0, &mcast_addr.sa_in);
err = uv_ip4_addr(multicast_addr, 0, mcast_addr4);
if (err) {
err = uv_ip6_addr(multicast_addr, 0, &mcast_addr.sa_in6);
err = uv_ip6_addr(multicast_addr, 0, mcast_addr6);
if (err)
return err;
err = uv_ip6_addr(source_addr, 0, &src_addr.sa_in6);
err = uv_ip6_addr(source_addr, 0, src_addr6);
if (err)
return err;
return uv__udp_set_source_membership6(handle,
&mcast_addr.sa_in6,
mcast_addr6,
interface_addr,
&src_addr.sa_in6,
src_addr6,
membership);
}
err = uv_ip4_addr(source_addr, 0, &src_addr.sa_in);
err = uv_ip4_addr(source_addr, 0, src_addr4);
if (err)
return err;
return uv__udp_set_source_membership4(handle,
&mcast_addr.sa_in,
mcast_addr4,
interface_addr,
&src_addr.sa_in,
src_addr4,
membership);
}

33
src/win/udp.c
View File

@ -830,35 +830,40 @@ int uv_udp_set_source_membership(uv_udp_t* handle,
const char* source_addr,
uv_membership membership) {
int err;
union sockaddr {
struct sockaddr_in sa_in;
struct sockaddr_in6 sa_in6;
};
struct sockaddr_storage mcast_addr;
struct sockaddr_in* mcast_addr4;
struct sockaddr_in6* mcast_addr6;
struct sockaddr_storage src_addr;
struct sockaddr_in* src_addr4;
struct sockaddr_in6* src_addr6;
union sockaddr mcast_addr;
union sockaddr src_addr;
mcast_addr4 = (struct sockaddr_in*)&mcast_addr;
mcast_addr6 = (struct sockaddr_in6*)&mcast_addr;
src_addr4 = (struct sockaddr_in*)&src_addr;
src_addr6 = (struct sockaddr_in6*)&src_addr;
err = uv_ip4_addr(multicast_addr, 0, &mcast_addr.sa_in);
err = uv_ip4_addr(multicast_addr, 0, mcast_addr4);
if (err) {
err = uv_ip6_addr(multicast_addr, 0, &mcast_addr.sa_in6);
err = uv_ip6_addr(multicast_addr, 0, mcast_addr6);
if (err)
return err;
err = uv_ip6_addr(source_addr, 0, &src_addr.sa_in6);
err = uv_ip6_addr(source_addr, 0, src_addr6);
if (err)
return err;
return uv__udp_set_source_membership6(handle,
&mcast_addr.sa_in6,
mcast_addr6,
interface_addr,
&src_addr.sa_in6,
src_addr6,
membership);
}
err = uv_ip4_addr(source_addr, 0, &src_addr.sa_in);
err = uv_ip4_addr(source_addr, 0, src_addr4);
if (err)
return err;
return uv__udp_set_source_membership4(handle,
&mcast_addr.sa_in,
mcast_addr4,
interface_addr,
&src_addr.sa_in,
src_addr4,
membership);
}