Commit | Line | Data |
---|---|---|
bb962340 FF |
1 | diff -u -r ../glib-2.56.0/gio/gsocket.c ./gio/gsocket.c |
2 | --- ../glib-2.56.0/gio/gsocket.c 2018-01-08 21:34:19.000000000 +0000 | |
3 | +++ ./gio/gsocket.c 2018-03-14 10:48:50.917328275 +0000 | |
4 | @@ -2397,7 +2397,11 @@ | |
5 | memset (&mc_req_src, 0, sizeof (mc_req_src)); | |
6 | ||
7 | /* By default use the default IPv4 multicast interface. */ | |
8 | +#ifdef __ANDROID__ | |
9 | + mc_req_src.imr_interface = g_htonl (INADDR_ANY); | |
10 | +#else | |
11 | mc_req_src.imr_interface.s_addr = g_htonl (INADDR_ANY); | |
12 | +#endif | |
13 | ||
14 | if (iface) | |
15 | { | |
16 | @@ -2442,7 +2446,11 @@ | |
17 | } | |
18 | ||
19 | iface_addr = (struct sockaddr_in *) &ifr.ifr_addr; | |
20 | +#ifdef __ANDROID__ | |
21 | + mc_req_src.imr_interface = iface_addr->sin_addr.s_addr; | |
22 | +#else | |
23 | mc_req_src.imr_interface.s_addr = iface_addr->sin_addr.s_addr; | |
24 | +#endif | |
25 | #endif /* defined(G_OS_WIN32) && defined (HAVE_IF_NAMETOINDEX) */ | |
26 | } | |
27 | memcpy (&mc_req_src.imr_multiaddr, g_inet_address_to_bytes (group), |