niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable AF_PACKET interfaces for all platforms but Linux

Browse source 
Signed-off-by: Jeroen Koekkoek <jeroen@koekkoek.nl>
This commit is contained in:
Jeroen Koekkoek 2018-09-20 11:20:13 +02:00
parent 458b1df3f7
commit ea3f5e7ff4
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/os/src/posix/os_platform_ifaddrs.c
View file

@ -27,9 +27,11 @@ copy_ifaddrs(os_ifaddrs_t **ifap, const struct ifaddrs *sys_ifa)
assert(ifap != NULL); assert(ifap != NULL);
assert(sys_ifa != NULL); assert(sys_ifa != NULL);
assert(sys_ifa->ifa_addr->sa_family == AF_INET || assert(sys_ifa->ifa_addr->sa_family == AF_INET
sys_ifa->ifa_addr->sa_family == AF_INET6 || #ifdef __linux
sys_ifa->ifa_addr->sa_family == AF_PACKET); || sys_ifa->ifa_addr->sa_family == AF_PACKET
#endif /* __linux */
|| sys_ifa->ifa_addr->sa_family == AF_INET6);
ifa = os_malloc(sizeof(*ifa)); ifa = os_malloc(sizeof(*ifa));
if (ifa == NULL) { if (ifa == NULL) {
@ -49,9 +51,11 @@ copy_ifaddrs(os_ifaddrs_t **ifap, const struct ifaddrs *sys_ifa)
} else { } else {
if (sys_ifa->ifa_addr->sa_family == AF_INET) { if (sys_ifa->ifa_addr->sa_family == AF_INET) {
size = sizeof(struct sockaddr_in); size = sizeof(struct sockaddr_in);
#ifdef __linux
} else { } else {
assert(sys_ifa->ifa_addr->sa_family == AF_PACKET); assert(sys_ifa->ifa_addr->sa_family == AF_PACKET);
size = sizeof(struct sockaddr_ll); size = sizeof(struct sockaddr_ll);
#endif /* __linux */
} }
if (!(ifa->addr = os_memdup(sys_ifa->ifa_addr, size)) || if (!(ifa->addr = os_memdup(sys_ifa->ifa_addr, size)) ||
@ -97,8 +101,10 @@ os_getifaddrs(
sys_ifa = sys_ifa->ifa_next) sys_ifa = sys_ifa->ifa_next)
{ {
addr = sys_ifa->ifa_addr; addr = sys_ifa->ifa_addr;
if ((addr->sa_family == AF_PACKET && ifltr->af_packet) if ((addr->sa_family == AF_INET && ifltr->af_inet)
|| (addr->sa_family == AF_INET && ifltr->af_inet) #ifdef __linux
|| (addr->sa_family == AF_PACKET && ifltr->af_packet)
#endif /* __linux */
|| (addr->sa_family == AF_INET6 && ifltr->af_inet6 && || (addr->sa_family == AF_INET6 && ifltr->af_inet6 &&
!IN6_IS_ADDR_UNSPECIFIED( !IN6_IS_ADDR_UNSPECIFIED(
&((struct sockaddr_in6 *)addr)->sin6_addr))) &((struct sockaddr_in6 *)addr)->sin6_addr)))